Match RTL8255 transceiver and stub out related support functions.

2 files changed, 98 insertions, 12 deletions

diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 5689876de73..a51c66418b2 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtw.c,v 1.33 2005/06/13 13:37:51 jsg Exp $	*/
+/*	$OpenBSD: rtw.c,v 1.34 2005/06/15 01:33:50 jsg Exp $	*/
 /*	$NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
 
 /*-
@@ -201,6 +201,7 @@ void	 rtw_led_newstate(struct rtw_softc *, enum ieee80211_state);
 struct rtw_rf *rtw_sa2400_create(struct rtw_regs *, rtw_rf_write_t, int);
 struct rtw_rf *rtw_max2820_create(struct rtw_regs *, rtw_rf_write_t, int);
 struct rtw_rf *rtw_rtl8225_create(struct rtw_regs *, rtw_rf_write_t);
+struct rtw_rf *rtw_rtl8255_create(struct rtw_regs *, rtw_rf_write_t);
 int	 rtw_phy_init(struct rtw_regs *, struct rtw_rf *, u_int8_t, u_int8_t,
 	    u_int, int, int, enum rtw_pwrstate);
 int	 rtw_bbp_preinit(struct rtw_regs *, u_int, int, u_int);
@@ -232,6 +233,12 @@ int	 rtw_rtl8225_init(struct rtw_rf *, u_int, u_int8_t,
 	    enum rtw_pwrstate);
 int	 rtw_rtl8225_txpower(struct rtw_rf *, u_int8_t);
 int	 rtw_rtl8225_tune(struct rtw_rf *, u_int);
+int	 rtw_rtl8255_pwrstate(struct rtw_rf *, enum rtw_pwrstate);
+void	 rtw_rtl8255_destroy(struct rtw_rf *);
+int	 rtw_rtl8255_init(struct rtw_rf *, u_int, u_int8_t,
+	    enum rtw_pwrstate);
+int	 rtw_rtl8255_txpower(struct rtw_rf *, u_int8_t);
+int	 rtw_rtl8255_tune(struct rtw_rf *, u_int);
 int	 rtw_rf_hostwrite(struct rtw_regs *, enum rtw_rfchipid, u_int,
 	    u_int32_t);
 int	 rtw_rf_macwrite(struct rtw_regs *, enum rtw_rfchipid, u_int,
@@ -605,6 +612,9 @@ rtw_srom_parse(struct rtw_softc *sc)
 	case RTW_RFCHIPID_RTL8225:
 		rfname = "RTL8225";
 		break;
+	case RTW_RFCHIPID_RTL8255:
+		rfname = "RTL8255";
+		break;
 	case RTW_RFCHIPID_GCT:		/* this combo seen in the wild */
 		rfname = "GRF5101";
 		paname = "WS9901";
@@ -3477,6 +3487,7 @@ rtw_rf_attach(struct rtw_softc *sc, enum rtw_rfchipid rfchipid, int digphy)
 
 	switch (rfchipid) {
 	case RTW_RFCHIPID_RTL8225:
+	case RTW_RFCHIPID_RTL8255:
 	default:
 		rf_write = rtw_rf_hostwrite;
 		break;
@@ -3494,6 +3505,10 @@ rtw_rf_attach(struct rtw_softc *sc, enum rtw_rfchipid rfchipid, int digphy)
 		rf = rtw_rtl8225_create(&sc->sc_regs, rf_write);
 		sc->sc_pwrstate_cb = rtw_rtl_pwrstate;
 		break;
+	case RTW_RFCHIPID_RTL8255:
+		rf = rtw_rtl8255_create(&sc->sc_regs, rf_write);
+		sc->sc_pwrstate_cb = rtw_rtl_pwrstate;
+		break;
 	case RTW_RFCHIPID_MAXIM2820:
 		rf = rtw_max2820_create(&sc->sc_regs, rf_write, 0);
 		sc->sc_pwrstate_cb = rtw_maxim_pwrstate;
@@ -4499,6 +4514,68 @@ rtw_rtl8225_create(struct rtw_regs *regs, rtw_rf_write_t rf_write)
 	return (&rt->rt_rf);
 }
 
