Remove 'extern' file from function prototypes inside source files.
Signed-off-by: Zachary T Welch <z...@superlucidity.net>
---
src/ecosboard.c | 4 ++--
src/flash/avrf.c | 22 +++++++++++-----------
src/jtag/minidummy/minidummy.c | 4 +---
src/jtag/zy1000/zy1000.c | 4 +---
src/main.c | 2 +-
src/server/gdb_server.c | 3 ++-
src/server/server.c | 4 ++--
src/target/arm9tdmi.c | 2 +-
8 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/src/ecosboard.c b/src/ecosboard.c
index b0f9525..3e2e7ea 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -256,7 +256,7 @@ int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx
#endif
-externC void phi_init_all_network_interfaces(void);
+void phi_init_all_network_interfaces(void);
command_context_t *cmd_ctx;
@@ -275,7 +275,7 @@ void keep_webserver(void)
// we'll have a reboot scheduled.
}
-extern void printDccChar(char c);
+void printDccChar(char c);
static char logBuffer[128 * 1024];
static const int logSize = sizeof(logBuffer);
diff --git a/src/flash/avrf.c b/src/flash/avrf.c
index 2b95b8a..1a87f7a 100644
--- a/src/flash/avrf.c
+++ b/src/flash/avrf.c
@@ -69,18 +69,18 @@ static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size);
static int avrf_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-extern int avr_jtag_sendinstr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out);
-extern int avr_jtag_senddat(jtag_tap_t *tap, uint32_t *dr_in, uint32_t dr_out, int len);
-
-extern int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti);
-extern int mcu_write_dr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int dr_len, int rti);
-extern int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti);
-extern int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti);
-extern int mcu_write_ir_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti);
-extern int mcu_write_dr_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int dr_len, int rti);
-extern int mcu_write_ir_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti);
-extern int mcu_write_dr_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int dr_len, int rti);
-extern int mcu_execute_queue(void);
+int avr_jtag_sendinstr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out);
+int avr_jtag_senddat(jtag_tap_t *tap, uint32_t *dr_in, uint32_t dr_out, int len);
+
+int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti);
+int mcu_write_dr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int dr_len, int rti);
+int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti);
+int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti);
+int mcu_write_ir_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti);
+int mcu_write_dr_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int dr_len, int rti);
+int mcu_write_ir_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti);
+int mcu_write_dr_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int dr_len, int rti);
+int mcu_execute_queue(void);
flash_driver_t avr_flash =
{
diff --git a/src/jtag/minidummy/minidummy.c b/src/jtag/minidummy/minidummy.c
index 2cab0f5..b4dddbe 100644
--- a/src/jtag/minidummy/minidummy.c
+++ b/src/jtag/minidummy/minidummy.c
@@ -57,7 +57,7 @@ int interface_jtag_execute_queue(void)
-extern int jtag_check_value(uint8_t *captured, void *priv);
+int jtag_check_value(uint8_t *captured, void *priv);
int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
{
@@ -78,8 +78,6 @@ int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields,
return ERROR_OK;
}
-/*extern jtag_command_t **jtag_get_last_command_p(void);*/
-
int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
{
/* synchronously do the operation here */
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index f45bff5..80ceadc 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -455,7 +455,7 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt
}
#endif
-extern int jtag_check_value(uint8_t *captured, void *priv);
+int jtag_check_value(uint8_t *captured, void *priv);
static void gotoEndState(tap_state_t end_state)
{
@@ -595,8 +595,6 @@ int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields,
return ERROR_OK;
}
-/*extern jtag_command_t **jtag_get_last_command_p(void);*/
-
int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
{
diff --git a/src/main.c b/src/main.c
index c2b53da..292d71e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,7 +32,7 @@
* Those applications will have their own main() implementation
* and use bits and pieces from openocd.c. */
-extern int openocd_main(int argc, char *argv[]);
+int openocd_main(int argc, char *argv[]);
int main(int argc, char *argv[])
{
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 3ed2b1f..403dc9a 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -45,7 +45,8 @@ static gdb_connection_t *current_gdb_connection;
static int gdb_breakpoint_override;
static enum breakpoint_type gdb_breakpoint_override_type;
-extern int gdb_error(connection_t *connection, int retval);
+int gdb_error(connection_t *connection, int retval);
+
static unsigned short gdb_port = 3333;
static const char *DIGITS = "0123456789abcdef";
diff --git a/src/server/server.c b/src/server/server.c
index 03f0ee6..e1bbef8 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -286,8 +286,8 @@ int remove_services(void)
return ERROR_OK;
}
-extern void openocd_sleep_prelude(void);
-extern void openocd_sleep_postlude(void);
+void openocd_sleep_prelude(void);
+void openocd_sleep_postlude(void);
int server_loop(command_context_t *command_context)
{
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 9455c05..006d8bc 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -253,7 +253,7 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, uint32_t *in)
return ERROR_OK;
}
-extern void arm_endianness(uint8_t *tmp, void *in, int size, int be, int flip);
+void arm_endianness(uint8_t *tmp, void *in, int size, int be, int flip);
static int arm9endianness(jtag_callback_data_t arg,
jtag_callback_data_t size, jtag_callback_data_t be,
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
