fixed some silly bugs.
This commit is contained in:
parent
e2358a2fee
commit
46f6e4b164
4 changed files with 13 additions and 7 deletions
|
|
@ -205,7 +205,7 @@ void hardwaremain(int boot_complete)
|
|||
* for now -- rgm.
|
||||
*/
|
||||
#ifdef USE_NEW_SUPERIO_INTERFACE
|
||||
extern struct superio all_superio[];
|
||||
extern struct superio *all_superio[];
|
||||
extern int nsuperio;
|
||||
extern void handle_superio(int pass, struct superio *s, int nsuperio);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -835,12 +835,14 @@ void pci_zero_irq_settings(void)
|
|||
}
|
||||
|
||||
void
|
||||
handle_superio(int pass, struct superio *s, int nsuperio)
|
||||
handle_superio(int pass, struct superio *all_superio[], int nsuperio)
|
||||
{
|
||||
int i;
|
||||
struct superio *s;
|
||||
printk_debug("handle_superio start, s %p nsuperio %d s->super %p\n",
|
||||
s, nsuperio, s->super);
|
||||
for(i = 0; i < nsuperio; i++, s++){
|
||||
for(i = 0; i < nsuperio; i++){
|
||||
s = all_superio[i];
|
||||
printk_debug(__FUNCTION__ " Pass %d, check #%d, s %p s->super %p\n",
|
||||
pass, i, s, s->super);
|
||||
if (!s->super) {
|
||||
|
|
|
|||
|
|
@ -107,13 +107,15 @@ static void setup_com(struct superio *sio,
|
|||
{
|
||||
// set baud, default to 115200 if not set.
|
||||
int divisor = 115200/(com->baud ? com->baud : 1);
|
||||
printk_debug("Enabling com device: %02x\n", device);
|
||||
printk_debug(" iobase = 0x%04x irq=%d\n", com->base, com->irq);
|
||||
printk_debug("%s com device: %02x\n",
|
||||
com->enable? "Enabling" : "Disabling", device);
|
||||
/* Select the device */
|
||||
set_logical_device(sio, device);
|
||||
/* Disable it while it is initialized */
|
||||
set_enable(sio, 0);
|
||||
if (com->enable) {
|
||||
printk_debug(" iobase = 0x%04x irq=%d\n",
|
||||
com->base, com->irq);
|
||||
set_iobase0(sio, com->base);
|
||||
set_irq0(sio, com->irq);
|
||||
/* We are initialized so enable the device */
|
||||
|
|
|
|||
|
|
@ -135,13 +135,15 @@ static void setup_com(struct superio *sio,
|
|||
{
|
||||
// set baud, default to 115200 if not set.
|
||||
int divisor = 115200/(com->baud ? com->baud : 1);
|
||||
printk_debug("Enabling com device: %02x\n", device);
|
||||
printk_debug(" iobase = 0x%04x irq=%d\n", com->base, com->irq);
|
||||
printk_debug("%s com device: %02x\n",
|
||||
com->enable? "Enabling" : "Disabling", device);
|
||||
/* Select the device */
|
||||
set_logical_device(sio, device);
|
||||
/* Disable it while it is initialized */
|
||||
set_enable(sio, 0);
|
||||
if (com->enable) {
|
||||
printk_debug(" iobase = 0x%04x irq=%d\n",
|
||||
com->base, com->irq);
|
||||
set_iobase0(sio, com->base);
|
||||
set_irq0(sio, com->irq);
|
||||
/* We are initialized so enable the device */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue