Remove support for "port none" and "port auto", it gains nothing,
non-standard and not used. "port auto" is equal to "port?" or missing "port" keyword now. "port none" is really probe routine task (return -1 for no ports).
This commit is contained in:
parent
394da4c167
commit
659d2a2071
@ -125,8 +125,6 @@ struct device {
|
||||
int d_disabled; /* nonzero to skip probe/attach */
|
||||
char *d_port; /* io port base manifest constant */
|
||||
int d_portn; /* io port base (if number not manifest) */
|
||||
#define PORT_AUTO -1 /* automatically configured */
|
||||
#define PORT_NONE -2 /* no port */
|
||||
char *d_mask; /* interrupt mask */
|
||||
int d_maddr; /* io memory base */
|
||||
int d_msize; /* io memory size */
|
||||
|
@ -9,7 +9,6 @@
|
||||
%token ANY
|
||||
%token ARGS
|
||||
%token AT
|
||||
%token AUTO
|
||||
%token BIO
|
||||
%token BUS
|
||||
%token COMMA
|
||||
@ -39,7 +38,6 @@
|
||||
%token MINUS
|
||||
%token NET
|
||||
%token NEXUS
|
||||
%token NONE
|
||||
%token ON
|
||||
%token OPTIONS
|
||||
%token MAKEOPTIONS
|
||||
@ -617,10 +615,6 @@ Info:
|
||||
= { cur.d_port = $2; } |
|
||||
PORT NUMBER
|
||||
= { cur.d_portn = $2; } |
|
||||
PORT AUTO
|
||||
= { cur.d_portn = PORT_AUTO; } |
|
||||
PORT NONE
|
||||
= { cur.d_portn = PORT_NONE; } |
|
||||
TTY
|
||||
= { cur.d_mask = "tty"; } |
|
||||
BIO
|
||||
@ -907,7 +901,7 @@ init_dev(dp)
|
||||
dp->d_pri = -1;
|
||||
dp->d_slave = dp->d_lun = dp->d_target = dp->d_drive = dp->d_unit = UNKNOWN;
|
||||
dp->d_port = (char *)0;
|
||||
dp->d_portn = PORT_NONE;
|
||||
dp->d_portn = -1;
|
||||
dp->d_irq = -1;
|
||||
dp->d_drq = -1;
|
||||
dp->d_maddr = 0;
|
||||
|
@ -52,7 +52,6 @@ struct kt {
|
||||
{ "and", AND },
|
||||
{ "args", ARGS },
|
||||
{ "at", AT },
|
||||
{ "auto", AUTO },
|
||||
#if MACHINE_I386
|
||||
{ "bio", BIO },
|
||||
{ "bus", BUS },
|
||||
@ -90,7 +89,6 @@ struct kt {
|
||||
{ "net", NET },
|
||||
#endif
|
||||
{ "nexus", NEXUS },
|
||||
{ "none", NONE },
|
||||
{ "on", ON },
|
||||
{ "options", OPTIONS },
|
||||
#if MACHINE_I386
|
||||
|
@ -757,7 +757,7 @@ isa_devtab(fp, table, dev_idp)
|
||||
fprintf(fp, "{ %2d, &%3sdriver,", (*dev_idp)++, dp->d_name);
|
||||
if (dp->d_port)
|
||||
fprintf(fp, " %8s,", dp->d_port);
|
||||
else if (dp->d_portn == PORT_AUTO || dp->d_portn == PORT_NONE)
|
||||
else if (dp->d_portn == -1)
|
||||
fprintf(fp, " %d,", dp->d_portn);
|
||||
else
|
||||
fprintf(fp, " 0x%04x,", dp->d_portn);
|
||||
|
Loading…
Reference in New Issue
Block a user