d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for "port none" and "port auto", it gains nothing,

Browse Source 
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:
ache 1997-03-28 00:56:11 +00:00
parent 1ab53abb24
commit fb9c556858
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/config/config.h
View File

@ -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 */

8
usr.sbin/config/config.y
View File

@ -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;

2
usr.sbin/config/lang.l
View File

@ -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

2
usr.sbin/config/mkioconf.c
View File

@ -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);