aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-05-23 17:41:04 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-05-26 02:42:06 -0400
commit47f8d216d0efe8b523bf3cdd00816fb9965d22a7 (patch)
tree651196087275c614353fbce2a70c3dd8fd58016b
parent41a93d13f0c89b00b90a492c24c9576e93cebafd (diff)
downloadlibrambutan-47f8d216d0efe8b523bf3cdd00816fb9965d22a7.tar.gz
librambutan-47f8d216d0efe8b523bf3cdd00816fb9965d22a7.zip
Tweak some register map base pointers.
Replace #define XXX_BASE ((xxx_reg_map*)0xDEADBEEF) with #define XXX_BASE ((struct xxx_reg_map*)0xDEADBEEF) for increased GDB-friendliness.
-rw-r--r--libmaple/adc.h6
-rw-r--r--libmaple/bkp.h2
-rw-r--r--libmaple/dac.h2
-rw-r--r--libmaple/exti.h2
-rw-r--r--libmaple/flash.h2
-rw-r--r--libmaple/gpio.h16
-rw-r--r--libmaple/nvic.h2
-rw-r--r--libmaple/pwr.h2
-rw-r--r--libmaple/rcc.h2
9 files changed, 18 insertions, 18 deletions
diff --git a/libmaple/adc.h b/libmaple/adc.h
index 41b2096..efb45f7 100644
--- a/libmaple/adc.h
+++ b/libmaple/adc.h
@@ -80,12 +80,12 @@ extern const adc_dev *ADC3;
*/
/** ADC1 register map base pointer. */
-#define ADC1_BASE ((adc_reg_map*)0x40012400)
+#define ADC1_BASE ((struct adc_reg_map*)0x40012400)
/** ADC2 register map base pointer. */
-#define ADC2_BASE ((adc_reg_map*)0x40012800)
+#define ADC2_BASE ((struct adc_reg_map*)0x40012800)
#ifdef STM32_HIGH_DENSITY
/** ADC3 register map base pointer. */
-#define ADC3_BASE ((adc_reg_map*)0x40013C00)
+#define ADC3_BASE ((struct adc_reg_map*)0x40013C00)
#endif
/*
diff --git a/libmaple/bkp.h b/libmaple/bkp.h
index 9994743..a81267d 100644
--- a/libmaple/bkp.h
+++ b/libmaple/bkp.h
@@ -99,7 +99,7 @@ typedef struct bkp_reg_map {
} bkp_reg_map;
/** Backup peripheral register map base pointer. */
-#define BKP_BASE ((bkp_reg_map*)0x40006C00)
+#define BKP_BASE ((struct bkp_reg_map*)0x40006C00)
/** Backup peripheral device type. */
typedef struct bkp_dev {
diff --git a/libmaple/dac.h b/libmaple/dac.h
index 05914a4..a6a7541 100644
--- a/libmaple/dac.h
+++ b/libmaple/dac.h
@@ -69,7 +69,7 @@ typedef struct dac_reg_map {
} dac_reg_map;
/** DAC register map base address */
-#define DAC_BASE ((dac_reg_map*)0x40007400)
+#define DAC_BASE ((struct dac_reg_map*)0x40007400)
/*
* Devices
diff --git a/libmaple/exti.h b/libmaple/exti.h
index e145033..f665015 100644
--- a/libmaple/exti.h
+++ b/libmaple/exti.h
@@ -50,7 +50,7 @@ typedef struct exti_reg_map {
} exti_reg_map;
/** EXTI register map base pointer */
-#define EXTI_BASE ((exti_reg_map*)0x40010400)
+#define EXTI_BASE ((struct exti_reg_map*)0x40010400)
/** External interrupt trigger mode */
typedef enum exti_trigger_mode {
diff --git a/libmaple/flash.h b/libmaple/flash.h
index 9db5015..8ee03c5 100644
--- a/libmaple/flash.h
+++ b/libmaple/flash.h
@@ -49,7 +49,7 @@ typedef struct flash_reg_map {
} flash_reg_map;
/** Flash register map base pointer */
-#define FLASH_BASE ((flash_reg_map*)0x40022000)
+#define FLASH_BASE ((struct flash_reg_map*)0x40022000)
/*
* Register bit definitions
diff --git a/libmaple/gpio.h b/libmaple/gpio.h
index 7e670e6..6c5be1f 100644
--- a/libmaple/gpio.h
+++ b/libmaple/gpio.h
@@ -99,20 +99,20 @@ extern gpio_dev* const GPIOG;
#endif
/** GPIO port A register map base pointer */
-#define GPIOA_BASE ((gpio_reg_map*)0x40010800)
+#define GPIOA_BASE ((struct gpio_reg_map*)0x40010800)
/** GPIO port B register map base pointer */
-#define GPIOB_BASE ((gpio_reg_map*)0x40010C00)
+#define GPIOB_BASE ((struct gpio_reg_map*)0x40010C00)
/** GPIO port C register map base pointer */
-#define GPIOC_BASE ((gpio_reg_map*)0x40011000)
+#define GPIOC_BASE ((struct gpio_reg_map*)0x40011000)
/** GPIO port D register map base pointer */
-#define GPIOD_BASE ((gpio_reg_map*)0x40011400)
+#define GPIOD_BASE ((struct gpio_reg_map*)0x40011400)
#ifdef STM32_HIGH_DENSITY
/** GPIO port E register map base pointer */
-#define GPIOE_BASE ((gpio_reg_map*)0x40011800)
+#define GPIOE_BASE ((struct gpio_reg_map*)0x40011800)
/** GPIO port F register map base pointer */
-#define GPIOF_BASE ((gpio_reg_map*)0x40011C00)
+#define GPIOF_BASE ((struct gpio_reg_map*)0x40011C00)
/** GPIO port G register map base pointer */
-#define GPIOG_BASE ((gpio_reg_map*)0x40012000)
+#define GPIOG_BASE ((struct gpio_reg_map*)0x40012000)
#endif
/*
@@ -235,7 +235,7 @@ typedef struct afio_reg_map {
} afio_reg_map;
/** AFIO register map base pointer. */
-#define AFIO_BASE ((afio_reg_map *)0x40010000)
+#define AFIO_BASE ((struct afio_reg_map *)0x40010000)
/*
* AFIO register bit definitions
diff --git a/libmaple/nvic.h b/libmaple/nvic.h
index 540a41e..ab51f59 100644
--- a/libmaple/nvic.h
+++ b/libmaple/nvic.h
@@ -55,7 +55,7 @@ typedef struct nvic_reg_map {
} nvic_reg_map;
/** NVIC register map base pointer. */
-#define NVIC_BASE ((nvic_reg_map*)0xE000E100)
+#define NVIC_BASE ((struct nvic_reg_map*)0xE000E100)
/**
* Interrupt vector table interrupt numbers. Each enumerator is the
diff --git a/libmaple/pwr.h b/libmaple/pwr.h
index 264dfd9..88b49c0 100644
--- a/libmaple/pwr.h
+++ b/libmaple/pwr.h
@@ -42,7 +42,7 @@ typedef struct pwr_reg_map {
} pwr_reg_map;
/** Power peripheral register map base pointer. */
-#define PWR_BASE ((pwr_reg_map*)0x40007000)
+#define PWR_BASE ((struct pwr_reg_map*)0x40007000)
/*
* Register bit definitions
diff --git a/libmaple/rcc.h b/libmaple/rcc.h
index 29abb06..0484adf 100644
--- a/libmaple/rcc.h
+++ b/libmaple/rcc.h
@@ -51,7 +51,7 @@ typedef struct rcc_reg_map {
} rcc_reg_map;
/** RCC register map base pointer */
-#define RCC_BASE ((rcc_reg_map*)0x40021000)
+#define RCC_BASE ((struct rcc_reg_map*)0x40021000)
/*
* Register bit definitions