wctdm24xxp: Group the QRV members together.

This also allows us to add them to the union with the other module types so
they do not add to the memory usage if there aren't any QRV modules installed.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9957 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 18 insertions, 15 deletions

diff --git a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
index 265204b..c5e31f4 100644
--- a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
+++ b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h
@@ -196,12 +196,30 @@ struct fxs {
 	struct calregs calregs;
 };
 
+struct qrv {
+#define	RADMODE_INVERTCOR 1
+#define	RADMODE_IGNORECOR 2
+#define	RADMODE_EXTTONE 4
+#define	RADMODE_EXTINVERT 8
+#define	RADMODE_IGNORECT 16
+#define	RADMODE_PREEMP	32
+#define	RADMODE_DEEMP 64
+	char hook;
+	unsigned short debouncetime;
+	unsigned short debtime;
+	int radmode;
+	signed short rxgain;
+	signed short txgain;
+};
+
 struct wctdm_module {
 	union {
 		struct fxo fxo;
 		struct fxs fxs;
+		struct qrv qrv;
 		struct b400m *bri;
 	} mod;
+
 	struct cmdq cmdq;
 
 	int type; /* type of module (FXO/FXS/QRV/etc.) */
@@ -209,21 +227,6 @@ struct wctdm_module {
 	int dacssrc;
 	int flags;   /* bitmap of board-specific + module-specific flags */
 
-#define	RADMODE_INVERTCOR 1
-#define	RADMODE_IGNORECOR 2
-#define	RADMODE_EXTTONE 4
-#define	RADMODE_EXTINVERT 8
-#define	RADMODE_IGNORECT 16
-#define	RADMODE_PREEMP	32
-#define	RADMODE_DEEMP 64
-	unsigned short debouncetime;
-	signed short rxgain;
-	signed short txgain;
-	/* FIXME: why are all of these QRV-only members part of the main card
-	 * structure? */
-	char qrvhook;
-	unsigned short qrvdebtime;
-	int radmode;
 	int altcs;
 };