diff options
| author | phk <phk@FreeBSD.org> | 2004-10-02 18:51:37 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-10-02 18:51:37 +0000 |
| commit | f697f4f13edf786a14bda731cb55d404c64e89bf (patch) | |
| tree | fe507a6c1691c606fa5448777b5a6886851fab7b /usr.sbin | |
| parent | 955182f9c8b331db9d73e2554bc697305ce0009e (diff) | |
| download | FreeBSD-src-f697f4f13edf786a14bda731cb55d404c64e89bf.zip FreeBSD-src-f697f4f13edf786a14bda731cb55d404c64e89bf.tar.gz | |
Get debugging macros from sivar.h
Disable some code which magics minor numbers into card/port numbers.
I think we will have to parse this from the device name in the future,
but I need to confer with peter@ about this.
Put sicontrol back in the build.
Troublespotter: dwhite
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/sicontrol/sicontrol.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 37feac5..a976e53 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -285,7 +285,7 @@ _pnpinfo= pnpinfo .if !defined(NOLIBPTHREAD) _pppctl= pppctl .endif -# _sicontrol= sicontrol +_sicontrol= sicontrol _spkrtest= spkrtest _wlconfig= wlconfig _zzz= zzz @@ -317,7 +317,7 @@ _mptable= mptable .if !defined(NOLIBPTHREAD) _pppctl= pppctl .endif -# _sicontrol= sicontrol +_sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz .endif diff --git a/usr.sbin/sicontrol/sicontrol.c b/usr.sbin/sicontrol/sicontrol.c index b676688..84e9782 100644 --- a/usr.sbin/sicontrol/sicontrol.c +++ b/usr.sbin/sicontrol/sicontrol.c @@ -44,7 +44,9 @@ static const char rcsid[] = #include <sys/ioctl.h> #include <sys/tty.h> +#define SI_DEBUG #include <dev/si/si.h> +#include <dev/si/sivar.h> struct lv { char *lv_name; @@ -158,8 +160,12 @@ main(int argc, char **argv) } if (stat(Devname, &st) < 0) errx(1, "can't stat %s", Devname); +#if 0 dev.sid_card = SI_CARD(minor(st.st_rdev)); dev.sid_port = SI_PORT(minor(st.st_rdev)); +#else + errx(1, "Sorry, code missing to parse device name into card/port"); +#endif tc.tc_dev = dev; } ctlfd = opencontrol(); |
