Page MenuHomeFreeBSD
Files F167512097

D59106.id184706.diff
No OneTemporary
Actions

D59106.id184706.diff
View Options

diff --git a/sys/dev/rtwn/if_rtwn_efuse.c b/sys/dev/rtwn/if_rtwn_efuse.c
--- a/sys/dev/rtwn/if_rtwn_efuse.c
+++ b/sys/dev/rtwn/if_rtwn_efuse.c
@@ -225,6 +225,10 @@
{
int error;
+ error = rtwn_efuse_preread(sc);
+ if (error != 0)
+ return (error);
+
error = rtwn_efuse_switch_power(sc);
if (error != 0)
goto fail;
diff --git a/sys/dev/rtwn/if_rtwnvar.h b/sys/dev/rtwn/if_rtwnvar.h
--- a/sys/dev/rtwn/if_rtwnvar.h
+++ b/sys/dev/rtwn/if_rtwnvar.h
@@ -298,6 +298,7 @@
int (*sc_check_condition)(struct rtwn_softc *,
const uint8_t[]);
void (*sc_efuse_postread)(struct rtwn_softc *);
+ int (*sc_efuse_preread)(struct rtwn_softc *);
void (*sc_parse_rom)(struct rtwn_softc *, uint8_t *);
void (*sc_set_led)(struct rtwn_softc *, int, int);
int (*sc_power_on)(struct rtwn_softc *);
@@ -490,6 +491,8 @@
(((_sc)->sc_check_condition)((_sc), (_cond)))
#define rtwn_efuse_postread(_sc) \
(((_sc)->sc_efuse_postread)((_sc)))
+#define rtwn_efuse_preread(_sc) \
+ (((_sc)->sc_efuse_preread)((_sc)))
#define rtwn_parse_rom(_sc, _rom) \
(((_sc)->sc_parse_rom)((_sc), (_rom)))
#define rtwn_set_led(_sc, _led, _on) \
diff --git a/sys/dev/rtwn/rtl8188e/pci/r88ee_attach.c b/sys/dev/rtwn/rtl8188e/pci/r88ee_attach.c
--- a/sys/dev/rtwn/rtl8188e/pci/r88ee_attach.c
+++ b/sys/dev/rtwn/rtl8188e/pci/r88ee_attach.c
@@ -152,6 +152,7 @@
sc->sc_rf_write = r88e_rf_write;
sc->sc_check_condition = r92c_check_condition;
sc->sc_efuse_postread = rtwn_nop_softc;
+ sc->sc_efuse_preread = rtwn_nop_int_softc;
sc->sc_parse_rom = r88e_parse_rom;
sc->sc_set_led = r88e_set_led;
sc->sc_power_on = r88ee_power_on;
diff --git a/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c b/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
--- a/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
+++ b/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
@@ -145,6 +145,7 @@
sc->sc_rf_write = r88e_rf_write;
sc->sc_check_condition = r92c_check_condition;
sc->sc_efuse_postread = rtwn_nop_softc;
+ sc->sc_efuse_preread = rtwn_nop_int_softc;
sc->sc_parse_rom = r88e_parse_rom;
sc->sc_set_led = r88e_set_led;
sc->sc_power_on = r88eu_power_on;
diff --git a/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c b/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
--- a/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
+++ b/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c
@@ -182,6 +182,7 @@
sc->sc_rf_write = r92c_rf_write;
sc->sc_check_condition = r92c_check_condition;
sc->sc_efuse_postread = r92c_efuse_postread;
+ sc->sc_efuse_preread = rtwn_nop_int_softc;
sc->sc_parse_rom = r92c_parse_rom;
sc->sc_set_led = r92ce_set_led;
sc->sc_power_on = r92ce_power_on;
diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c b/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
--- a/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
+++ b/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c
@@ -174,6 +174,7 @@
sc->sc_rf_write = r92c_rf_write;
sc->sc_check_condition = r92c_check_condition;
sc->sc_efuse_postread = r92c_efuse_postread;
+ sc->sc_efuse_preread = rtwn_nop_int_softc;
sc->sc_parse_rom = r92c_parse_rom;
sc->sc_set_led = r92cu_set_led;
sc->sc_power_on = r92cu_power_on;
diff --git a/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c b/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c
--- a/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c
+++ b/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c
@@ -123,6 +123,7 @@
sc->sc_rf_write = r92e_rf_write;
sc->sc_check_condition = r92c_check_condition;
sc->sc_efuse_postread = rtwn_nop_softc;
+ sc->sc_efuse_preread = rtwn_nop_int_softc;
sc->sc_parse_rom = r92e_parse_rom;
sc->sc_set_led = r92e_set_led;
sc->sc_power_on = r92e_power_on;
diff --git a/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c b/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
--- a/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
+++ b/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c
@@ -225,6 +225,7 @@
sc->sc_rf_write = r12a_rf_write;
sc->sc_check_condition = r12a_check_condition;
sc->sc_efuse_postread = rtwn_nop_softc;
+ sc->sc_efuse_preread = rtwn_nop_int_softc;
sc->sc_parse_rom = r12a_parse_rom;
sc->sc_power_on = r12a_power_on;
sc->sc_power_off = r12a_power_off;
diff --git a/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c b/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
--- a/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
+++ b/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c
@@ -209,6 +209,7 @@
sc->sc_rf_write = r12a_rf_write;
sc->sc_check_condition = r21a_check_condition;
sc->sc_efuse_postread = rtwn_nop_softc;
+ sc->sc_efuse_preread = rtwn_nop_int_softc;
sc->sc_parse_rom = r21a_parse_rom;
sc->sc_power_on = r21a_power_on;
sc->sc_power_off = r21a_power_off;

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 23, 9:41 AM (14 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37118175
Default Alt Text
D59106.id184706.diff (4 KB)

Event Timeline