Page MenuHomeFreeBSD
Files F111855924

D48084.id147961.diff
No OneTemporary
Actions

D48084.id147961.diff
View Options

diff --git a/sys/conf/options b/sys/conf/options
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -680,6 +680,7 @@
# options for the Realtek rtwn driver
RTWN_DEBUG opt_rtwn.h
+RTWN_DEBUG_REGIO opt_rtwn.h
RTWN_WITHOUT_UCODE opt_rtwn.h
# Embedded system options
diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c
--- a/sys/dev/rtwn/if_rtwn.c
+++ b/sys/dev/rtwn/if_rtwn.c
@@ -321,12 +321,43 @@
&rxtap->wr_ihdr, sizeof(*rxtap), RTWN_RX_RADIOTAP_PRESENT);
}
+#ifdef RTWN_DEBUG_REGIO
+static int
+rtwn_sysctl_reg_readwrite(SYSCTL_HANDLER_ARGS)
+{
+ struct rtwn_softc *sc = arg1;
+ int error;
+ uint32_t val;
+
+ RTWN_LOCK(sc);
+ val = rtwn_read_4(sc, sc->sc_reg_addr);
+ RTWN_UNLOCK(sc);
+ error = sysctl_handle_int(oidp, &val, 0, req);
+ if (error || !req->newptr)
+ return (error);
+ RTWN_LOCK(sc);
+ rtwn_write_4(sc, sc->sc_reg_addr, val);
+ RTWN_UNLOCK(sc);
+ return (0);
+}
+#endif /* RTWN_DEBUG_REGIO */
+
void
rtwn_sysctlattach(struct rtwn_softc *sc)
{
struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev);
struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
+ sc->sc_reg_addr = 0;
+#ifdef RTWN_DEBUG_REGIO
+ SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ "reg_addr", CTLFLAG_RW, &sc->sc_reg_addr,
+ sc->sc_reg_addr, "debug register address");
+ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ "reg_val", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
+ rtwn_sysctl_reg_readwrite, "I", "debug register read/write");
+#endif /* RTWN_DEBUG_REGIO */
+
sc->sc_ht40 = 0;
SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"ht40", CTLFLAG_RDTUN, &sc->sc_ht40,
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
@@ -188,6 +188,7 @@
int sc_hwcrypto;
int sc_ratectl_sysctl;
int sc_ratectl;
+ uint32_t sc_reg_addr;
uint8_t sc_detached;
uint8_t sc_flags;
diff --git a/sys/modules/rtwn/Makefile b/sys/modules/rtwn/Makefile
--- a/sys/modules/rtwn/Makefile
+++ b/sys/modules/rtwn/Makefile
@@ -41,6 +41,7 @@
opt_rtwn.h:
@echo "#define RTWN_DEBUG 1" > ${.TARGET}
+# @echo "#define RTWN_DEBUG_REGIO 1" >> ${.TARGET}
.if ${MK_SOURCELESS_UCODE} == "no"
@echo "#define RTWN_WITHOUT_UCODE 1" >> ${.TARGET}
.endif

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 9:15 AM (9 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17082322
Default Alt Text
D48084.id147961.diff (2 KB)

Event Timeline