projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add optional debugging to print out pyro firing status
[fw/altos]
/
src
/
lpc
/
lpc.h
diff --git
a/src/lpc/lpc.h
b/src/lpc/lpc.h
index f13ec61529860876c0b5217fa90e92a38dc4ba89..9408ceab1ab7d76ab71037f3c009f7b3ab53d716 100644
(file)
--- a/
src/lpc/lpc.h
+++ b/
src/lpc/lpc.h
@@
-120,7
+120,7
@@
extern struct lpc_ioconf lpc_ioconf;
#define LPC_IOCONF_FUNC_PIO0_3 0
#define LPC_IOCONF_FUNC_USB_VBUS 1
#define LPC_IOCONF_FUNC_PIO0_3 0
#define LPC_IOCONF_FUNC_USB_VBUS 1
-/* PIO0_4
+/* PIO0_4
*/
#define LPC_IOCONF_FUNC_PIO0_4 0
#define LPC_IOCONF_FUNC_I2C_SCL 1
#define LPC_IOCONF_FUNC_PIO0_4 0
#define LPC_IOCONF_FUNC_I2C_SCL 1
@@
-486,6
+486,11
@@
struct lpc_scb {
extern struct lpc_scb lpc_scb;
extern struct lpc_scb lpc_scb;
+#define LPC_SCB_SYSMEMREMAP_MAP 0
+# define LPC_SCB_SYSMEMREMAP_MAP_BOOT_LOADER 0
+# define LPC_SCB_SYSMEMREMAP_MAP_RAM 1
+# define LPC_SCB_SYSMEMREMAP_MAP_FLASH 2
+
#define LPC_SCB_PRESETCTRL_SSP0_RST_N 0
#define LPC_SCB_PRESETCTRL_I2C_RST_N 1
#define LPC_SCB_PRESETCTRL_SSP1_RST_N 2
#define LPC_SCB_PRESETCTRL_SSP0_RST_N 0
#define LPC_SCB_PRESETCTRL_I2C_RST_N 1
#define LPC_SCB_PRESETCTRL_SSP1_RST_N 2
@@
-1014,12
+1019,12
@@
extern struct lpc_nvic lpc_nvic;
static inline void
lpc_nvic_set_enable(int irq) {
static inline void
lpc_nvic_set_enable(int irq) {
- lpc_nvic.iser
|
= (1 << irq);
+ lpc_nvic.iser = (1 << irq);
}
static inline void
lpc_nvic_clear_enable(int irq) {
}
static inline void
lpc_nvic_clear_enable(int irq) {
- lpc_nvic.icer
|
= (1 << irq);
+ lpc_nvic.icer = (1 << irq);
}
static inline int
}
static inline int