timer: use timer_delay_ms where it's milliseconds

This also removes an unsed function, that I found because it used timer_delay(). Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

timer: use timer_delay_ms where it's milliseconds
This also removes an unsed function, that I found because it used timer_delay(). Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
ab36ee07 · Alessandro Rubini · 9216288c · ab36ee07 · ab36ee07 · ab36ee07
Commit ab36ee07 authored Feb 12, 2014 by Alessandro Rubini
6 changed files
--- a/dev/endpoint.c
+++ b/dev/endpoint.c
@@ -114,7 +114,7 @@ int ep_enable(int enabled, int autoneg)
 /* Reset the GTP Transceiver - it's important to do the GTP phase alignment every time
   we start up the software, otherwise the calibration RX/TX deltas may not be correct */
 	pcs_write(MDIO_REG_MCR, MDIO_MCR_PDOWN);	/* reset the PHY */
-	timer_delay(200);
+	timer_delay_ms(200);
 	pcs_write(MDIO_REG_MCR, MDIO_MCR_RESET);	/* reset the PHY */
 	pcs_write(MDIO_REG_MCR, 0);	/* reset the PHY */

@@ -190,6 +190,6 @@ int ep_cal_pattern_disable()
 int ep_timestamper_cal_pulse()
 {
 	EP->TSCR |= EP_TSCR_RX_CAL_START;
-	timer_delay(1);
+	timer_delay_ms(1);
 	return EP->TSCR & EP_TSCR_RX_CAL_RESULT ? 1 : 0;
 }
--- a/dev/minic.c
+++ b/dev/minic.c
@@ -324,7 +324,7 @@ int minic_tx_frame(uint8_t * hdr, uint8_t * payload, uint32_t size,
 	for (i = 0; i < 1000; ++i) {
 		mcr = minic_readl(MINIC_REG_MCR);
 		if ((mcr & MINIC_MCR_TX_IDLE) != 0) break;
-		timer_delay(1);
+		timer_delay_ms(1);
 	}

 	if (i == 1000)
@@ -341,7 +341,7 @@ int minic_tx_frame(uint8_t * hdr, uint8_t * payload, uint32_t size,
 		for (i = 0; i < 100; ++i) {
 			mcr = minic_readl(MINIC_REG_MCR);
 			if ((mcr & MINIC_MCR_TX_TS_READY) != 0) break;
-			timer_delay(1);
+			timer_delay_ms(1);
 		}

 		ts_valid = 1;

--- a/dev/rxts_calibrator.c
+++ b/dev/rxts_calibrator.c
@@ -193,12 +193,12 @@ int measure_t24p(uint32_t *value)
 	int rv;
 	pp_printf("Waiting for link...\n");
 	while (!ep_link_up(NULL))
-		timer_delay(100);
+		timer_delay_ms(100);

 	spll_init(SPLL_MODE_SLAVE, 0, 1);
 	pp_printf("Locking PLL...\n");
 	while (!spll_check_lock(0))
-		timer_delay(100);
+		timer_delay_ms(100);
 	pp_printf("\n");

 	pp_printf("Calibrating RX timestamper...\n");

--- a/softpll/softpll_ng.c
+++ b/softpll/softpll_ng.c
@@ -283,13 +283,6 @@ void _irq_entry()
 	clear_irq();
 }

-void spll_clear_dacs()
-{
-	SPLL->DAC_HPLL = 0;
-	SPLL->DAC_MAIN = 0;
-	timer_delay(100);
-}
-
 void spll_init(int mode, int slave_ref_channel, int align_pps)
 {
 	static const char *modes[] = { "", "grandmaster", "freemaster", "slave", "disabled" };

--- a/wrc_main.c
+++ b/wrc_main.c
@@ -166,7 +166,7 @@ static void check_stack(void)
 {
 	while (_endram != ENDRAM_MAGIC) {
 		mprintf("Stack overflow!\n");
-		timer_delay(1000);
+		timer_delay_ms(1000);
 	}
 }

@@ -209,7 +209,7 @@ static void check_reset(void)
 		save += 4;
 	}
 	pp_printf("Rebooting in 1 second\n\n\n");
-	timer_delay(1000);
+	timer_delay_ms(1000);

 	/* Zero the stack and start over (so we dump correctly next time) */
 	for (p = &_endram; p < &_fstack; p++)

--- a/wrc_ptp_noposix.c
+++ b/wrc_ptp_noposix.c
@@ -126,7 +126,7 @@ int wrc_ptp_set_mode(int mode)
 	shw_pps_gen_enable_output(0);

 	while (!spll_check_lock(0) && lock_timeout) {
-		timer_delay(TICS_PER_SECOND);
+		timer_delay_ms(1000);
 		mprintf(".");
 		if (timer_get_tics() - start_tics > lock_timeout) {
 			mprintf("\nLock timeout.\n");