diff options
author | Damien George <damien.p.george@gmail.com> | 2014-03-30 13:54:02 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-03-30 13:54:02 +0100 |
commit | df6567e6345c763182fa237a4497ab94ee6ffc20 (patch) | |
tree | 402a2bde9d55a10c204f8d766bda228b4f02b74a /stm | |
parent | d17926db710189db97a49e9b2e72d782fc404231 (diff) | |
download | micropython-df6567e6345c763182fa237a4497ab94ee6ffc20.tar.gz micropython-df6567e6345c763182fa237a4497ab94ee6ffc20.zip |
Merge map.h into obj.h.
Pretty much everyone needs to include map.h, since it's such an integral
part of the Micro Python object implementation. Thus, the definitions
are now in obj.h instead. map.h is removed.
Diffstat (limited to 'stm')
-rw-r--r-- | stm/adc.c | 1 | ||||
-rw-r--r-- | stm/audio.c | 1 | ||||
-rw-r--r-- | stm/exti.c | 1 | ||||
-rw-r--r-- | stm/file.c | 1 | ||||
-rw-r--r-- | stm/i2c.c | 1 | ||||
-rw-r--r-- | stm/led.c | 1 | ||||
-rw-r--r-- | stm/pin.c | 1 | ||||
-rw-r--r-- | stm/pin_map.c | 1 | ||||
-rw-r--r-- | stm/pybmodule.c | 1 | ||||
-rw-r--r-- | stm/pybwlan.c | 1 | ||||
-rw-r--r-- | stm/sdcard.c | 1 | ||||
-rw-r--r-- | stm/servo.c | 1 | ||||
-rw-r--r-- | stm/usart.c | 1 |
13 files changed, 0 insertions, 13 deletions
@@ -6,7 +6,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "adc.h" /* ADC defintions */ diff --git a/stm/audio.c b/stm/audio.c index 22f635a5b7..a4e42918cc 100644 --- a/stm/audio.c +++ b/stm/audio.c @@ -9,7 +9,6 @@ #include "qstr.h" #include "parse.h" #include "obj.h" -#include "map.h" #include "runtime.h" #include "audio.h" diff --git a/stm/exti.c b/stm/exti.c index 33821cd18d..ab33481eb5 100644 --- a/stm/exti.c +++ b/stm/exti.c @@ -9,7 +9,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "runtime.h" #include "nlr.h" diff --git a/stm/file.c b/stm/file.c index 208ce804b4..40ac3ff9ca 100644 --- a/stm/file.c +++ b/stm/file.c @@ -5,7 +5,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "file.h" #include "ff.h" @@ -7,7 +7,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" typedef enum { PYB_I2C_1 = 0, @@ -6,7 +6,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "led.h" #include "pin.h" #include "build/pins.h" @@ -7,7 +7,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "pin.h" diff --git a/stm/pin_map.c b/stm/pin_map.c index 187ed3e634..9082afe492 100644 --- a/stm/pin_map.c +++ b/stm/pin_map.c @@ -9,7 +9,6 @@ #include "obj.h" #include "runtime.h" #include "nlr.h" -#include "map.h" #include "pin.h" diff --git a/stm/pybmodule.c b/stm/pybmodule.c index fde61b513d..5ae65ad229 100644 --- a/stm/pybmodule.c +++ b/stm/pybmodule.c @@ -9,7 +9,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "gc.h" #include "gccollect.h" #include "systick.h" diff --git a/stm/pybwlan.c b/stm/pybwlan.c index 36a27c5255..8d8ce32437 100644 --- a/stm/pybwlan.c +++ b/stm/pybwlan.c @@ -21,7 +21,6 @@ #include "lexer.h" #include "parse.h" #include "obj.h" -#include "map.h" #include "runtime.h" #include "cc3k/ccspi.h" diff --git a/stm/sdcard.c b/stm/sdcard.c index 59256292fd..ed79b855cc 100644 --- a/stm/sdcard.c +++ b/stm/sdcard.c @@ -9,7 +9,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "runtime.h" #include "sdcard.h" diff --git a/stm/servo.c b/stm/servo.c index 176081e1ad..db38bb21cf 100644 --- a/stm/servo.c +++ b/stm/servo.c @@ -8,7 +8,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "servo.h" // PWM diff --git a/stm/usart.c b/stm/usart.c index 27c40fd841..1dfbd433bb 100644 --- a/stm/usart.c +++ b/stm/usart.c @@ -7,7 +7,6 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" -#include "map.h" #include "usart.h" pyb_usart_t pyb_usart_global_debug = PYB_USART_NONE; |