X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flpc%2Flpc.h;h=1cf35dad2e6846fc35d7cfa45846c4b475d7de88;hp=82f456522c2c0482c8fb62e44a3f4227b2fb1ebc;hb=HEAD;hpb=9a78fd63e8a1362af01d4f01e335ff449f0a5d7e diff --git a/src/lpc/lpc.h b/src/lpc/lpc.h index 82f45652..a234e24b 100644 --- a/src/lpc/lpc.h +++ b/src/lpc/lpc.h @@ -110,13 +110,13 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO0_1 */ #define LPC_IOCONF_FUNC_PIO0_1 0 #define LPC_IOCONF_FUNC_CLKOUT 1 -#define LPC_IOCONF_FUNC_CT32B0_MAT2 2 +#define LPC_IOCONF_FUNC_PIO0_1_CT32B0_MAT2 2 #define LPC_IOCONF_FUNC_USB_FTOGGLE 3 /* PIO0_2 */ #define LPC_IOCONF_FUNC_PIO0_2 0 #define LPC_IOCONF_FUNC_SSEL0 1 -#define LPC_IOCONF_FUNC_CT16B0_CAP0 2 +#define LPC_IOCONF_FUNC_PIO0_2_CT16B0_CAP0 2 /* PIO0_3 */ #define LPC_IOCONF_FUNC_PIO0_3 0 @@ -142,36 +142,36 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO0_8 */ #define LPC_IOCONF_FUNC_PIO0_8 0 #define LPC_IOCONF_FUNC_MISO0 1 -#define LPC_IOCONF_FUNC_CT16B0_MAT0 2 +#define LPC_IOCONF_FUNC_PIO0_8_CT16B0_MAT0 2 /* PIO0_9 */ #define LPC_IOCONF_FUNC_PIO0_9 0 #define LPC_IOCONF_FUNC_MOSI0 1 -#define LPC_IOCONF_FUNC_CT16B0_MAT1 2 +#define LPC_IOCONF_FUNC_PIO0_9_CT16B0_MAT1 2 /* PIO0_10 */ #define LPC_IOCONF_FUNC_SWCLK 0 #define LPC_IOCONF_FUNC_PIO0_10 1 #define LPC_IOCONF_FUNC_PIO0_10_SCK0 2 -#define LPC_IOCONF_FUNC_CT16B0_MAT2 3 +#define LPC_IOCONF_FUNC_PIO0_10_CT16B0_MAT2 3 /* PIO0_11 */ #define LPC_IOCONF_FUNC_TDI 0 #define LPC_IOCONF_FUNC_PIO0_11 1 #define LPC_IOCONF_FUNC_AD0 2 -#define LPC_IOCONF_FUNC_CT32B0_MAT3 3 +#define LPC_IOCONF_FUNC_PIO0_11_CT32B0_MAT3 3 /* PIO0_12 */ #define LPC_IOCONF_FUNC_TMS 0 #define LPC_IOCONF_FUNC_PIO0_12 1 #define LPC_IOCONF_FUNC_AD1 2 -#define LPC_IOCONF_FUNC_CT32B1_CAP0 3 +#define LPC_IOCONF_FUNC_PIO0_12_CT32B1_CAP0 3 /* PIO0_13 */ #define LPC_IOCONF_FUNC_TD0 0 #define LPC_IOCONF_FUNC_PIO0_13 1 #define LPC_IOCONF_FUNC_AD2 2 -#define LPC_IOCONF_FUNC_CT32B1_MAT0 3 +#define LPC_IOCONF_FUNC_PIO0_13_CT32B1_MAT0 3 /* PIO0_14 */ #define LPC_IOCONF_FUNC_TRST 0 @@ -183,12 +183,12 @@ extern struct lpc_ioconf lpc_ioconf; #define LPC_IOCONF_FUNC_SWDIO 0 #define LPC_IOCONF_FUNC_PIO0_15 1 #define LPC_IOCONF_FUNC_AD4 2 -#define LPC_IOCONF_FUNC_CT32B1_MAT2 3 +#define LPC_IOCONF_FUNC_PIO0_15_CT32B1_MAT2 3 /* PIO0_16 */ #define LPC_IOCONF_FUNC_PIO0_16 0 #define LPC_IOCONF_FUNC_AD5 1 -#define LPC_IOCONF_FUNC_CT32B1_MAT3 2 +#define LPC_IOCONF_FUNC_PIO0_16_CT32B1_MAT3 2 /* PIO0_17 */ #define LPC_IOCONF_FUNC_PIO0_17 0 @@ -208,17 +208,17 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO0_20 */ #define LPC_IOCONF_FUNC_PIO0_20 0 -#define LPC_IOCONF_FUNC_CT16B1_CAP0 1 +#define LPC_IOCONF_FUNC_PIO0_20_CT16B1_CAP0 1 /* PIO0_21 */ #define LPC_IOCONF_FUNC_PIO0_21 0 -#define LPC_IOCONF_FUNC_CT16B1_MAT0 1 +#define LPC_IOCONF_FUNC_PIO0_21_CT16B1_MAT0 1 #define LPC_IOCONF_FUNC_PIO0_21_MOSI1 2 /* PIO0_22 */ #define LPC_IOCONF_FUNC_PIO0_22 0 #define LPC_IOCONF_FUNC_AD6 1 -#define LPC_IOCONF_FUNC_CT16B1_MAT1 2 +#define LPC_IOCONF_FUNC_PIO0_22_CT16B1_MAT1 2 #define LPC_IOCONF_FUNC_PIO0_22_MISO1 3 /* PIO0_23 */ @@ -227,11 +227,11 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_0 */ #define LPC_IOCONF_FUNC_PIO1_0 0 -#define LPC_IOCONF_FUNC_CT32B1_MAT1 1 +#define LPC_IOCONF_FUNC_PIO1_0_CT32B1_MAT1 1 /* PIO1_1 */ #define LPC_IOCONF_FUNC_PIO1_1 0 -#define LPC_IOCONF_FUNC_CT32B1_MAT1 1 +#define LPC_IOCONF_FUNC_PIO1_1_CT32B1_MAT1 1 /* PIO1_2 */ #define LPC_IOCONF_FUNC_PIO1_2 0 @@ -247,7 +247,7 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_5 */ #define LPC_IOCONF_FUNC_PIO1_5 0 -#define LPC_IOCONF_FUNC_CT32B1_CAP1 1 +#define LPC_IOCONF_FUNC_PIO1_5_CT32B1_CAP1 1 /* PIO1_6 */ #define LPC_IOCONF_FUNC_PIO1_6 0 @@ -273,14 +273,14 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_13 */ #define LPC_IOCONF_FUNC_PIO1_13 0 #define LPC_IOCONF_FUNC_DTR 1 -#define LPC_IOCONF_FUNC_CT16B0_MAT0 2 +#define LPC_IOCONF_FUNC_PIO1_13_CT16B0_MAT0 2 #define LPC_IOCONF_FUNC_PIO1_13_TXD 3 /* PIO1_14 */ #define LPC_IOCONF_FUNC_PIO1_14 0 #define LPC_IOCONF_FUNC_DSR 1 -#define LPC_IOCONF_FUNC_CT16B0_MAT1 2 -#define LPC_IOCONF_FUNC_PIO1_13_RXD 3 +#define LPC_IOCONF_FUNC_PIO1_14_CT16B0_MAT1 2 +#define LPC_IOCONF_FUNC_PIO1_14_RXD 3 /* PIO1_15 */ #define LPC_IOCONF_FUNC_PIO1_15 0 @@ -291,16 +291,16 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_16 */ #define LPC_IOCONF_FUNC_PIO1_16 0 #define LPC_IOCONF_FUNC_RI 1 -#define LPC_IOCONF_FUNC_CT16B0_CAP0 2 +#define LPC_IOCONF_FUNC_PIO1_16_CT16B0_CAP0 2 /* PIO1_17 */ #define LPC_IOCONF_FUNC_PIO1_17 0 -#define LPC_IOCONF_FUNC_CT16B0_CAP1 1 +#define LPC_IOCONF_FUNC_PIO1_17_CT16B0_CAP1 1 #define LPC_IOCONF_FUNC_PIO1_17_RXD 2 /* PIO1_18 */ #define LPC_IOCONF_FUNC_PIO1_18 0 -#define LPC_IOCONF_FUNC_CT16B1_CAP1 1 +#define LPC_IOCONF_FUNC_PIO1_18_CT16B1_CAP1 1 #define LPC_IOCONF_FUNC_PIO1_18_TXD 2 /* PIO1_19 */ @@ -359,7 +359,7 @@ extern struct lpc_ioconf lpc_ioconf; /* PIO1_31 */ #define LPC_IOCONF_FUNC_PIO1_31 0 -#define LPC_IOCONF_FUNC_MASK 0x7 +#define LPC_IOCONF_FUNC_MASK 0x7UL #define ao_lpc_alternate(func) (((func) << LPC_IOCONF_FUNC) | \ (LPC_IOCONF_MODE_INACTIVE << LPC_IOCONF_MODE) | \ @@ -373,7 +373,7 @@ extern struct lpc_ioconf lpc_ioconf; #define LPC_IOCONF_MODE_PULL_DOWN 1 #define LPC_IOCONF_MODE_PULL_UP 2 #define LPC_IOCONF_MODE_REPEATER 3 -#define LPC_IOCONF_MODE_MASK 3 +#define LPC_IOCONF_MODE_MASK 3UL #define LPC_IOCONF_HYS 5 @@ -504,7 +504,7 @@ extern struct lpc_scb lpc_scb; #define LPC_SCB_SYSPLLCTRL_PSEL_2 1 #define LPC_SCB_SYSPLLCTRL_PSEL_4 2 #define LPC_SCB_SYSPLLCTRL_PSEL_8 3 -#define LPC_SCB_SYSPLLCTRL_PSEL_MASK 3 +#define LPC_SCB_SYSPLLCTRL_PSEL_MASK 3UL #define LPC_SCB_SYSPLLSTAT_LOCK 0 @@ -514,7 +514,7 @@ extern struct lpc_scb lpc_scb; #define LPC_SCB_USBPLLCTRL_PSEL_2 1 #define LPC_SCB_USBPLLCTRL_PSEL_4 2 #define LPC_SCB_USBPLLCTRL_PSEL_8 3 -#define LPC_SCB_USBPLLCTRL_PSEL_MASK 3 +#define LPC_SCB_USBPLLCTRL_PSEL_MASK 3UL #define LPC_SCB_USBPLLSTAT_LOCK 0 @@ -524,7 +524,7 @@ extern struct lpc_scb lpc_scb; #define LPC_SCB_SYSOSCCTRL_FREQRANGE_15_25 1 #define LPC_SCB_WDTOSCCTRL_DIVSEL 0 -#define LPC_SCB_WDTOSCCTRL_DIVSEL_MASK 0x1f +#define LPC_SCB_WDTOSCCTRL_DIVSEL_MASK 0x1fUL #define LPC_SCB_WDTOSCCTRL_FREQSEL 5 #define LPC_SCB_WDTOSCCTRL_FREQSEL_0_6 1 #define LPC_SCB_WDTOSCCTRL_FREQSEL_1_05 2 @@ -541,7 +541,7 @@ extern struct lpc_scb lpc_scb; #define LPC_SCB_WDTOSCCTRL_FREQSEL_4_2 0x0d #define LPC_SCB_WDTOSCCTRL_FREQSEL_4_4 0x0e #define LPC_SCB_WDTOSCCTRL_FREQSEL_4_6 0x0f -#define LPC_SCB_WDTOSCCTRL_FREQSEL_MASK 0x0f +#define LPC_SCB_WDTOSCCTRL_FREQSEL_MASK 0x0fUL #define LPC_SCB_SYSRSTSTAT_POR 0 #define LPC_SCB_SYSRSTSTAT_EXTRST 1 @@ -552,14 +552,14 @@ extern struct lpc_scb lpc_scb; #define LPC_SCB_SYSPLLCLKSEL_SEL 0 #define LPC_SCB_SYSPLLCLKSEL_SEL_IRC 0 #define LPC_SCB_SYSPLLCLKSEL_SEL_SYSOSC 1 -#define LPC_SCB_SYSPLLCLKSEL_SEL_MASK 3 +#define LPC_SCB_SYSPLLCLKSEL_SEL_MASK 3UL #define LPC_SCB_SYSPLLCLKUEN_ENA 0 #define LPC_SCB_USBPLLCLKSEL_SEL 0 #define LPC_SCB_USBPLLCLKSEL_SEL_IRC 0 #define LPC_SCB_USBPLLCLKSEL_SEL_SYSOSC 1 -#define LPC_SCB_USBPLLCLKSEL_SEL_MASK 3 +#define LPC_SCB_USBPLLCLKSEL_SEL_MASK 3UL #define LPC_SCB_USBPLLCLKUEN_ENA 0 @@ -568,7 +568,7 @@ extern struct lpc_scb lpc_scb; #define LPC_SCB_MAINCLKSEL_SEL_PLL_INPUT 1 #define LPC_SCB_MAINCLKSEL_SEL_WATCHDOG 2 #define LPC_SCB_MAINCLKSEL_SEL_PLL_OUTPUT 3 -#define LPC_SCB_MAINCLKSEL_SEL_MASK 3 +#define LPC_SCB_MAINCLKSEL_SEL_MASK 3UL #define LPC_SCB_MAINCLKUEN_ENA 0 @@ -777,7 +777,7 @@ extern struct lpc_usart lpc_usart; #define LPC_USART_IIR_INTID_CTI 6 #define LPC_USART_IIR_INTID_THRE 1 #define LPC_USART_IIR_INTID_MS 0 -#define LPC_USART_IIR_INTID_MASK 7 +#define LPC_USART_IIR_INTID_MASK 7UL #define LPC_USART_IIR_FIFOEN 6 #define LPC_USART_IIR_ABEOINT 8 #define LPC_USART_IIR_ABTOINT 9 @@ -796,18 +796,18 @@ extern struct lpc_usart lpc_usart; #define LPC_USART_LCR_WLS_6 1 #define LPC_USART_LCR_WLS_7 2 #define LPC_USART_LCR_WLS_8 3 -#define LPC_USART_LCR_WLS_MASK 3 +#define LPC_USART_LCR_WLS_MASK 3UL #define LPC_USART_LCR_SBS 2 #define LPC_USART_LCR_SBS_1 0 #define LPC_USART_LCR_SBS_2 1 -#define LPC_USART_LCR_SBS_MASK 1 +#define LPC_USART_LCR_SBS_MASK 1UL #define LPC_USART_LCR_PE 3 #define LPC_USART_LCR_PS 4 #define LPC_USART_LCR_PS_ODD 0 #define LPC_USART_LCR_PS_EVEN 1 #define LPC_USART_LCR_PS_ONE 2 #define LPC_USART_LCR_PS_ZERO 3 -#define LPC_USART_LCR_PS_MASK 3 +#define LPC_USART_LCR_PS_MASK 3UL #define LPC_USART_LCR_BC 6 #define LPC_USART_LCR_DLAB 7 @@ -868,13 +868,13 @@ struct lpc_usb { vuint32_t introuting; uint32_t r30; vuint32_t eptoggle; -} lpc_usb; +}; extern struct lpc_usb lpc_usb; #define lpc_usb (*(struct lpc_usb *) 0x40080000) #define LPC_USB_DEVCMDSTAT_DEV_ADDR 0 -#define LPC_USB_DEVCMDSTAT_DEV_ADDR_MASK 0x7f +#define LPC_USB_DEVCMDSTAT_DEV_ADDR_MASK 0x7fUL #define LPC_USB_DEVCMDSTAT_DEV_EN 7 #define LPC_USB_DEVCMDSTAT_SETUP 8 #define LPC_USB_DEVCMDSTAT_PLL_ON 9 @@ -893,7 +893,7 @@ extern struct lpc_usb lpc_usb; #define LPC_USB_DEVCMDSTAT_VBUSDEBOUNCED 28 #define LPC_USB_INFO_FRAME_NR 0 -#define LPC_USB_INFO_FRAME_NR_MASK 0x3ff +#define LPC_USB_INFO_FRAME_NR_MASK 0x3ffUL #define LPC_USB_INFO_ERR_CODE 11 #define LPC_USB_INFO_ERR_CODE_NO_ERROR 0 #define LPC_USB_INFO_ERR_CODE_PID_ENCODING_ERROR 1 @@ -911,16 +911,16 @@ extern struct lpc_usb lpc_usb; #define LPC_USB_INFO_ERR_CODE_BITSTUFF_ERROR 0xd #define LPC_USB_INFO_ERR_CODE_SYNC_ERROR 0xe #define LPC_USB_INFO_ERR_CODE_WRONG_DATA_TOGGLE 0xf -#define LPC_USB_INFO_ERR_CODE_MASK 0xf +#define LPC_USB_INFO_ERR_CODE_MASK 0xfUL #define LPC_USB_EPLISTSTART_EP_LIST 0 #define LPC_USB_DATABUFSTART_DA_BUF 0 #define LPC_USB_LPM_HIRD_HW 0 -#define LPC_USB_LPM_HIRD_HW_MASK 0xf +#define LPC_USB_LPM_HIRD_HW_MASK 0xfUL #define LPC_USB_LPM_HIRD_SW 4 -#define LPC_USB_LPM_HIRD_SW_MASK 0xf +#define LPC_USB_LPM_HIRD_SW_MASK 0xfUL #define LPC_USB_LPM_DATA_PENDING 8 #define LPC_USB_EPSKIP_SKIP 0 @@ -977,7 +977,7 @@ extern uint8_t lpc_usb_sram[]; #define LPC_USB_EP_RATE_FEEDBACK 27 #define LPC_USB_EP_ENDPOINT_ISO 26 #define LPC_USB_EP_NBYTES 16 -#define LPC_USB_EP_NBYTES_MASK 0x3ff +#define LPC_USB_EP_NBYTES_MASK 0x3ffUL #define LPC_USB_EP_OFFSET 0 #define LPC_ISR_PIN_INT0_POS 0 @@ -1062,7 +1062,7 @@ lpc_nvic_pending(int irq) { #define IRQ_PRIO_REG(irq) ((irq) >> 2) #define IRQ_PRIO_BIT(irq) (((irq) & 3) << 3) -#define IRQ_PRIO_MASK(irq) (0xff << IRQ_PRIO_BIT(irq)) +#define IRQ_PRIO_MASK(irq) (0xffUL << IRQ_PRIO_BIT(irq)) static inline void lpc_nvic_set_priority(int irq, uint8_t prio) {