flash_bank_t -> struct flash_bank

[fw/openocd] / src / flash / ocl.c

diff --git a/src/flash/ocl.c b/src/flash/ocl.c
index 10ac230e04a96b16504f14a719348248bb7d8555..26d28305824ca0a8f55ae2b07df3110bb2f9768e 100644 (file)
--- a/src/flash/ocl.c
+++ b/src/flash/ocl.c
@@ -28,17 +28,17 @@
 
 struct ocl_priv
 {
-       arm_jtag_t *jtag_info;
+       struct arm_jtag *jtag_info;
        unsigned int buflen;
        unsigned int bufalign;
 };
 
-static int ocl_erase_check(struct flash_bank_s *bank)
+static int ocl_erase_check(struct flash_bank *bank)
 {
        return ERROR_OK;
 }
 
-static int ocl_protect_check(struct flash_bank_s *bank)
+static int ocl_protect_check(struct flash_bank *bank)
 {
        return ERROR_OK;
 }
@@ -47,8 +47,8 @@ static int ocl_protect_check(struct flash_bank_s *bank)
 FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
 {
        int retval;
-       armv4_5_common_t *armv4_5;
-       arm7_9_common_t *arm7_9;
+       struct arm *armv4_5;
+       struct arm7_9_common *arm7_9;
        struct ocl_priv *ocl;
 
        if (argc < 6)
@@ -68,7 +68,7 @@ FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
        return ERROR_OK;
 }
 
-static int ocl_erase(struct flash_bank_s *bank, int first, int last)
+static int ocl_erase(struct flash_bank *bank, int first, int last)
 {
        struct ocl_priv *ocl = bank->driver_priv;
        int retval;
@@ -123,12 +123,12 @@ static int ocl_erase(struct flash_bank_s *bank, int first, int last)
        return ERROR_OK;
 }
 
-static int ocl_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int ocl_protect(struct flash_bank *bank, int set, int first, int last)
 {
        return ERROR_OK;
 }
 
-static int ocl_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int ocl_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct ocl_priv *ocl = bank->driver_priv;
        int retval;
@@ -235,7 +235,7 @@ static int ocl_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset
        return ERROR_OK;
 }
 
-static int ocl_probe(struct flash_bank_s *bank)
+static int ocl_probe(struct flash_bank *bank)
 {
        struct ocl_priv *ocl = bank->driver_priv;
        int retval;
@@ -333,12 +333,12 @@ static int ocl_probe(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-static int ocl_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int ocl_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        return ERROR_OK;
 }
 
-static int ocl_auto_probe(struct flash_bank_s *bank)
+static int ocl_auto_probe(struct flash_bank *bank)
 {
        struct ocl_priv *ocl = bank->driver_priv;