PERFORCE change 96226 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=96226

Change 96226 by marcel at marcel_nfs on 2006/04/27 17:55:52

	Sync with NetBSD:
	o  Add NetMOS NM9845 6 port UART
	o  Fix existing entry for NM9845 Quad UART
	
	While here: White-space fixes
	
	While actually compiling: Fix assignment in conditional

Affected files ...

.. //depot/projects/uart/dev/puc/puc_cfg.c#5 edit
.. //depot/projects/uart/dev/puc/puc_cfg.h#5 edit
.. //depot/projects/uart/dev/puc/pucdata.c#43 edit

Differences ...

==== //depot/projects/uart/dev/puc/puc_cfg.c#5 (text+ko) ====

@@ -92,6 +92,9 @@
 		case PUC_PORT_4S1P:
 			*r = 5;
 			return (0);
+		case PUC_PORT_6S:
+			*r = 6;
+			return (0);
 		case PUC_PORT_8S:
 			*r = 8;
 			return (0);

==== //depot/projects/uart/dev/puc/puc_cfg.h#5 (text+ko) ====

@@ -42,9 +42,10 @@
 #define	PUC_PORT_3S		8	/* 3 serial ports */
 #define	PUC_PORT_4S		9	/* 4 serial ports */
 #define	PUC_PORT_4S1P		10	/* 4 serial + 1 parallel ports */
-#define	PUC_PORT_8S		11	/* 8 serial ports */
-#define	PUC_PORT_12S		12	/* 12 serial ports */
-#define	PUC_PORT_16S		13	/* 16 serial ports */
+#define	PUC_PORT_6S		11	/* 6 serial ports */
+#define	PUC_PORT_8S		12	/* 8 serial ports */
+#define	PUC_PORT_12S		13	/* 12 serial ports */
+#define	PUC_PORT_16S		14	/* 16 serial ports */
 
 /* Interrupt Latch Register (ILR) types */
 #define PUC_ILR_NONE		0

==== //depot/projects/uart/dev/puc/pucdata.c#43 (text+ko) ====

@@ -413,10 +413,10 @@
 
 	{   0x131f, 0x2081, 0xffff, 0,
 	    "SIIG PS8000 8S PCI 16C650 (20x family)",
-            DEFAULT_RCLK,
-            PUC_PORT_8S, 0x10, -1, -1,
+	    DEFAULT_RCLK,
+	    PUC_PORT_8S, 0x10, -1, -1,
 	    .config_function = puc_config_siig
-        },
+	},
 
 	{   0x135c, 0x0010, 0xffff, 0,
 	    "Quatech QSC-100",
@@ -695,16 +695,28 @@
 	    PUC_PORT_2S, 0x1c, 0, 8,
 	},
 
+	{   0x9710, 0x9815, 0xffff, 0,
+	    "NetMos NM9815 Dual 1284 Printer port", 
+	    0,
+	    PUC_PORT_2P, 0x10, 8, 0,
+	}, 
+
 	{   0x9710, 0x9835, 0xffff, 0,
 	    "NetMos NM9835 Dual UART and 1284 Printer port",
 	    DEFAULT_RCLK,
 	    PUC_PORT_2S1P, 0x10, 4, 0,
 	},
 
+	{   0x9710, 0x9845, 0x1000, 0x0006,
+	    "NetMos NM9845 6 Port UART",
+	    DEFAULT_RCLK,
+	    PUC_PORT_6S, 0x10, 4, 0,
+	},
+
 	{   0x9710, 0x9845, 0xffff, 0,
-	    "NetMos NM9845 Quad UART",
+	    "NetMos NM9845 Quad UART and 1284 Printer port",
 	    DEFAULT_RCLK,
-	    PUC_PORT_4S, 0x10, 4, 0,
+	    PUC_PORT_4S1P, 0x10, 4, 0,
 	},
 
 	{   0xb00c, 0x021c, 0xffff, 0,
@@ -995,7 +1007,7 @@
 			*res = 0x10 + ((port > 4) ? 0x10 : 4 * port);
 			return (0);
 		}
-		if (cfg->ports = PUC_PORT_2S1P) {
+		if (cfg->ports == PUC_PORT_2S1P) {
 			switch (port) {
 			case 0: *res = 0x10; return (0);
 			case 1: *res = 0x14; return (0);