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 239f9f5c042ba73c91c719e02cc42ffae3d7618e..26d28305824ca0a8f55ae2b07df3110bb2f9768e 100644 (file)
--- a/src/flash/ocl.c
+++ b/src/flash/ocl.c
@@ -26,19 +26,19 @@
 #include "embeddedice.h"
 
 
-typedef struct ocl_priv_s
+struct ocl_priv
 {
-       arm_jtag_t *jtag_info;
+       struct arm_jtag *jtag_info;
        unsigned int buflen;
        unsigned int bufalign;
-} ocl_priv_t;
+};
 
-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,9 +47,9 @@ 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;
-       ocl_priv_t *ocl;
+       struct arm *armv4_5;
+       struct arm7_9_common *arm7_9;
+       struct ocl_priv *ocl;
 
        if (argc < 6)
        {
@@ -60,7 +60,7 @@ FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
        if ((retval = arm7_9_get_arch_pointers(bank->target, &armv4_5, &arm7_9)) != ERROR_OK)
                return retval;
 
-       ocl = bank->driver_priv = malloc(sizeof(ocl_priv_t));
+       ocl = bank->driver_priv = malloc(sizeof(struct ocl_priv));
        ocl->jtag_info = &arm7_9->jtag_info;
        ocl->buflen = 0;
        ocl->bufalign = 1;
@@ -68,9 +68,9 @@ 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)
 {
-       ocl_priv_t *ocl = bank->driver_priv;
+       struct ocl_priv *ocl = bank->driver_priv;
        int retval;
        uint32_t dcc_buffer[3];
 
@@ -123,14 +123,14 @@ 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)
 {
-       ocl_priv_t *ocl = bank->driver_priv;
+       struct ocl_priv *ocl = bank->driver_priv;
        int retval;
        uint32_t *dcc_buffer;
        uint32_t *dcc_bufptr;
@@ -235,9 +235,9 @@ 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)
 {
-       ocl_priv_t *ocl = bank->driver_priv;
+       struct ocl_priv *ocl = bank->driver_priv;
        int retval;
        uint32_t dcc_buffer[1];
        int sectsize;
@@ -333,14 +333,14 @@ 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)
 {
-       ocl_priv_t *ocl = bank->driver_priv;
+       struct ocl_priv *ocl = bank->driver_priv;
 
        if (ocl->buflen == 0 || ocl->bufalign == 0)
                return ERROR_FLASH_BANK_NOT_PROBED;
@@ -348,7 +348,7 @@ static int ocl_auto_probe(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-flash_driver_t ocl_flash = {
+struct flash_driver ocl_flash = {
                .name = "ocl",
                .flash_bank_command = &ocl_flash_bank_command,
                .erase = &ocl_erase,