ir240_various_cleanup-2.diff
Subsystems (2)
PATCH 1/1 ir240_various_cleanup-2.diff
ir240_various_cleanup-2.diff :
----------------------------
o [CORRECT] Remove a comment that Dag found offensive
o [CORRECT] Remove unused variable (spurious warning)
o [CORRECT] Typo in nsc-ircc.c
o [FEATURE] Enable alternate IO address in smc-ircc.c
net/irda/irlap_event.c renamed from net/irda/irlap_event.d0.c +15 -1
@@ -701,7 +701,21 @@ static int irlap_state_conn(struct irlap* We are allowed to send two frames, but this may increase * the connect latency, so lets not do it for now. */ -/* What the hell is this ? - Jean II */ +/* This is full of good intentions, but doesn't work in +* practice. +* After sending the first UA response, we switch the +* dongle to the negociated speed, which is usually +* different than 9600 kb/s. +* From there, there is two solutions : +* 1) The other end has received the first UA response : +* it will set up the connection, move to state LAP_NRM_P, +* and will ignore and drop the second UA response. +* Actually, it's even worse : the other side will almost +* immediately send a RR that will likely collide with the +* UA response (depending on negociated turnaround). +* 2) The other end has not received the first UA response, +* will stay at 9600 and will never see the second UA response. +* Jean II */ irlap_send_ua_response_frame (self, &self->qos_rx);#endif
net/irda/irias_object.c renamed from net/irda/irias_object.d0.c +0 -2
@@ -435,8 +435,6 @@ struct ias_value *irias_new_integer_valustruct ias_value *irias_new_string_value (char *string) {struct ias_value *value; -int len; -char *new_str; value =kmalloc (sizeof (struct ias_value ),GFP_ATOMIC );if (value ==NULL ) {
drivers/net/irda/nsc-ircc.c renamed from drivers/net/irda/nsc-ircc.d0.c +1 -1
@@ -112,7 +112,7 @@ static char *dongle_types[] = {"Reserved" ,"Reserved" ,"HP HSDL-1100/HSDL-2100" , -"HP HSDL-1100/HSDL-2100" +"HP HSDL-1100/HSDL-2100" ,"Supports SIR Mode only" , "No dongle connected", };
drivers/net/irda/smc-ircc.c renamed from drivers/net/irda/smc-ircc.d0b.c +13 -1
@@ -127,7 +127,7 @@ static smc_chip_t __initdata fdc_chips_p { "37M707", KEY55_1|SIR|SERx4, 0x42, 0x00 }, { "37M81X", KEY55_1|SIR|SERx4, 0x4d, 0x00 }, { "37N958FR", KEY55_1|FIR|SERx4, 0x09, 0x04 }, - { "37N972", KEY55_1|FIR|SERx4, 0x0a, 0x00 }, + { "37N971", KEY55_1|FIR|SERx4, 0x0a, 0x00 }, { "37N972", KEY55_1|FIR|SERx4, 0x0b, 0x00 }, { NULL } };
@@ -158,6 +158,7 @@ static int ircc_irq=255;static int ircc_dma=255 ;static int ircc_fir=0 ;static int ircc_sir=0 ; +static int ircc_cfg=0 ;static unsigned short dev_count=0 ;
@@ -393,6 +394,13 @@ int __init ircc_init(void)return -ENODEV ; } +/* try user provided configuration register base address */ +if (ircc_cfg>0 ) { +MESSAGE (" Overriding configuration address 0x%04x\n" , ircc_cfg); +if (!smc_superio_fdc (ircc_cfg)) + ret=0 ; + } +/* Trys to open for all the SMC chipsets we know about */ IRDA_DEBUG(0, __FUNCTION__
@@ -402,6 +410,8 @@ int __init ircc_init(void) ret=0 ;if (!smc_superio_fdc (0x370 )) ret=0 ; +if (!smc_superio_fdc (0xe0 )) + ret=0 ;if (!smc_superio_lpc (0x2e )) ret=0 ;if (!smc_superio_lpc (0x4e ))
@@ -1229,5 +1239,7 @@ MODULE_PARM(ircc_fir, "1-4i");MODULE_PARM_DESC (ircc_fir,"FIR Base Address" );MODULE_PARM (ircc_sir,"1-4i" );MODULE_PARM_DESC (ircc_sir,"SIR Base Address" ); +MODULE_PARM (ircc_cfg,"1-4i" ); +MODULE_PARM_DESC (ircc_cfg,"Configuration register base address" );#endif /* MODULE */