X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjtag%2Fpresto.c;h=ea57a36ec8b925a6ebb9ba23d891f8d9f79f0e62;hb=479a65e946860f754869a82f2d793d64643fb85b;hp=8ad4369259a1d118b0f84faf8a8e657c9cc0309c;hpb=2710aba7013b17740bb68ca27c74afe15de62df9;p=openocd

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 8ad43692..ea57a36e 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -49,12 +49,12 @@
 #error "BUG: either FTD2XX and LIBFTDI has to be used"
 #endif
 
-int presto_jtag_speed(int speed);
-int presto_jtag_khz(int khz, int *jtag_speed);
-int presto_jtag_speed_div(int speed, int *khz);
-int presto_jtag_register_commands(struct command_context_s *cmd_ctx);
-int presto_jtag_init(void);
-int presto_jtag_quit(void);
+static int presto_jtag_speed(int speed);
+static int presto_jtag_khz(int khz, int *jtag_speed);
+static int presto_jtag_speed_div(int speed, int *khz);
+static int presto_jtag_register_commands(struct command_context_s *cmd_ctx);
+static int presto_jtag_init(void);
+static int presto_jtag_quit(void);
 
 jtag_interface_t presto_interface =
 {
@@ -68,14 +68,14 @@ jtag_interface_t presto_interface =
 	.quit = presto_jtag_quit,
 };
 
-int presto_bitq_out(int tms, int tdi, int tdo_req);
-int presto_bitq_flush(void);
-int presto_bitq_sleep(unsigned long us);
-int presto_bitq_reset(int trst, int srst);
-int presto_bitq_in_rdy(void);
-int presto_bitq_in(void);
+static int presto_bitq_out(int tms, int tdi, int tdo_req);
+static int presto_bitq_flush(void);
+static int presto_bitq_sleep(unsigned long us);
+static int presto_bitq_reset(int trst, int srst);
+static int presto_bitq_in_rdy(void);
+static int presto_bitq_in(void);
 
-bitq_interface_t presto_bitq =
+static bitq_interface_t presto_bitq =
 {
 	.out = presto_bitq_out,
 	.flush = presto_bitq_flush,
@@ -130,15 +130,15 @@ typedef struct presto_s
 	
 } presto_t;
 
-presto_t presto_state;
-presto_t *presto = &presto_state;
+static presto_t presto_state;
+static presto_t *presto = &presto_state;
 
-u8 presto_init_seq[] =
+static u8 presto_init_seq[] =
 {
 	0x80, 0xA0, 0xA8, 0xB0, 0xC0, 0xE0
 };
 
-int presto_write(u8 *buf, u32 size)
+static int presto_write(u8 *buf, u32 size)
 {
 #if BUILD_PRESTO_FTD2XX == 1
 	DWORD ftbytes;
@@ -167,7 +167,7 @@ int presto_write(u8 *buf, u32 size)
 	return ERROR_OK;
 }
 
-int presto_read(u8* buf, u32 size)
+static int presto_read(u8* buf, u32 size)
 {
 #if BUILD_PRESTO_FTD2XX == 1
 	DWORD ftbytes;
@@ -210,7 +210,7 @@ int presto_read(u8* buf, u32 size)
 }
 
 #if BUILD_PRESTO_FTD2XX == 1
-int presto_open_ftd2xx(char *req_serial)
+static int presto_open_ftd2xx(char *req_serial)
 {
 	u32 i;
 	DWORD numdevs;
@@ -340,7 +340,7 @@ int presto_open_ftd2xx(char *req_serial)
 }
 
 #elif BUILD_PRESTO_LIBFTDI == 1
-int presto_open_libftdi(char *req_serial)
+static int presto_open_libftdi(char *req_serial)
 {
 	u8 presto_data;
 
@@ -413,7 +413,7 @@ int presto_open_libftdi(char *req_serial)
 }
 #endif /* BUILD_PRESTO_LIBFTDI == 1 */
 
-int presto_open(char *req_serial)
+static int presto_open(char *req_serial)
 {
 	presto->buff_out_pos=0;
 	presto->buff_in_pos=0;
@@ -438,7 +438,7 @@ int presto_open(char *req_serial)
 #endif
 }
 
-int presto_close(void)
+static int presto_close(void)
 {
 
 	int result = ERROR_OK;
@@ -482,7 +482,7 @@ int presto_close(void)
 	return result;
 }
 
-int presto_flush(void)
+static int presto_flush(void)
 {
 	if (presto->buff_out_pos == 0)
 		return ERROR_OK;
@@ -525,7 +525,7 @@ int presto_flush(void)
 	return ERROR_OK;
 }
 
