Use t_hydra_console instead of struct hydra_console.

common/common.c

@@ -71,7 +71,7 @@ void DelayUs(uint32_t delay_us)
  osalSysPolledDelayX(US2RTC(STM32_HCLK, delay_us));
 }
 
-void cmd_mem(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_mem(t_hydra_console *con, int argc, const char* const* argv)
 {
  size_t n, size;
 
@@ -84,7 +84,7 @@ void cmd_mem(struct hydra_console *con, int argc, const char* const* argv)
  chprintf(con->bss, "heap free total : %u bytes\r\n", size);
 }
 
-void cmd_threads(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_threads(t_hydra_console *con, int argc, const char* const* argv)
 {
  static const char *states[] = {CH_STATE_NAMES};
  thread_t *tp;
@@ -104,7 +104,7 @@ void cmd_threads(struct hydra_console *con, int argc, const char* const* argv)
 
 }
 
-void cmd_test(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_test(t_hydra_console *con, int argc, const char* const* argv)
 {
  thread_t *tp;
 
@@ -120,12 +120,12 @@ void cmd_test(struct hydra_console *con, int argc, const char* const* argv)
  chThdWait(tp);
 }
 
-void cmd_info(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_info(t_hydra_console *con, int argc, const char* const* argv)
 {
  cmd_init(con, argc, argv);
 }
 
-void cmd_init(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_init(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -207,7 +207,7 @@ void cmd_init(struct hydra_console *con, int argc, const char* const* argv)
 
 #define waitcycles(n) ( wait_nbcycles(n) )
 /* Just debug to check Timing and accuracy with output pin */
-void cmd_dbg(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_dbg(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argv;
  uint8_t i;

common/common.h

@@ -70,21 +70,21 @@ typedef struct
 /* How much thread working area to allocate per console. */
 #define CONSOLE_WA_SIZE 2048
 
-struct hydra_console {
+typedef struct hydra_console {
  char *thread_name;
  thread_t *thread;
  union {
  SerialUSBDriver *sdu;
  BaseSequentialStream *bss;
  };
  microrl_t *mrl;
-};
+} t_hydra_console;
 
-void cmd_info(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_init(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_mem(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_threads(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_test(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_dbg(struct hydra_console *con, int argc, const char* const* argv);
+void cmd_info(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_init(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_mem(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_threads(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_test(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_dbg(t_hydra_console *con, int argc, const char* const* argv);
 
 #endif /* _COMMON_H_ */

common/microrl_callback.h

@@ -19,7 +19,7 @@
 
 #include "ch.h"
 
-typedef void (*ptFunc)(struct hydra_console *con, int argc, const char* const* argv);
+typedef void (*ptFunc)(t_hydra_console *con, int argc, const char* const* argv);
 
 typedef struct
 {
@@ -31,7 +31,7 @@ typedef struct
 void print(void *user_handle, const char *str);
 
 // get_char from stream
-char get_char(struct hydra_console *con);
+char get_char(t_hydra_console *con);
 
 // execute callback
 unsigned int execute(void *user_handle, int argc, const char* const* argv);

common/microrl_common.c

@@ -33,7 +33,7 @@
 char** compl_world;
 microrl_exec_t* keyworld;
 
-void print_clear(struct hydra_console *con, int argc, const char* const* argv)
+void print_clear(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -45,7 +45,7 @@ void print_clear(struct hydra_console *con, int argc, const char* const* argv)
 //*****************************************************************************
 void print(void *user_handle, const char *str)
 {
- struct hydra_console *con;
+ t_hydra_console *con;
  int len;
 
  if(!str)
@@ -59,7 +59,7 @@ void print(void *user_handle, const char *str)
 }
 
 //*****************************************************************************
-char get_char(struct hydra_console *con) 
+char get_char(t_hydra_console *con) 
 {
  uint8_t car;
 
@@ -130,7 +130,7 @@ char** complet(void* user_handle, int argc, const char * const * argv)
 // do what you want here, but don't write to argv!!! read only!!
 unsigned int execute(void *user_handle, int argc, const char* const* argv)
 {
- struct hydra_console *con;
+ t_hydra_console *con;
 
  con = user_handle;
  if(hydranfc_is_detected())
@@ -142,7 +142,7 @@ unsigned int execute(void *user_handle, int argc, const char* const* argv)
 //*****************************************************************************
 void sigint(void *user_handle)
 {
- struct hydra_console *con;
+ t_hydra_console *con;
 
  con = user_handle;
  if(hydranfc_is_detected())

common/microrl_common.h

@@ -17,6 +17,6 @@
 #ifndef _MICRORL_COMMON_H_
 #define _MICRORL_COMMON_H_
 
-void print_clear(struct hydra_console *con, int argc, const char* const* argv);
+void print_clear(t_hydra_console *con, int argc, const char* const* argv);
 
 #endif /* _MICRORL_COMMON_H_ */

common/microsd.c

@@ -135,7 +135,7 @@ void fillbuffers(uint8_t pattern)
 /**
  * SDIO Test Non Destructive
  */
-void cmd_sdiotest(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_sdiotest(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -391,7 +391,7 @@ void cmd_sdiotest(struct hydra_console *con, int argc, const char* const* argv)
  }
 }
 
-void cmd_sdc(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_sdc(t_hydra_console *con, int argc, const char* const* argv)
 {
  static const char *mode[] = {"SDV11", "SDV20", "MMC", NULL};
  systime_t start, end;
@@ -497,7 +497,7 @@ void cmd_sdc(struct hydra_console *con, int argc, const char* const* argv)
  sdcDisconnect(&SDCD1);
 }
 
-static FRESULT scan_files(struct hydra_console *con, char *path)
+static FRESULT scan_files(t_hydra_console *con, char *path)
 {
  FRESULT res;
  FILINFO fno;
@@ -667,7 +667,7 @@ int umount(void)
  return 0;
 }
 
-void cmd_sd_mount(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_sd_mount(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -702,7 +702,7 @@ void cmd_sd_mount(struct hydra_console *con, int argc, const char* const* argv)
  fs_ready = TRUE;
 }
 
-void cmd_sd_umount(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_sd_umount(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -720,7 +720,7 @@ void cmd_sd_umount(struct hydra_console *con, int argc, const char* const* argv)
  fs_ready = FALSE;
 }
 
-void cmd_sd_ls(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_sd_ls(t_hydra_console *con, int argc, const char* const* argv)
 {
  FRESULT err;
  uint32_t clusters;
@@ -779,7 +779,7 @@ void cmd_sd_ls(struct hydra_console *con, int argc, const char* const* argv)
 }
 
 /* Call only with len=multiples of 16 (unless end of dump). */
-static void dump_hexbuf(struct hydra_console *con, uint32_t offset,
+static void dump_hexbuf(t_hydra_console *con, uint32_t offset,
  const uint8_t *buf, int len)
 {
  int b, i;
@@ -805,7 +805,7 @@ static void dump_hexbuf(struct hydra_console *con, uint32_t offset,
  }
 }
 
-void cmd_sd_cat(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_sd_cat(t_hydra_console *con, int argc, const char* const* argv)
 {
  #define MAX_FILE_SIZE (524288)
  bool hex;
@@ -885,7 +885,7 @@ void cmd_sd_cat(struct hydra_console *con, int argc, const char* const* argv)
 /**
  * SDIO Test Destructive
  */
-void cmd_sd_erase(struct hydra_console *con, int argc, const char* const* argv){
+void cmd_sd_erase(t_hydra_console *con, int argc, const char* const* argv){
  (void)argc;
  (void)argv;
  uint32_t i = 0;

common/microsd.h

@@ -33,13 +33,13 @@ int mount(void);
 int umount(void);
 
 /* Shell commands */
-void cmd_sd_mount(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_sd_umount(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_sd_ls(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_sd_cat(struct hydra_console *con, int argc, const char* const* argv);
-
-void cmd_sdiotest(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_sd_erase(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_sdc(struct hydra_console *con, int argc, const char* const* argv);
+void cmd_sd_mount(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_sd_umount(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_sd_ls(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_sd_cat(t_hydra_console *con, int argc, const char* const* argv);
+
+void cmd_sdiotest(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_sd_erase(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_sdc(t_hydra_console *con, int argc, const char* const* argv);
 
 #endif /* _MICROSD_H_ */

hydrabus/hydrabus_microrl.c

@@ -69,7 +69,7 @@ microrl_exec_t hydrabus_keyworld[HYDRABUS_NUM_OF_CMD] =
 char* hydrabus_compl_world[HYDRABUS_NUM_OF_CMD + 1];
 
 //*****************************************************************************
-void hydrabus_print_help(struct hydra_console *con, int argc, const char* const* argv)
+void hydrabus_print_help(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -92,7 +92,7 @@ void hydrabus_print_help(struct hydra_console *con, int argc, const char* const*
 //*****************************************************************************
 // execute callback for microrl library
 // do what you want here, but don't write to argv!!! read only!!
-int hydrabus_execute(struct hydra_console *con, int argc, const char* const* argv)
+int hydrabus_execute(t_hydra_console *con, int argc, const char* const* argv)
 {
  bool cmd_found;
  int curr_arg = 0;
@@ -126,7 +126,7 @@ int hydrabus_execute(struct hydra_console *con, int argc, const char* const* arg
 }
 
 //*****************************************************************************
-void hydrabus_sigint(struct hydra_console *con)
+void hydrabus_sigint(t_hydra_console *con)
 {
  /* Hit ctrl-U and enter. */
  microrl_insert_char(con->mrl, 0x15);

hydrabus/hydrabus_microrl.h

@@ -21,8 +21,8 @@
 extern char* hydrabus_compl_world[HYDRABUS_NUM_OF_CMD + 1];
 extern microrl_exec_t hydrabus_keyworld[HYDRABUS_NUM_OF_CMD];
 
-void hydrabus_print_help(struct hydra_console *con, int argc, const char* const* argv);
-int hydrabus_execute(struct hydra_console *con, int argc, const char* const* argv);
-void hydrabus_sigint(struct hydra_console *con);
+void hydrabus_print_help(t_hydra_console *con, int argc, const char* const* argv);
+int hydrabus_execute(t_hydra_console *con, int argc, const char* const* argv);
+void hydrabus_sigint(t_hydra_console *con);
 
 #endif /* _HYDRABUS_MICRORL_H_ */

hydranfc/hydranfc.c

@@ -230,7 +230,7 @@ bool hydranfc_init(void)
  return TRUE;
 }
 
-void cmd_nfc_vicinity(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_nfc_vicinity(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -344,7 +344,7 @@ void cmd_nfc_vicinity(struct hydra_console *con, int argc, const char* const* ar
  chprintf(con->bss, "Test nfv ISO15693/Vicinity end\r\n");
 }
 
-void cmd_nfc_mifare(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_nfc_mifare(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -521,7 +521,7 @@ void cmd_nfc_mifare(struct hydra_console *con, int argc, const char* const* argv
  chprintf(con->bss, "Test nfm ISO14443-A/Mifare end\r\n");
 }
 
-void cmd_nfc_dump_regs(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_nfc_dump_regs(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;

hydranfc/hydranfc.h

@@ -26,9 +26,9 @@ extern volatile int irq_end_rx;
 bool hydranfc_init(void);
 bool hydranfc_is_detected(void);
 
-void cmd_nfc_vicinity(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_nfc_mifare(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_nfc_dump_regs(struct hydra_console *con, int argc, const char* const* argv);
-void cmd_nfc_sniff_14443A(struct hydra_console *con, int argc, const char* const* argv);
+void cmd_nfc_vicinity(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_nfc_mifare(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_nfc_dump_regs(t_hydra_console *con, int argc, const char* const* argv);
+void cmd_nfc_sniff_14443A(t_hydra_console *con, int argc, const char* const* argv);
 
 #endif /* _HYDRANFC_H_ */

hydranfc/hydranfc_cmd_sniff.c

@@ -483,7 +483,7 @@ void sniff_write_8b_ASCII_HEX(uint8_t data, bool add_space)
  }
 }
 
-void cmd_nfc_sniff_14443A(struct hydra_console *con, int argc, const char* const* argv)
+void cmd_nfc_sniff_14443A(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)con;
  (void)argc;

hydranfc/hydranfc_microrl.c

@@ -73,7 +73,7 @@ microrl_exec_t hydranfc_keyworld[HYDRANFC_NUM_OF_CMD] =
 char* hydranfc_compl_world[HYDRANFC_NUM_OF_CMD + 1];
 
 //*****************************************************************************
-void hydranfc_print_help(struct hydra_console *con, int argc, const char* const* argv)
+void hydranfc_print_help(t_hydra_console *con, int argc, const char* const* argv)
 {
  (void)argc;
  (void)argv;
@@ -101,7 +101,7 @@ void hydranfc_print_help(struct hydra_console *con, int argc, const char* const*
 //*****************************************************************************
 // execute callback for microrl library
 // do what you want here, but don't write to argv!!! read only!!
-int hydranfc_execute(struct hydra_console *con, int argc, const char* const* argv)
+int hydranfc_execute(t_hydra_console *con, int argc, const char* const* argv)
 {
  bool cmd_found;
  int curr_arg = 0;
@@ -135,7 +135,7 @@ int hydranfc_execute(struct hydra_console *con, int argc, const char* const* arg
 }
 
 //*****************************************************************************
-void hydranfc_sigint(struct hydra_console *con)
+void hydranfc_sigint(t_hydra_console *con)
 {
  print(con, "HydraNFC microrl ^C catched!\n\r");
 }

hydranfc/hydranfc_microrl.h

@@ -21,8 +21,8 @@
 extern char* hydranfc_compl_world[HYDRANFC_NUM_OF_CMD + 1];
 extern microrl_exec_t hydranfc_keyworld[HYDRANFC_NUM_OF_CMD];
 
-void hydranfc_print_help(struct hydra_console *con, int argc, const char* const* argv);
-int hydranfc_execute(struct hydra_console *con, int argc, const char* const* argv);
-void hydranfc_sigint(struct hydra_console *con);
+void hydranfc_print_help(t_hydra_console *con, int argc, const char* const* argv);
+int hydranfc_execute(t_hydra_console *con, int argc, const char* const* argv);
+void hydranfc_sigint(t_hydra_console *con);
 
 #endif /* _HYDRANFC_MICRORL_H_ */