stmhal: Remove #include <stdint.h> from mpconfigport.h.

dpgeorge · dpgeorge · commit 5874c1c92baa · 2014-05-03T13:24:21.000+01:00
Make include dependencies neater, and adheres to the coding convention
that headers should not include headers.
diff --git a/stmhal/bufhelper.c b/stmhal/bufhelper.c
@@ -4,7 +4,7 @@
 #include "obj.h"
 #include "bufhelper.h"
 
-void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, uint8_t *tmp_data) {
+void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data) {
     if (MP_OBJ_IS_INT(o)) {
         tmp_data[0] = mp_obj_get_int(o);
         bufinfo->buf = tmp_data;
diff --git a/stmhal/bufhelper.h b/stmhal/bufhelper.h
@@ -1,2 +1,2 @@
-void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, uint8_t *tmp_data);
+void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data);
 mp_obj_t pyb_buf_get_for_recv(mp_obj_t o, mp_buffer_info_t *bufinfo);
diff --git a/stmhal/gccollect.c b/stmhal/gccollect.c
@@ -41,9 +41,9 @@ void gc_collect(void) {
         gc_info_t info;
         gc_info(&info);
         printf("GC@%lu %lums\n", start, ticks);
-        printf(" %lu total\n", info.total);
-        printf(" %lu : %lu\n", info.used, info.free);
-        printf(" 1=%lu 2=%lu m=%lu\n", info.num_1block, info.num_2block, info.max_block);
+        printf(" " UINT_FMT " total\n", info.total);
+        printf(" " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);
+        printf(" 1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
     }
 }
 
diff --git a/stmhal/input.c b/stmhal/input.c
@@ -1,3 +1,5 @@
+#include <stdint.h>
+
 #include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
diff --git a/stmhal/modos.c b/stmhal/modos.c
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <string.h>
 
 #include "mpconfig.h"
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
@@ -82,9 +82,9 @@ STATIC mp_obj_t pyb_info(uint n_args, const mp_obj_t *args) {
         gc_info_t info;
         gc_info(&info);
         printf("GC:\n");
-        printf("  %lu total\n", info.total);
-        printf("  %lu : %lu\n", info.used, info.free);
-        printf("  1=%lu 2=%lu m=%lu\n", info.num_1block, info.num_2block, info.max_block);
+        printf("  " UINT_FMT " total\n", info.total);
+        printf("  " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);
+        printf("  1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
     }
 
     // free space on flash
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
@@ -1,5 +1,3 @@
-#include <stdint.h>
-
 // options to control how Micro Python is built
 
 #define MICROPY_EMIT_THUMB          (1)
@@ -51,11 +49,11 @@ extern const struct _mp_obj_module_t time_module;
 
 #define BYTES_PER_WORD (4)
 
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
+#define UINT_FMT "%u"
+#define INT_FMT "%d"
 
-typedef int32_t machine_int_t; // must be pointer size
-typedef uint32_t machine_uint_t; // must be pointer size
+typedef int machine_int_t; // must be pointer size
+typedef unsigned int machine_uint_t; // must be pointer size
 typedef void *machine_ptr_t; // must be of pointer size
 typedef const void *machine_const_ptr_t; // must be of pointer size
 
diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c
@@ -84,9 +84,9 @@ bool parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, bo
             gc_info_t info;
             gc_info(&info);
             printf("GC:\n");
-            printf("  %lu total\n", info.total);
-            printf("  %lu : %lu\n", info.used, info.free);
-            printf("  1=%lu 2=%lu m=%lu\n", info.num_1block, info.num_2block, info.max_block);
+            printf("  " UINT_FMT " total\n", info.total);
+            printf("  " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);
+            printf("  1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
         }
     }
 
diff --git a/stmhal/timer.c b/stmhal/timer.c
@@ -467,7 +467,7 @@ void timer_irq_handler(uint tim_id) {
                         // Uncaught exception; disable the callback so it doesn't run again.
                         tim->callback = mp_const_none;
                         __HAL_TIM_DISABLE_IT(&tim->tim, TIM_IT_UPDATE);
-                        printf("Uncaught exception in Timer(%lu) interrupt handler\n", tim->tim_id);
+                        printf("Uncaught exception in Timer(" UINT_FMT ") interrupt handler\n", tim->tim_id);
                         mp_obj_print_exception((mp_obj_t)nlr.ret_val);
                     }
                     gc_unlock();

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t bufinfo, uint8_t tmp_data);`
	`1`	`+void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t bufinfo, byte tmp_data);`
`2`	`2`	`mp_obj_t pyb_buf_get_for_recv(mp_obj_t o, mp_buffer_info_t *bufinfo);`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ void gc_collect(void) {`
`41`	`41`	`gc_info_t info;`
`42`	`42`	`gc_info(&info);`
`43`	`43`	`printf("GC@%lu %lums\n", start, ticks);`
`44`		`- printf(" %lu total\n", info.total);`
`45`		`- printf(" %lu : %lu\n", info.used, info.free);`
`46`		`- printf(" 1=%lu 2=%lu m=%lu\n", info.num_1block, info.num_2block, info.max_block);`
	`44`	`+ printf(" " UINT_FMT " total\n", info.total);`
	`45`	`+ printf(" " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);`
	`46`	`+ printf(" 1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#include <stdint.h>`
	`2`	`+`
`1`	`3`	`#include "mpconfig.h"`
`2`	`4`	`#include "nlr.h"`
`3`	`5`	`#include "misc.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include <stdint.h>`
`1`	`2`	`#include <string.h>`
`2`	`3`
`3`	`4`	`#include "mpconfig.h"`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ bool parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, bo`
`84`	`84`	`gc_info_t info;`
`85`	`85`	`gc_info(&info);`
`86`	`86`	`printf("GC:\n");`
`87`		`- printf(" %lu total\n", info.total);`
`88`		`- printf(" %lu : %lu\n", info.used, info.free);`
`89`		`- printf(" 1=%lu 2=%lu m=%lu\n", info.num_1block, info.num_2block, info.max_block);`
	`87`	`+ printf(" " UINT_FMT " total\n", info.total);`
	`88`	`+ printf(" " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);`
	`89`	`+ printf(" 1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ void timer_irq_handler(uint tim_id) {`
`467`	`467`	`// Uncaught exception; disable the callback so it doesn't run again.`
`468`	`468`	`tim->callback = mp_const_none;`
`469`	`469`	`__HAL_TIM_DISABLE_IT(&tim->tim, TIM_IT_UPDATE);`
`470`		`- printf("Uncaught exception in Timer(%lu) interrupt handler\n", tim->tim_id);`
	`470`	`+ printf("Uncaught exception in Timer(" UINT_FMT ") interrupt handler\n", tim->tim_id);`
`471`	`471`	`mp_obj_print_exception((mp_obj_t)nlr.ret_val);`
`472`	`472`	`}`
`473`	`473`	`gc_unlock();`