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.

15 files changed, 0 insertions, 15 deletions

diff --git a/stmhal/accel.c b/stmhal/accel.c
index a564902c0..ffccddc86 100644
--- a/stmhal/accel.c
+++ b/stmhal/accel.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "i2c.h"
 #include "accel.h"
diff --git a/stmhal/adc.c b/stmhal/adc.c
index c4e0b9e25..0b4f3e23e 100644
--- a/stmhal/adc.c
+++ b/stmhal/adc.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "adc.h"
 #include "pin.h"
diff --git a/stmhal/dac.c b/stmhal/dac.c
index b57e2c440..4dbf70022 100644
--- a/stmhal/dac.c
+++ b/stmhal/dac.c
@@ -9,7 +9,6 @@
 #include "qstr.h"
 #include "parse.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "dac.h"
 
diff --git a/stmhal/exti.c b/stmhal/exti.c
index 99bcd07e8..a9b05644c 100644
--- a/stmhal/exti.c
+++ b/stmhal/exti.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "nlr.h"
 
diff --git a/stmhal/file.c b/stmhal/file.c
index 219d58ddb..9575ffd7e 100644
--- a/stmhal/file.c
+++ b/stmhal/file.c
@@ -4,7 +4,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "file.h"
 #include "ff.h"
 
diff --git a/stmhal/help.c b/stmhal/help.c
index 3ab69ec62..66484576b 100644
--- a/stmhal/help.c
+++ b/stmhal/help.c
@@ -5,7 +5,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 
 STATIC const char *help_text =
 "Welcome to Micro Python!\n"
diff --git a/stmhal/i2c.c b/stmhal/i2c.c
index 0b76d35cb..f35d00b54 100644
--- a/stmhal/i2c.c
+++ b/stmhal/i2c.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "i2c.h"
 
diff --git a/stmhal/led.c b/stmhal/led.c
index 995b518e2..ffbaf3ca9 100644
--- a/stmhal/led.c
+++ b/stmhal/led.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "led.h"
 #include "pin.h"
diff --git a/stmhal/modos.c b/stmhal/modos.c
index 606dbe927..5684d1105 100644
--- a/stmhal/modos.c
+++ b/stmhal/modos.c
@@ -5,7 +5,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "systick.h"
 #include "rng.h"
 #include "storage.h"
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index 87fab706d..678408102 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -7,7 +7,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/stmhal/modtime.c b/stmhal/modtime.c
index 4786c85c7..9756ec3b5 100644
--- a/stmhal/modtime.c
+++ b/stmhal/modtime.c
@@ -5,7 +5,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "modtime.h"
 
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
diff --git a/stmhal/pin_map.c b/stmhal/pin_map.c
index 8a0be1d52..2313540a3 100644
--- a/stmhal/pin_map.c
+++ b/stmhal/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/stmhal/sdcard.c b/stmhal/sdcard.c
index 84ee0b7b1..994eb26c2 100644
--- a/stmhal/sdcard.c
+++ b/stmhal/sdcard.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "sdcard.h"
 #include "pin.h"
diff --git a/stmhal/servo.c b/stmhal/servo.c
index 4e8ff1543..15ba35165 100644
--- a/stmhal/servo.c
+++ b/stmhal/servo.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "servo.h"
 
diff --git a/stmhal/usart.c b/stmhal/usart.c
index 14539c597..9bcc6be28 100644
--- a/stmhal/usart.c
+++ b/stmhal/usart.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "usart.h"
 
 struct _pyb_usart_obj_t {