-int presto_sendbyte(int data)
+static int presto_sendbyte(int data)
 {
 	if (data == EOF) return presto_flush();
 
@@ -549,7 +549,8 @@ int presto_sendbyte(int data)
 	return ERROR_OK;
 }
 
-int presto_getbyte(void)
+#if 0
+static int presto_getbyte(void)
 {
 	if (presto->buff_in_pos < presto->buff_in_len)
 		return presto->buff_in[presto->buff_in_pos++];
@@ -565,10 +566,11 @@ int presto_getbyte(void)
 
 	return -1;
 }
+#endif
 
 /* -------------------------------------------------------------------------- */
 
-int presto_tdi_flush(void)
+static int presto_tdi_flush(void)
 {
 	if (presto->jtag_tdi_count == 0)
 		return 0;
@@ -587,7 +589,7 @@ int presto_tdi_flush(void)
 	return 0;
 }
 
-int presto_tck_idle(void)
+static int presto_tck_idle(void)
 {
 	if (presto->jtag_tck == 1)
 	{
@@ -600,7 +602,7 @@ int presto_tck_idle(void)
 
 /* -------------------------------------------------------------------------- */
 
-int presto_bitq_out(int tms, int tdi, int tdo_req)
+static int presto_bitq_out(int tms, int tdi, int tdo_req)
 {
 	int i;
 	unsigned char cmd;
@@ -646,7 +648,7 @@ int presto_bitq_out(int tms, int tdi, int tdo_req)
 	return 0;
 }
 
-int presto_bitq_flush(void)
+static int presto_bitq_flush(void)
 {
 	presto_tdi_flush();
 	presto_tck_idle();
@@ -656,14 +658,14 @@ int presto_bitq_flush(void)
 	return presto_flush();
 }
 
-int presto_bitq_in_rdy(void)
+static int presto_bitq_in_rdy(void)
 {
 	if (presto->buff_in_pos>=presto->buff_in_len)
 		return 0;
 	return presto->buff_in_len-presto->buff_in_pos;
 }
 
-int presto_bitq_in(void)
+static int presto_bitq_in(void)
 {
 	if (presto->buff_in_pos>=presto->buff_in_len)
 		return -1;
@@ -671,7 +673,7 @@ int presto_bitq_in(void)
 	return 0;
 }
 
-int presto_bitq_sleep(unsigned long us)
+static int presto_bitq_sleep(unsigned long us)
 {
 	long waits;
 
@@ -692,7 +694,7 @@ int presto_bitq_sleep(unsigned long us)
 	return 0;
 }
 
-int presto_bitq_reset(int trst, int srst)
+static int presto_bitq_reset(int trst, int srst)
 {
 	presto_tdi_flush();
 	presto_tck_idle();
@@ -709,7 +711,7 @@ int presto_bitq_reset(int trst, int srst)
 
 /* -------------------------------------------------------------------------- */
 
-int presto_jtag_khz(int khz, int *jtag_speed)
+static int presto_jtag_khz(int khz, int *jtag_speed)
 {
 	if (khz < 0)
 	{
@@ -723,7 +725,7 @@ int presto_jtag_khz(int khz, int *jtag_speed)
 	return 0;
 }
 
-int presto_jtag_speed_div(int speed, int *khz)
+static int presto_jtag_speed_div(int speed, int *khz)
 {
 	if ((speed < 0) || (speed > 1000))
 	{
@@ -737,7 +739,7 @@ int presto_jtag_speed_div(int speed, int *khz)
 	return 0;
 }
 
-int presto_jtag_speed(int speed)
+static int presto_jtag_speed(int speed)
 {
 	int khz;
 	
@@ -756,9 +758,9 @@ int presto_jtag_speed(int speed)
 	return 0;
 }
 
-char *presto_serial;
+static char *presto_serial;
 
-int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
 	if (argc == 1)
 	{
@@ -774,14 +776,14 @@ int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, c
 	return ERROR_OK;
 }
 
-int presto_jtag_register_commands(struct command_context_s *cmd_ctx)
+static int presto_jtag_register_commands(struct command_context_s *cmd_ctx)
 {
 	register_command(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command,
 		COMMAND_CONFIG, NULL);
 	return ERROR_OK;
 }
 
-int presto_jtag_init(void)
+static int presto_jtag_init(void)
 {
 	if (presto_open(presto_serial) != ERROR_OK)
 	{
@@ -801,7 +803,7 @@ int presto_jtag_init(void)
 	return ERROR_OK;
 }
 
-int presto_jtag_quit(void)
+static int presto_jtag_quit(void)
 {
 	bitq_cleanup();
 	presto_close();