ARM7/9: rm arm7_9_get_arch_pointers()

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

diff --git a/src/flash/ocl.c b/src/flash/ocl.c
index 83c8fcf79ac88fe696ff21c30183526e384b5e14..0b492c64ab9f06dfb5124031e55ccb339066d112 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;
 }
@@ -46,8 +46,6 @@ static int ocl_protect_check(struct flash_bank_s *bank)
 /* flash_bank ocl 0 0 0 0 <target#> */
 FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
 {
-       int retval;
-       armv4_5_common_t *armv4_5;
        struct arm7_9_common *arm7_9;
        struct ocl_priv *ocl;
 
@@ -57,8 +55,9 @@ FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       if ((retval = arm7_9_get_arch_pointers(bank->target, &armv4_5, &arm7_9)) != ERROR_OK)
-               return retval;
+       arm7_9 = target_to_arm7_9(bank->target);
+       if (!is_arm7_9(arm7_9))
+               return ERROR_TARGET_INVALID;
 
        ocl = bank->driver_priv = malloc(sizeof(struct ocl_priv));
        ocl->jtag_info = &arm7_9->jtag_info;
@@ -68,7 +67,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 +122,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 +234,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 +332,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;