Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 528efc6a authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller
Browse files

gigaset: remove obsolete references to m10x state table 



The separation of state tables for base and M10x has long been
removed. Clean up remaining traces of it.

Impact: cleanup
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d62fda08

drivers/isdn/gigaset/common.c

+2 −8
Original line number Diff line number Diff line
@@ -672,14 +672,8 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, 
	cs->tty = NULL;

	cs->tty_dev = NULL;

	cs->cidmode = cidmode != 0;



	//if(onechannel) { //FIXME

		cs->tabnocid = gigaset_tab_nocid_m10x;

		cs->tabcid = gigaset_tab_cid_m10x;

	//} else {

	//	cs->tabnocid = gigaset_tab_nocid;

	//	cs->tabcid = gigaset_tab_cid;

	//}

	cs->tabnocid = gigaset_tab_nocid;

	cs->tabcid = gigaset_tab_cid;



	init_waitqueue_head(&cs->waitqueue);

	cs->waiting = 0;

drivers/isdn/gigaset/ev-layer.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 




// 100: init, 200: dle0, 250:dle1, 300: get cid (dial), 350: "hup" (no cid), 400: hup, 500: reset, 600: dial, 700: ring

struct reply_t gigaset_tab_nocid_m10x[]= /* with dle mode */

struct reply_t gigaset_tab_nocid[] =

{

	/* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
@@ -280,7 +280,7 @@ struct reply_t gigaset_tab_nocid_m10x[]= /* with dle mode */ 
};



// 600: start dialing, 650: dial in progress, 800: connection is up, 700: ring, 400: hup, 750: accepted icall

struct reply_t gigaset_tab_cid_m10x[] = /* for M10x */

struct reply_t gigaset_tab_cid[] =

{

	/* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */

drivers/isdn/gigaset/gigaset.h

+2 −2
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ struct reply_t { 
	char	*command;	/* NULL==none */

};



extern struct reply_t gigaset_tab_cid_m10x[];

extern struct reply_t gigaset_tab_nocid_m10x[];

extern struct reply_t gigaset_tab_cid[];

extern struct reply_t gigaset_tab_nocid[];



struct inbuf_t {

	unsigned char		*rcvbuf;	/* usb-gigaset receive buffer */