Print this page
XXXX introduce drv_sectohz
@@ -2068,11 +2068,11 @@
cmn_err(CE_WARN, "iwp_load_init_firmware(): "
"failed to write init uCode.\n");
return (err);
}
- clk = ddi_get_lbolt() + drv_usectohz(1000000);
+ clk = ddi_get_lbolt() + drv_sectohz(1);
/* wait loading init_text until completed or timeout */
while (!(sc->sc_flags & IWP_F_PUT_SEG)) {
if (cv_timedwait(&sc->sc_put_seg_cv, &sc->sc_glock, clk) < 0) {
break;
@@ -2096,11 +2096,11 @@
cmn_err(CE_WARN, "iwp_load_init_firmware(): "
"failed to write init_data uCode.\n");
return (err);
}
- clk = ddi_get_lbolt() + drv_usectohz(1000000);
+ clk = ddi_get_lbolt() + drv_sectohz(1);
/*
* wait loading init_data until completed or timeout
*/
while (!(sc->sc_flags & IWP_F_PUT_SEG)) {
@@ -2137,11 +2137,11 @@
cmn_err(CE_WARN, "iwp_load_run_firmware(): "
"failed to write run uCode.\n");
return (err);
}
- clk = ddi_get_lbolt() + drv_usectohz(1000000);
+ clk = ddi_get_lbolt() + drv_sectohz(1);
/* wait loading run_text until completed or timeout */
while (!(sc->sc_flags & IWP_F_PUT_SEG)) {
if (cv_timedwait(&sc->sc_put_seg_cv, &sc->sc_glock, clk) < 0) {
break;
@@ -2165,11 +2165,11 @@
cmn_err(CE_WARN, "iwp_load_run_firmware(): "
"failed to write run_data uCode.\n");
return (err);
}
- clk = ddi_get_lbolt() + drv_usectohz(1000000);
+ clk = ddi_get_lbolt() + drv_sectohz(1);
/*
* wait loading run_data until completed or timeout
*/
while (!(sc->sc_flags & IWP_F_PUT_SEG)) {
@@ -3695,11 +3695,11 @@
* rate ctl
*/
if (ic->ic_mach &&
(sc->sc_flags & IWP_F_RATE_AUTO_CTL)) {
clk = ddi_get_lbolt();
- if (clk > sc->sc_clk + drv_usectohz(1000000)) {
+ if (clk > sc->sc_clk + drv_sectohz(1)) {
iwp_amrr_timeout(sc);
}
}
delay(drv_usectohz(100000));
@@ -4563,11 +4563,11 @@
/*
* now press "execute" start running
*/
IWP_WRITE(sc, CSR_RESET, 0);
- clk = ddi_get_lbolt() + drv_usectohz(1000000);
+ clk = ddi_get_lbolt() + drv_sectohz(1);
while (!(sc->sc_flags & IWP_F_FW_INIT)) {
if (cv_timedwait(&sc->sc_ucode_cv,
&sc->sc_glock, clk) < 0) {
break;
}
@@ -4610,11 +4610,11 @@
/*
* now press "execute" start running
*/
IWP_WRITE(sc, CSR_RESET, 0);
- clk = ddi_get_lbolt() + drv_usectohz(1000000);
+ clk = ddi_get_lbolt() + drv_sectohz(1);
while (!(sc->sc_flags & IWP_F_FW_INIT)) {
if (cv_timedwait(&sc->sc_ucode_cv,
&sc->sc_glock, clk) < 0) {
break;
}