#include "target.h" less wildly

[fw/openocd] / src / flash / pic32mx.h

diff --git a/src/flash/pic32mx.h b/src/flash/pic32mx.h
index 49a9bb40dc9e724432722e59b894c95ff6d2f2fd..92f40c2e5f3b96086c4955374a12a597ec957506 100644 (file)
--- a/src/flash/pic32mx.h
+++ b/src/flash/pic32mx.h
@@ -28,13 +28,13 @@
 
 #include "flash.h"
 
-typedef struct pic32mx_flash_bank_s
+struct pic32mx_flash_bank
 {
-       working_area_t *write_algorithm;
+       struct working_area *write_algorithm;
        int devid;
        int ppage_size;
        int probed;
-} pic32mx_flash_bank_t;
+};
 
 #define PIC32MX_MANUF_ID       0x029
 
@@ -62,9 +62,9 @@ typedef struct pic32mx_flash_bank_s
  * Note: These macros only work for KSEG0/KSEG1 addresses.
  */
 #define KS1Virt2Phys(vaddr)                    ((vaddr)-0xA0000000)
-#define Phys2KS1Virt(paddr)                    ((paddr)+0xA0000000)
+#define Phys2KS1Virt(paddr)                    ((paddr) + 0xA0000000)
 #define KS0Virt2Phys(vaddr)                    ((vaddr)-0x80000000)
-#define Phys2KS0Virt(paddr)                    ((paddr)+0x80000000)
+#define Phys2KS0Virt(paddr)                    ((paddr) + 0x80000000)
 
 /* pic32mx configuration register locations */
 
@@ -104,10 +104,10 @@ typedef struct pic32mx_flash_bank_s
 #define NVMKEY1                        0xAA996655
 #define NVMKEY2                        0x556699AA
 
-typedef struct pic32mx_mem_layout_s {
+struct pic32mx_mem_layout {
        uint32_t sector_start;
        uint32_t sector_size;
-} pic32mx_mem_layout_t;
+};
 
 #endif /* PIC32MX_H */