Cleanup WaitTimer/TIMER_Wait

config.c

@@ -576,7 +576,7 @@ static void ApplyConfiguration(char reloadkickstart)
 
     if(reloadkickstart) {
       iprintf("Reloading kickstart ...\r");
-      TIMER_wait(1000);
+      WaitTimer(1000);
       EnableOsd();
       SPI(OSD_CMD_RST);
       rstval |= (SPI_RST_CPU | SPI_CPU_HLT);

hw/AT91SAM/hardware.c

@@ -301,10 +301,6 @@ void WaitTimer(unsigned long time)
     while (!CheckTimer(time));
 }
 
-void TIMER_wait(unsigned long ms) {
-  WaitTimer(ms);
-}
-
 inline char mmc_inserted() {
   return !(*AT91C_PIOA_PDSR & SD_CD);
 }

hw/AT91SAM/hardware.h

@@ -111,8 +111,6 @@ unsigned long GetTimer(unsigned long offset);
 unsigned long CheckTimer(unsigned long t);
 void WaitTimer(unsigned long time);
 
-void TIMER_wait(unsigned long ms);
-
 void USART_Poll(void);
 
 void inline MCUReset() {*AT91C_RSTC_RCR = 0xA5 << 24 | AT91C_RSTC_PERRST | AT91C_RSTC_PROCRST | AT91C_RSTC_EXTRST;}

hw/AT91SAM/mmc.c

@@ -87,15 +87,15 @@ unsigned char MMC_Init(void)
     spi_slow();     // set slow clock
     DisableCard();  // CS = 1
     SPI(0xff);      // DI = 1
-    TIMER_wait(20);  // 20ms delay
+    WaitTimer(20);  // 20ms delay
     for (n=0; n<10; n++) SPI(0xff); // 80 dummy clocks, DI = 1
-    TIMER_wait(20);  // 20ms delay
+    WaitTimer(20);  // 20ms delay
     EnableCard();
 
     CardType = CARDTYPE_NONE;
 
     for(n=0; n<16; n++) {
-      TIMER_wait(1);
+      WaitTimer(1);
       if (MMC_Command(CMD0, 0) == 0x01) break; // try to send CMD0 multiple times
     }
     if (n<16) // got CMD0 IDLE response