summaryrefslogtreecommitdiffstatshomepage
path: root/cc3200/mods/pybsd.c
diff options
context:
space:
mode:
Diffstat (limited to 'cc3200/mods/pybsd.c')
-rw-r--r--cc3200/mods/pybsd.c163
1 files changed, 102 insertions, 61 deletions
diff --git a/cc3200/mods/pybsd.c b/cc3200/mods/pybsd.c
index c9d6512b21..69eb81581d 100644
--- a/cc3200/mods/pybsd.c
+++ b/cc3200/mods/pybsd.c
@@ -3,7 +3,7 @@
*
* The MIT License (MIT)
*
- * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -49,76 +49,116 @@
#define PYBSD_FREQUENCY_HZ 15000000 // 15MHz
-static const pin_obj_t *pybsd_pin_sd_detect;
-static bool pybsd_is_enabled;
-static bool pybsd_in_path;
-static FATFS *sd_fatfs;
-
-
+typedef struct {
+ mp_obj_base_t base;
+ FATFS *fatfs;
+ pin_obj_t *pin_d0;
+ pin_obj_t *pin_clk;
+ pin_obj_t *pin_cmd;
+ pin_obj_t *pin_sd_detect;
+ byte af_d0;
+ byte af_clk;
+ byte af_cmd;
+ bool pinsset;
+ bool enabled;
+ bool inpath;
+} pybsd_obj_t;
+
+/******************************************************************************
+ DECLARE PRIVATE DATA
+ ******************************************************************************/
+STATIC pybsd_obj_t pybsd_obj;
+
+/******************************************************************************
+ DECLARE PRIVATE FUNCTIONS
+ ******************************************************************************/
+STATIC mp_obj_t pybsd_make_new (mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args);
+STATIC mp_obj_t pybsd_disable (mp_obj_t self_in);
+STATIC mp_obj_t pybsd_enable (mp_obj_t self_in);
+
+/******************************************************************************
+ DECLARE PUBLIC FUNCTIONS
+ ******************************************************************************/
void pybsd_init0 (void) {
- // Allocate memory for the sd file system
- ASSERT ((sd_fatfs = mem_Malloc(sizeof(FATFS))) != NULL);
+ // allocate memory for the sd file system
+ ASSERT ((pybsd_obj.fatfs = mem_Malloc(sizeof(FATFS))) != NULL);
}
bool pybsd_is_present(void) {
- if (pybsd_pin_sd_detect) {
- return pybsd_is_enabled && MAP_GPIOPinRead(pybsd_pin_sd_detect->port, pybsd_pin_sd_detect->bit);
+ if (pybsd_obj.pin_sd_detect) {
+ return pybsd_obj.enabled && MAP_GPIOPinRead(pybsd_obj.pin_sd_detect->port, pybsd_obj.pin_sd_detect->bit);
}
- return pybsd_is_enabled;
+ return pybsd_obj.enabled;
+}
+
+void pybsd_deinit (void) {
+ pybsd_disable ((mp_obj_t)&pybsd_obj);
+ pybsd_obj.pin_sd_detect = NULL;
}
/******************************************************************************/
// Micro Python bindings
//
-/// \method sd_config([value])
+/// \classmethod \constructor()
/// Configure the pins used for the sd card.
-/// May receive 6 or 7 arguments. The 7th optional argument is the card detect pin.
+/// May receive 0, 6 or 7 arguments. The 7th optional argument is the card detect pin.
/// this pin needs no external pull-up and must be low when the sdcard is inserted.
///
/// Usage:
+/// sd = pyb.SD()
+////
+/// sd = pyb.SD(d0_pin, d0_af, clk_pin, clk_af, cmd_pin, cmd_af)
///
-/// pyb.SDcard.config_pins (d0_pin, d0_af, clk_pin, clk_af, cmd_pin, cmd_af)
-///
-/// or:
+/// and:
///
-/// pyb.SDcard.sd_config_pins (d0_pin, d0_af, clk_pin, clk_af, cmd_pin, cmd_af, card_detect_pin)
+/// sd = pyb.SD(d0_pin, d0_af, clk_pin, clk_af, cmd_pin, cmd_af, card_detect_pin)
///
-STATIC mp_obj_t pybsd_config_pins (mp_uint_t n_args, const mp_obj_t *args) {
- byte pybsd_pin_d0, pybsd_pin_clk, pybsd_pin_cmd;
- byte pybsd_af_d0, pybsd_af_clk, pybsd_af_cmd;
- const pin_obj_t *pin;
-
- // get all the arguments
- pin = pin_find(args[1]);
- pybsd_pin_d0 = pin->pin_num;
- pybsd_af_d0 = mp_obj_get_int(args[2]);
- pin_verify_af (pybsd_af_d0);
- pin = pin_find(args[3]);
- pybsd_pin_clk = pin->pin_num;
- pybsd_af_clk = mp_obj_get_int(args[4]);
- pin_verify_af (pybsd_af_clk);
- pin = pin_find(args[5]);
- pybsd_pin_cmd = pin->pin_num;
- pybsd_af_cmd = mp_obj_get_int(args[6]);
- pin_verify_af (pybsd_af_cmd);
-
- // configure the sdhost pins
- MAP_PinTypeSDHost(pybsd_pin_d0, pybsd_af_d0);
- MAP_PinTypeSDHost(pybsd_pin_clk, pybsd_af_clk);
- MAP_PinTypeSDHost(pybsd_pin_cmd, pybsd_af_cmd);
- MAP_PinDirModeSet(pybsd_pin_clk, PIN_DIR_MODE_OUT);
- // configure the card detect pin if provided
- if (n_args == 8) {
- pybsd_pin_sd_detect = pin_find(args[7]);
- pin_config(pybsd_pin_sd_detect, PIN_MODE_0, GPIO_DIR_MODE_IN, PIN_TYPE_STD_PU, PIN_STRENGTH_4MA);
+STATIC mp_obj_t pybsd_make_new (mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+ mp_arg_check_num(n_args, n_kw, 0, 7, false);
+
+ if (n_args >= 6) {
+ // get pins and afs
+ pybsd_obj.pin_d0 = (pin_obj_t *)pin_find(args[0]);
+ pybsd_obj.af_d0 = mp_obj_get_int(args[1]);
+ pin_verify_af (pybsd_obj.af_d0);
+ pybsd_obj.pin_clk = (pin_obj_t *)pin_find(args[2]);
+ pybsd_obj.af_clk = mp_obj_get_int(args[3]);
+ pin_verify_af (pybsd_obj.af_clk);
+ pybsd_obj.pin_cmd = (pin_obj_t *)pin_find(args[4]);
+ pybsd_obj.af_cmd = mp_obj_get_int(args[5]);
+ pin_verify_af (pybsd_obj.af_cmd);
+
+ // configure the sdhost pins
+ MAP_PinTypeSDHost(pybsd_obj.pin_d0->pin_num, pybsd_obj.af_d0);
+ MAP_PinTypeSDHost(pybsd_obj.pin_clk->pin_num, pybsd_obj.af_clk);
+ MAP_PinDirModeSet(pybsd_obj.pin_clk->pin_num, PIN_DIR_MODE_OUT);
+ MAP_PinTypeSDHost(pybsd_obj.pin_cmd->pin_num, pybsd_obj.af_cmd);
+
+ // card detect pin was provided
+ if (n_args == 7) {
+ pybsd_obj.pin_sd_detect = (pin_obj_t *)pin_find(args[6]);
+ pin_config(pybsd_obj.pin_sd_detect, PIN_MODE_0, GPIO_DIR_MODE_IN, PIN_TYPE_STD_PU, PIN_STRENGTH_4MA);
+ }
+ pybsd_obj.pinsset = true;
+ }
+ else if (n_args == 0) {
+ if (!pybsd_obj.pinsset) {
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, mpexception_num_type_invalid_arguments));
+ }
+ }
+ else {
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, mpexception_num_type_invalid_arguments));
}
- return mp_const_none;
+ pybsd_obj.base.type = &pyb_sd_type;
+ return &pybsd_obj;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pybsd_config_pins_obj, 7, 8, pybsd_config_pins);
-STATIC mp_obj_t pybsd_enable(mp_obj_t self) {
+/// \method enable()
+/// Enables the sd card and mounts the file system
+STATIC mp_obj_t pybsd_enable (mp_obj_t self_in) {
+ pybsd_obj_t *self = self_in;
// Enable SD peripheral clock
MAP_PRCMPeripheralClkEnable(PRCM_SDHOST, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
// Reset MMCHS
@@ -128,31 +168,34 @@ STATIC mp_obj_t pybsd_enable(mp_obj_t self) {
// Configure the card clock
MAP_SDHostSetExpClk(SDHOST_BASE, MAP_PRCMPeripheralClockGet(PRCM_SDHOST), PYBSD_FREQUENCY_HZ);
- pybsd_is_enabled = true;
+ self->enabled = true;
// try to mount the sd card on /SD
- if (FR_OK != f_mount(sd_fatfs, "/SD", 1)) {
+ if (FR_OK != f_mount(self->fatfs, "/SD", 1)) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
}
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_SD));
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_SD_slash_LIB));
- pybsd_in_path = true;
+ self->inpath = true;
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pybsd_enable_obj, pybsd_enable);
-STATIC mp_obj_t pybsd_disable(mp_obj_t self) {
- if (pybsd_is_enabled) {
- pybsd_is_enabled = false;
+/// \method disable()
+/// Disables the sd card and unmounts the file system
+STATIC mp_obj_t pybsd_disable (mp_obj_t self_in) {
+ pybsd_obj_t *self = self_in;
+ if (self->enabled) {
+ self->enabled = false;
// unmount the sd card
f_mount (NULL, "/SD", 1);
// remove sd paths from mp_sys_path
- if (pybsd_in_path) {
+ if (self->inpath) {
mp_obj_list_remove(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_SD));
mp_obj_list_remove(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_SD_slash_LIB));
- pybsd_in_path = false;
+ self->inpath = false;
}
// disable the peripheral
MAP_PRCMPeripheralClkDisable(PRCM_SDHOST, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
@@ -162,18 +205,16 @@ STATIC mp_obj_t pybsd_disable(mp_obj_t self) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pybsd_disable_obj, pybsd_disable);
STATIC const mp_map_elem_t pybsd_locals_dict_table[] = {
- { MP_OBJ_NEW_QSTR(MP_QSTR_config_pins), (mp_obj_t)&pybsd_config_pins_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_enable), (mp_obj_t)&pybsd_enable_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_disable), (mp_obj_t)&pybsd_disable_obj },
};
STATIC MP_DEFINE_CONST_DICT(pybsd_locals_dict, pybsd_locals_dict_table);
-static const mp_obj_type_t sdcard_type = {
+const mp_obj_type_t pyb_sd_type = {
{ &mp_type_type },
.name = MP_QSTR_SD,
+ .make_new = pybsd_make_new,
.locals_dict = (mp_obj_t)&pybsd_locals_dict,
};
-const mp_obj_base_t pyb_sdcard_obj = {&sdcard_type};
-
#endif // MICROPY_HW_HAS_SDCARD
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-20 08:20:13 +0000