View | Details | Raw Unified | Return to bug 247528 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/dev/rtwn/rtl8188e/r88e_reg.h (+1 lines)
Lines 121-125 Link Here
121
121
122
/* Bits for R88E_XCK_OUT_CTRL. */
122
/* Bits for R88E_XCK_OUT_CTRL. */
123
#define R88E_XCK_OUT_CTRL_EN	1
123
#define R88E_XCK_OUT_CTRL_EN	1
124
#define R88E_USB_DELAY_US_DEF	1000
124
125
125
#endif	/* R88E_REG_H */
126
#endif	/* R88E_REG_H */
(-)b/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c (-2 / +14 lines)
Lines 48-53 Link Here
48
#include <dev/rtwn/rtl8192c/r92c.h>
48
#include <dev/rtwn/rtl8192c/r92c.h>
49
#include <dev/rtwn/rtl8192c/r92c_var.h>
49
#include <dev/rtwn/rtl8192c/r92c_var.h>
50
50
51
#include <dev/rtwn/usb/rtwn_usb_var.h>
52
51
#include <dev/rtwn/rtl8188e/usb/r88eu.h>
53
#include <dev/rtwn/rtl8188e/usb/r88eu.h>
52
#include <dev/rtwn/rtl8188e/usb/r88eu_reg.h>
54
#include <dev/rtwn/rtl8188e/usb/r88eu_reg.h>
53
55
Lines 76-83 r88eu_power_on(struct rtwn_softc *sc) Link Here
76
	if (res != 0)		\
78
	if (res != 0)		\
77
		return (EIO);	\
79
		return (EIO);	\
78
} while(0)
80
} while(0)
81
	struct rtwn_usb_softc *uc;
79
	int ntries;
82
	int ntries;
80
83
84
	if ((uc = RTWN_USB_SOFTC(sc)) != NULL)
85
		uc->uc_write_delay = 1;
86
81
	/* Wait for power ready bit. */
87
	/* Wait for power ready bit. */
82
	for (ntries = 0; ntries < 5000; ntries++) {
88
	for (ntries = 0; ntries < 5000; ntries++) {
83
		if (rtwn_read_4(sc, R92C_APS_FSMCO) & R92C_APS_FSMCO_SUS_HOST)
89
		if (rtwn_read_4(sc, R92C_APS_FSMCO) & R92C_APS_FSMCO_SUS_HOST)
Lines 85-90 r88eu_power_on(struct rtwn_softc *sc) Link Here
85
		rtwn_delay(sc, 10);
91
		rtwn_delay(sc, 10);
86
	}
92
	}
87
	if (ntries == 5000) {
93
	if (ntries == 5000) {
94
		if (uc != NULL)
95
			uc->uc_write_delay = 0;
88
		device_printf(sc->sc_dev,
96
		device_printf(sc->sc_dev,
89
		    "timeout waiting for chip power up\n");
97
		    "timeout waiting for chip power up\n");
90
		return (ETIMEDOUT);
98
		return (ETIMEDOUT);
Lines 112-118 r88eu_power_on(struct rtwn_softc *sc) Link Here
112
			break;
120
			break;
113
		rtwn_delay(sc, 10);
121
		rtwn_delay(sc, 10);
114
	}
122
	}
115
	if (ntries == 5000)
123
	if (ntries == 5000) {
124
		if (uc != NULL)
125
			uc->uc_write_delay = 0;
126
	}
116
		return (ETIMEDOUT);
127
		return (ETIMEDOUT);
117
128
118
	/* Enable LDO normal mode. */
129
	/* Enable LDO normal mode. */
Lines 128-133 r88eu_power_on(struct rtwn_softc *sc) Link Here
128
	    ((sc->sc_hwcrypto != RTWN_CRYPTO_SW) ? R92C_CR_ENSEC : 0) |
139
	    ((sc->sc_hwcrypto != RTWN_CRYPTO_SW) ? R92C_CR_ENSEC : 0) |
129
	    R92C_CR_CALTMR_EN));
140
	    R92C_CR_CALTMR_EN));
130
141
142
	if (uc != NULL)
143
		uc->uc_write_delay = 0;
131
	return (0);
144
	return (0);
132
#undef RTWN_CHK
145
#undef RTWN_CHK
133
}
146
}
134
- 

Return to bug 247528