diff options
author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-02 15:08:51 +0000 |
---|---|---|
committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-06 10:59:07 +0000 |
commit | de0130a0aad83c1ef692ee4d68ab996a8668424d (patch) | |
tree | 8d151b820c89c2b9e76dcae953d1f6caf4b18f14 /src/jtag/drivers/versaloon/versaloon.h | |
parent | 2af5b97ba31fed7bab2d43b987f815629e1cd8f7 (diff) |
build: cleanup src/jtag/drivers directory
Change-Id: I99c08ec0132d5a15250050e718310f1ddd9fe546
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/425
Tested-by: jenkins
Diffstat (limited to 'src/jtag/drivers/versaloon/versaloon.h')
-rw-r--r-- | src/jtag/drivers/versaloon/versaloon.h | 77 |
1 files changed, 35 insertions, 42 deletions
diff --git a/src/jtag/drivers/versaloon/versaloon.h b/src/jtag/drivers/versaloon/versaloon.h index 18ccbea4..96812252 100644 --- a/src/jtag/drivers/versaloon/versaloon.h +++ b/src/jtag/drivers/versaloon/versaloon.h @@ -16,11 +16,11 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef __VERSALOON_H_INCLUDED__ #define __VERSALOON_H_INCLUDED__ -struct usart_status_t -{ +struct usart_status_t { uint32_t tx_buff_avail; uint32_t tx_buff_size; uint32_t rx_buff_avail; @@ -29,7 +29,7 @@ struct usart_status_t #include "usbtoxxx/usbtoxxx.h" -// GPIO pins +/* GPIO pins */ #define GPIO_SRST (1 << 0) #define GPIO_TRST (1 << 1) #define GPIO_USR1 (1 << 2) @@ -39,61 +39,55 @@ struct usart_status_t #define GPIO_TDI (1 << 6) #define GPIO_RTCK (1 << 7) #define GPIO_TMS (1 << 8) -struct interface_gpio_t -{ - RESULT (*init)(uint8_t interface_index); - RESULT (*fini)(uint8_t interface_index); - RESULT (*config)(uint8_t interface_index, uint32_t pin_mask, uint32_t io, - uint32_t pull_en_mask, uint32_t input_pull_mask); - RESULT (*out)(uint8_t interface_index, uint32_t pin_mask, uint32_t value); - RESULT (*in)(uint8_t interface_index, uint32_t pin_mask, uint32_t *value); + +struct interface_gpio_t { + RESULT(*init)(uint8_t interface_index); + RESULT(*fini)(uint8_t interface_index); + RESULT(*config)(uint8_t interface_index, uint32_t pin_mask, uint32_t io, + uint32_t pull_en_mask, uint32_t input_pull_mask); + RESULT(*out)(uint8_t interface_index, uint32_t pin_mask, uint32_t value); + RESULT(*in)(uint8_t interface_index, uint32_t pin_mask, uint32_t *value); }; -struct interface_delay_t -{ - RESULT (*delayms)(uint16_t ms); - RESULT (*delayus)(uint16_t us); +struct interface_delay_t { + RESULT(*delayms)(uint16_t ms); + RESULT(*delayus)(uint16_t us); }; -struct interface_swd_t -{ - RESULT (*init)(uint8_t interface_index); - RESULT (*fini)(uint8_t interface_index); - RESULT (*config)(uint8_t interface_index, uint8_t trn, uint16_t retry, +struct interface_swd_t { + RESULT(*init)(uint8_t interface_index); + RESULT(*fini)(uint8_t interface_index); + RESULT(*config)(uint8_t interface_index, uint8_t trn, uint16_t retry, uint16_t dly); - RESULT (*seqout)(uint8_t interface_index, uint8_t *data, uint16_t bitlen); - RESULT (*seqin)(uint8_t interface_index, uint8_t *data, uint16_t bitlen); - RESULT (*transact)(uint8_t interface_index, uint8_t request, + RESULT(*seqout)(uint8_t interface_index, uint8_t *data, uint16_t bitlen); + RESULT(*seqin)(uint8_t interface_index, uint8_t *data, uint16_t bitlen); + RESULT(*transact)(uint8_t interface_index, uint8_t request, uint32_t *data, uint8_t *ack); }; -struct interface_jtag_raw_t -{ - RESULT (*init)(uint8_t interface_index); - RESULT (*fini)(uint8_t interface_index); - RESULT (*config)(uint8_t interface_index, uint32_t kHz); - RESULT (*execute)(uint8_t interface_index, uint8_t* tdi, uint8_t* tms, +struct interface_jtag_raw_t { + RESULT(*init)(uint8_t interface_index); + RESULT(*fini)(uint8_t interface_index); + RESULT(*config)(uint8_t interface_index, uint32_t kHz); + RESULT(*execute)(uint8_t interface_index, uint8_t *tdi, uint8_t *tms, uint8_t *tdo, uint32_t bitlen); }; -struct interface_target_voltage_t -{ - RESULT (*get)(uint16_t *voltage); - RESULT (*set)(uint16_t voltage); +struct interface_target_voltage_t { + RESULT(*get)(uint16_t *voltage); + RESULT(*set)(uint16_t voltage); }; -struct versaloon_adaptors_t -{ +struct versaloon_adaptors_t { struct interface_target_voltage_t target_voltage; struct interface_gpio_t gpio; struct interface_delay_t delay; struct interface_swd_t swd; struct interface_jtag_raw_t jtag_raw; - RESULT (*peripheral_commit)(void); + RESULT(*peripheral_commit)(void); }; -struct versaloon_usb_setting_t -{ +struct versaloon_usb_setting_t { uint16_t vid; uint16_t pid; uint8_t ep_out; @@ -104,10 +98,9 @@ struct versaloon_usb_setting_t uint16_t buf_size; }; -struct versaloon_interface_t -{ - RESULT (*init)(void); - RESULT (*fini)(void); +struct versaloon_interface_t { + RESULT(*init)(void); + RESULT(*fini)(void); struct versaloon_adaptors_t adaptors; struct versaloon_usb_setting_t usb_setting; }; |