3 files changed, 26 insertions, 21 deletions

diff --git a/sys/i4b/layer1/i4b_l1.h b/sys/i4b/layer1/i4b_l1.h
index 76c11bfe2792b..55d6860c4064c 100644
--- a/sys/i4b/layer1/i4b_l1.h
+++ b/sys/i4b/layer1/i4b_l1.h
@@ -31,7 +31,7 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Fri Jun  2 14:37:10 2000]
+ *      last edit-date: [Thu Oct 26 08:42:44 2000]
  *
  *---------------------------------------------------------------------------*/
 
@@ -70,6 +70,7 @@
 #define FLAG_TELES_S0_163C	25
 #define FLAG_ACER_P10		26
 #define FLAG_TELEINT_NO_1	27
+#define FLAG_CCD_HFCS_PCI	28
 
 #define SEC_DELAY		1000000	/* one second DELAY for DELAY*/
 
@@ -83,11 +84,13 @@
 #define L0UNIT(du) ((du) & 0xff)
 
 #define L0DRVRUNIT(d, u) ( (((d) << 8) & 0xff00) | ((u) & 0xff))
+
 #define L0ISICUNIT(u) ( (((L1DRVR_ISIC) << 8) & 0xff00) | ((u) & 0xff))
 #define L0IWICUNIT(u) ( (((L1DRVR_IWIC) << 8) & 0xff00) | ((u) & 0xff))
 #define L0IFPIUNIT(u) ( (((L1DRVR_IFPI) << 8) & 0xff00) | ((u) & 0xff))
 #define L0IHFCUNIT(u) ( (((L1DRVR_IHFC) << 8) & 0xff00) | ((u) & 0xff))
 #define L0IFPNPUNIT(u) ( (((L1DRVR_IFPNP) << 8) & 0xff00) | ((u) & 0xff))
+#define L0ICCHPUNIT(u) ( (((L1DRVR_ICCHP) << 8) & 0xff00) | ((u) & 0xff))
 
 /* jump table for the multiplex functions */
 struct i4b_l1mux_func {
diff --git a/usr.sbin/i4b/isdnd/controller.c b/usr.sbin/i4b/isdnd/controller.c
index 3da8274bf434d..2c45bf607e922 100644
--- a/usr.sbin/i4b/isdnd/controller.c
+++ b/usr.sbin/i4b/isdnd/controller.c
@@ -31,7 +31,7 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Mon Oct  9 14:37:34 2000]
+ *      last edit-date: [Thu Oct 26 08:39:21 2000]
  *
  *---------------------------------------------------------------------------*/
 
@@ -74,6 +74,7 @@ name_of_controller(int ctrl_type, int card_type)
 		"Teles S0/16.3c PnP",
 		"AcerISDN P10 PnP",
 		"TELEINT ISDN SPEED No. 1"
+		"Cologne Chip HFC-S PCI based"
 	};
 
 	static char *daic_card[] = {
diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c
index f96b2136c3367..89a89101335de 100644
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@@ -31,7 +31,7 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Mon Jul 24 14:25:33 2000]
+ *      last edit-date: [Thu Oct 26 08:50:30 2000]
  *
  *---------------------------------------------------------------------------*/
 
@@ -542,24 +542,25 @@ void
 printl1(unsigned long val)
 {
 	printf("\nLayer 1: %s  =  0x%lX\n", bin_str(val, 32), val);
-	printf("                             |||| |||| |||| ||||\n"),
-	printf("                             |||| |||| |||| |||+- general error messages\n");
-	printf("                             |||| |||| |||| ||+-- PH primitives exchanged\n");
-	printf("                             |||| |||| |||| |+--- B channel actions\n");
-	printf("                             |||| |||| |||| +---- HSCX error messages\n");
-	printf("                             |||| |||| |||+------ HSCX IRQ messages\n");
-	printf("                             |||| |||| ||+------- ISAC error messages\n");
-	printf("                             |||| |||| |+-------- ISAC messages\n");
-	printf("                             |||| |||| +--------- ISAC setup messages\n");
-	printf("                             |||| |||+----------- FSM general messages\n");
-	printf("                             |||| ||+------------ FSM error messages\n");
-	printf("                             |||| |+------------- timer general messages\n");
-	printf("                             |||| +-------------- timer error messages\n");
-	printf("                             |||+---------------- HSCX data xfer errors msgs\n");
-	printf("                             ||+----------------- ISAC CICO messages\n");
-	printf("                             |+------------------ silent messages (soft-HDLC)\n");
-	printf("                             +------------------- error messages (soft-HDLC)\n");
-	printf("         ++++-++++-++++-++++--------------------- unassigned\n");
+	printf("                           | |||| |||| |||| ||||\n"),
+	printf("                           | |||| |||| |||| |||+- general error messages\n");
+	printf("                           | |||| |||| |||| ||+-- PH primitives exchanged\n");
+	printf("                           | |||| |||| |||| |+--- B channel actions\n");
+	printf("                           | |||| |||| |||| +---- HSCX error messages\n");
+	printf("                           | |||| |||| |||+------ HSCX IRQ messages\n");
+	printf("                           | |||| |||| ||+------- ISAC error messages\n");
+	printf("                           | |||| |||| |+-------- ISAC messages\n");
+	printf("                           | |||| |||| +--------- ISAC setup messages\n");
+	printf("                           | |||| |||+----------- FSM general messages\n");
+	printf("                           | |||| ||+------------ FSM error messages\n");
+	printf("                           | |||| |+------------- timer general messages\n");
+	printf("                           | |||| +-------------- timer error messages\n");
+	printf("                           | |||+---------------- HSCX data xfer errors msgs\n");
+	printf("                           | ||+----------------- ISAC CICO messages\n");
+	printf("                           | |+------------------ silent messages (soft-HDLC)\n");
+	printf("                           | +------------------- error messages (soft-HDLC)\n");
+	printf("                           +--------------------- HFC-S PCI debug messages\n");
+	printf("         ++++-++++-++++-+++---------------------- unassigned\n");
 }
 
 /*---------------------------------------------------------------------------*