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

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

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