Merge pull request #696 from MarianSavchuk/non_static_JTAG2SWD

flit · web-flow · commit 3dc957e7b41e · 2020-01-26T15:19:16.000-06:00
Make the JTAG2SWD function non-static
diff --git a/source/daplink/interface/swd_host.c b/source/daplink/interface/swd_host.c
@@ -767,7 +767,7 @@ static uint8_t swd_read_idcode(uint32_t *id)
 }
 
 
-static uint8_t JTAG2SWD()
+uint8_t JTAG2SWD()
 {
     uint32_t tmp = 0;
 
diff --git a/source/daplink/interface/swd_host.h b/source/daplink/interface/swd_host.h
@@ -62,6 +62,7 @@ uint8_t swd_transfer_retry(uint32_t req, uint32_t *data);
 void int2array(uint8_t *res, uint32_t data, uint8_t len);
 void swd_set_reset_connect(SWD_CONNECT_TYPE type);
 void swd_set_soft_reset(uint32_t soft_reset_type);
+uint8_t JTAG2SWD(void);
 
 #ifdef __cplusplus
 }
diff --git a/source/daplink/interface/swd_host_ca.c b/source/daplink/interface/swd_host_ca.c
@@ -697,7 +697,7 @@ static uint8_t swd_read_idcode(uint32_t *id)
 }
 
 
-static uint8_t JTAG2SWD()
+uint8_t JTAG2SWD()
 {
     uint32_t tmp = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,7 @@ static uint8_t swd_read_idcode(uint32_t *id)`
`767`	`767`	`}`
`768`	`768`
`769`	`769`
`770`		`-static uint8_t JTAG2SWD()`
	`770`	`+uint8_t JTAG2SWD()`
`771`	`771`	`{`
`772`	`772`	`uint32_t tmp = 0;`
`773`	`773`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ uint8_t swd_transfer_retry(uint32_t req, uint32_t *data);`
`62`	`62`	`void int2array(uint8_t *res, uint32_t data, uint8_t len);`
`63`	`63`	`void swd_set_reset_connect(SWD_CONNECT_TYPE type);`
`64`	`64`	`void swd_set_soft_reset(uint32_t soft_reset_type);`
	`65`	`+uint8_t JTAG2SWD(void);`
`65`	`66`
`66`	`67`	`#ifdef __cplusplus`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ static uint8_t swd_read_idcode(uint32_t *id)`
`697`	`697`	`}`
`698`	`698`
`699`	`699`
`700`		`-static uint8_t JTAG2SWD()`
	`700`	`+uint8_t JTAG2SWD()`
`701`	`701`	`{`
`702`	`702`	`uint32_t tmp = 0;`
`703`	`703`