+int
+rtw_rtl8255_pwrstate(struct rtw_rf *rf, enum rtw_pwrstate power)
+{
+	return (0);
+}
+
+void
+rtw_rtl8255_destroy(struct rtw_rf *rf)
+{
+	struct rtw_rtl8255 *rt = (struct rtw_rtl8255 *)rf;
+	bzero(rt, sizeof(*rt));
+	free(rt, M_DEVBUF);
+}
+
+int
+rtw_rtl8255_init(struct rtw_rf *rf, u_int freq, u_int8_t opaque_txpower,
+    enum rtw_pwrstate power)
+{
+	return (0);
+}
+
+int
+rtw_rtl8255_txpower(struct rtw_rf *rf, u_int8_t opaque_txpower)
+{
+	return (0);
+}
+
+int
+rtw_rtl8255_tune(struct rtw_rf *rf, u_int freq)
+{
+	return (0);
+}
+
+struct rtw_rf *
+rtw_rtl8255_create(struct rtw_regs *regs, rtw_rf_write_t rf_write)
+{
+	struct rtw_rtl8255 *rt;
+	struct rtw_rfbus *bus;
+	struct rtw_rf *rf;
+	struct rtw_bbpset *bb;
+
+	rt = malloc(sizeof(*rt), M_DEVBUF, M_NOWAIT);
+	if (rt == NULL)
+		return NULL;
+	bzero(rt, sizeof(struct rtw_rtl8255));
+
+	rf = &rt->rt_rf;
+	bus = &rt->rt_bus;
+
+	rf->rf_init = rtw_rtl8255_init;
+	rf->rf_destroy = rtw_rtl8255_destroy;
+	rf->rf_txpower = rtw_rtl8255_txpower;
+	rf->rf_tune = rtw_rtl8255_tune;
+	rf->rf_pwrstate = rtw_rtl8255_pwrstate;
+	bb = &rf->rf_bbpset;
+
+	bus->b_regs = regs;
+	bus->b_write = rf_write;
+
+	return (&rt->rt_rf);
+}
+
 /* freq is in MHz */
 int
 rtw_phy_init(struct rtw_regs *regs, struct rtw_rf *rf, u_int8_t opaque_txpower,
@@ -4783,6 +4860,8 @@ rtw_rfchipid_string(enum rtw_rfchipid rfchipid)
 		return "Intersil";
 	case RTW_RFCHIPID_RTL8225:
 		return "Realtek RTL8225";
+	case RTW_RFCHIPID_RTL8255:
+		return "Realtek RTL8255";
 	default:
 		return "unknown";
 	}
@@ -4831,6 +4910,7 @@ rtw_rf_hostwrite(struct rtw_regs *regs, enum rtw_rfchipid rfchipid,
 		lo_to_hi = 0;
 		break;
 	case RTW_RFCHIPID_RTL8225:
+	case RTW_RFCHIPID_RTL8255:
 		nbits = 16;
 		lo_to_hi = 0;
 		bits = LSHIFT(val, RTL8225_TWI_DATA_MASK) |
diff --git a/sys/dev/ic/rtwvar.h b/sys/dev/ic/rtwvar.h
index 9d40ca769c3..256da9543ef 100644
--- a/sys/dev/ic/rtwvar.h
+++ b/sys/dev/ic/rtwvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtwvar.h,v 1.12 2005/05/29 06:03:11 reyk Exp $	*/
+/*	$OpenBSD: rtwvar.h,v 1.13 2005/06/15 01:33:50 jsg Exp $	*/
 /*	$NetBSD: rtwvar.h,v 1.10 2004/12/26 22:37:57 mycroft Exp $	*/
 
 /*-
@@ -96,16 +96,17 @@ enum rtw_locale {
 };
 
 enum rtw_rfchipid {
-	RTW_RFCHIPID_RESERVED = 0,
-	RTW_RFCHIPID_INTERSIL = 1,
-	RTW_RFCHIPID_RFMD2948 = 2,
-	RTW_RFCHIPID_PHILIPS = 3,
-	RTW_RFCHIPID_MAXIM2820 = 4,
-	RTW_RFCHIPID_GCT = 5,
-	RTW_RFCHIPID_RFMD2958 = 6,
-	RTW_RFCHIPID_MAXIM2822 = 7,
-	RTW_RFCHIPID_MAXIM2825 = 8,
-	RTW_RFCHIPID_RTL8225 = 9
+	RTW_RFCHIPID_RESERVED	= 0x00,
+	RTW_RFCHIPID_INTERSIL	= 0x01,
+	RTW_RFCHIPID_RFMD2948	= 0x02,
+	RTW_RFCHIPID_PHILIPS	= 0x03,
+	RTW_RFCHIPID_MAXIM2820	= 0x04,
+	RTW_RFCHIPID_GCT	= 0x05,
+	RTW_RFCHIPID_RFMD2958	= 0x06,
+	RTW_RFCHIPID_MAXIM2822	= 0x07,
+	RTW_RFCHIPID_MAXIM2825	= 0x08,
+	RTW_RFCHIPID_RTL8225	= 0x09,
+	RTW_RFCHIPID_RTL8255	= 0x0a
 };
 
 /* sc_flags */
@@ -368,6 +369,11 @@ struct rtw_rtl8225 {
 	struct rtw_rfbus	rt_bus;
 };
 
+struct rtw_rtl8255 {
+	struct rtw_rf		rt_rf;
+	struct rtw_rfbus	rt_bus;
+};
+
 typedef void (*rtw_pwrstate_t)(struct rtw_regs *, enum rtw_pwrstate, int, int);
 
 union rtw_keys {