5c5
<     serial_cs.c 1.128 2001/10/18 12:18:35
---
>     serial_cs.c 1.138 2002/10/25 06:24:52
31c31
<     
---
> 
72,73c72,73
< /* Enable the speaker? */
< INT_MODULE_PARM(do_sound, 1);
---
> INT_MODULE_PARM(do_sound, 1);		/* Enable the speaker? */
> INT_MODULE_PARM(buggy_uart, 0);		/* Skip strict UART tests? */
79c79
< "serial_cs.c 1.128 2001/10/18 12:18:35 (David Hinds)";
---
> "serial_cs.c 1.138 2002/10/25 06:24:52 (David Hinds)";
97a98
>     { MANFID_QUATECH, PRODID_QUATECH_DUAL_RS232_D2, 2 },
151c152
<     
---
> 
163c164
<     link->io.NumPorts1 = 8;
---
>     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
172d172
<     link->conf.Vcc = 50;
178c178
<     
---
> 
197c197
<     
---
> 
217c217
<     
---
> 
227c227
<     
---
> 
233c233
<     
---
> 
237c237
<     
---
> 
246c246
<     
---
> 
250a251,252
>     if (buggy_uart)
> 	serial.flags |= ASYNC_BUGGY_UART;
257c259
<     
---
> 
265c267
<     
---
> 
316c318,321
<     
---
> 
>     link->io.NumPorts1 = 8;
>     link->io.NumPorts2 = 0;
> 
343c348
<     
---
> 
355,356c360
< 		i = CardServices(RequestIO, link->handle,
< 				 &link->io);
---
> 		i = CardServices(RequestIO, link->handle, &link->io);
368c372
<     
---
> 
392a397
>     config_info_t config;
394a400,402
>     CardServices(GetConfigurationInfo, handle, &config);
>     link->conf.Vcc = config.Vcc;
> 
436c444
<     
---
> 
438,439c446,447
< 	cs_error(link->handle, RequestIO, i);
< 	return -1;
---
> 	/* At worst, try to configure as a single port */
> 	return simple_config(link);
441c449
<     
---
> 
457c465,478
<     
---
> 
>     /* The Oxford Semiconductor OXCF950 cards are in fact single-port:
>        8 registers are for the UART, the others are extra registers */
>     if (info->manfid == MANFID_OXSEMI) {
> 	if (cf->index == 1 || cf->index == 3) {
> 	    setup_serial(info, base2, link->irq.AssignedIRQ);
> 	    outb(12,link->io.BasePort1+1);
> 	} else {
> 	    setup_serial(info, link->io.BasePort1, link->irq.AssignedIRQ);
> 	    outb(12,base2+1);
> 	}
> 	return 0;
>     }
> 
464c485
<     
---
> 
490c511
<     
---
> 
503c524
<     
---
> 
511,512c532,533
<     
<     /* Is this a multiport card? */
---
> 
>     /* Scan list of known multiport card ID's */
540c561
<     
---
> 
545c566
<     
---
> 
548c569
<     
---
> 
564a586
>     link->state &= ~DEV_CONFIG_PENDING;
572c594
<     
---
> 
580c602
<     
---
> 
593c615
<     
---
> 
604c626
<     
---
> 
612c634
<     
---
> 
614c636
<     
---
> 
653c675
< 	return -1;
---
> 	return -EINVAL;
