cc3200: Re-name pybsystick to mpsystick.

danicampora · danicampora · commit c45e641c1de2 · 2015-03-21T11:21:45.000+01:00
diff --git a/cc3200/application.mk b/cc3200/application.mk
@@ -79,6 +79,7 @@ APP_MISC_SRC_C = $(addprefix misc/,\
 	mpcallback.c \
 	mperror.c \
 	mpexception.c \
+	mpsystick.c \
 	pin_defs_cc3200.c \
 	)
 
@@ -95,7 +96,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	pybrtc.c \
 	pybsd.c \
 	pybsleep.c \
-	pybsystick.c \
 	pybuart.c \
 	pybwdt.c \
 	)
diff --git a/cc3200/misc/help.c b/cc3200/misc/help.c
@@ -46,10 +46,9 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // print a general help message
         printf("%s", help_text);
-
-    } else {
+    }
+    else {
         // try to print something sensible about the given object
-
         printf("object ");
         mp_obj_print(args[0], PRINT_STR);
         printf(" is of type %s\n", mp_obj_get_type_str(args[0]));
@@ -76,7 +75,6 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
             }
         }
     }
-
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_help_obj, 0, 1, pyb_help);
diff --git a/cc3200/misc/mpsystick.c b/cc3200/misc/mpsystick.c
@@ -29,7 +29,7 @@
 #include MICROPY_HAL_H
 #include "py/obj.h"
 #include "irq.h"
-#include "pybsystick.h"
+#include "mpsystick.h"
 #include "systick.h"
 #include "inc/hw_types.h"
 #include "inc/hw_nvic.h"
diff --git a/cc3200/misc/mpsystick.h b/cc3200/misc/mpsystick.h
@@ -25,6 +25,11 @@
  * THE SOFTWARE.
  */
 
+#ifndef MPSYSTICK_H
+#define MPSYSTICK_H
+
 void sys_tick_wait_at_least(uint32_t stc, uint32_t delay_ms);
 bool sys_tick_has_passed(uint32_t stc, uint32_t delay_ms);
 uint32_t sys_tick_get_microseconds(void);
+
+#endif  // MPSYSTICK_H

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ APP_MISC_SRC_C = $(addprefix misc/,\`
`79`	`79`	`mpcallback.c \`
`80`	`80`	`mperror.c \`
`81`	`81`	`mpexception.c \`
	`82`	`+ mpsystick.c \`
`82`	`83`	`pin_defs_cc3200.c \`
`83`	`84`	`)`
`84`	`85`
`@@ -95,7 +96,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\`
`95`	`96`	`pybrtc.c \`
`96`	`97`	`pybsd.c \`
`97`	`98`	`pybsleep.c \`
`98`		`- pybsystick.c \`
`99`	`99`	`pybuart.c \`
`100`	`100`	`pybwdt.c \`
`101`	`101`	`)`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,9 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {`
`46`	`46`	`if (n_args == 0) {`
`47`	`47`	`// print a general help message`
`48`	`48`	`printf("%s", help_text);`
`49`		`-`
`50`		`- } else {`
	`49`	`+ }`
	`50`	`+ else {`
`51`	`51`	`// try to print something sensible about the given object`
`52`		`-`
`53`	`52`	`printf("object ");`
`54`	`53`	`mp_obj_print(args[0], PRINT_STR);`
`55`	`54`	`printf(" is of type %s\n", mp_obj_get_type_str(args[0]));`
`@@ -76,7 +75,6 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {`
`76`	`75`	`}`
`77`	`76`	`}`
`78`	`77`	`}`
`79`		`-`
`80`	`78`	`return mp_const_none;`
`81`	`79`	`}`
`82`	`80`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_help_obj, 0, 1, pyb_help);`