aboutsummaryrefslogtreecommitdiff
path: root/cc3200/misc
diff options
context:
space:
mode:
authorDaniel Campora2015-05-02 22:57:51 +0200
committerDaniel Campora2015-05-03 11:26:56 +0200
commit8c8d7f3c60ff10e90243b47172a6979bdf2b9fd1 (patch)
tree5471689adaed9d228912646c49c4f388928ddb1e /cc3200/misc
parente4c899a08cdd8ed36e2e9a1ae3fbe362ab73563f (diff)
cc3200: Clean up pyb.Pin
Remove unused and unneeded functions, also create Pin.get_config() that returns the whole configuration of the pin. This reduces code size by ~500 bytes.
Diffstat (limited to 'cc3200/misc')
-rw-r--r--cc3200/misc/pin_defs_cc3200.c55
-rw-r--r--cc3200/misc/pin_defs_cc3200.h41
-rw-r--r--cc3200/misc/pin_named_pins.c21
3 files changed, 0 insertions, 117 deletions
diff --git a/cc3200/misc/pin_defs_cc3200.c b/cc3200/misc/pin_defs_cc3200.c
deleted file mode 100644
index a9b9413a1..000000000
--- a/cc3200/misc/pin_defs_cc3200.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * 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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "py/mpconfig.h"
-#include MICROPY_HAL_H
-#include "py/obj.h"
-#include "inc/hw_types.h"
-#include "inc/hw_gpio.h"
-#include "inc/hw_ints.h"
-#include "inc/hw_memmap.h"
-#include "rom_map.h"
-#include "gpio.h"
-#include "pin.h"
-#include "pybpin.h"
-
-
-
-// Returns the pin mode. This value returned by this macro should be one of:
-// GPIO_DIR_MODE_IN or GPIO_DIR_MODE_OUT
-uint32_t pin_get_mode (const pin_obj_t *self) {
- return self->mode;
-}
-
-uint32_t pin_get_type (const pin_obj_t *self) {
- return self->type;
-}
-
-uint32_t pin_get_strenght (const pin_obj_t *self) {
- return self->strength;
-}
-
diff --git a/cc3200/misc/pin_defs_cc3200.h b/cc3200/misc/pin_defs_cc3200.h
deleted file mode 100644
index 6ba1640d6..000000000
--- a/cc3200/misc/pin_defs_cc3200.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * 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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// This file contains pin definitions that are specific to the cc3200 port.
-// This file should only ever be #included by pybgpio.h and not directly.
-
-
-//*****************************************************************************
-// Define types
-//*****************************************************************************
-
-enum {
- PORT_A0 = GPIOA0_BASE,
- PORT_A1 = GPIOA1_BASE,
- PORT_A2 = GPIOA2_BASE,
- PORT_A3 = GPIOA3_BASE
-};
diff --git a/cc3200/misc/pin_named_pins.c b/cc3200/misc/pin_named_pins.c
index 19321f4fa..66ddc7fdc 100644
--- a/cc3200/misc/pin_named_pins.c
+++ b/cc3200/misc/pin_named_pins.c
@@ -37,17 +37,6 @@
#include "pybpin.h"
#include MICROPY_HAL_H
-STATIC void pin_named_pins_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
- pin_named_pins_obj_t *self = self_in;
- mp_printf(print, "<Pin.%q>", self->name);
-}
-
-const mp_obj_type_t pin_cpu_pins_obj_type = {
- { &mp_type_type },
- .name = MP_QSTR_cpu,
- .print = pin_named_pins_obj_print,
- .locals_dict = (mp_obj_t)&pin_cpu_pins_locals_dict,
-};
pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
@@ -58,16 +47,6 @@ pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
return NULL;
}
-pin_obj_t *pin_find_pin(const mp_obj_dict_t *named_pins, uint pin_num) {
- mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
- for (uint i = 0; i < named_map->used; i++) {
- if (((pin_obj_t *)named_map->table[i].value)->pin_num == pin_num) {
- return named_map->table[i].value;
- }
- }
- return NULL;
-}
-
pin_obj_t *pin_find_pin_by_port_bit (const mp_obj_dict_t *named_pins, uint port, uint bit) {
mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
for (uint i = 0; i < named_map->used; i++) {