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
This commit is contained in:
Poul-Henning Kamp 2004-10-02 18:51:37 +00:00
parent 80e6a01a9a
commit 79e295e875
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=136063
2 changed files with 8 additions and 2 deletions

View File

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

View File

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