From owner-p4-projects@FreeBSD.ORG Thu Apr 27 17:56:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1782316A402; Thu, 27 Apr 2006 17:56:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4FC116A404 for ; Thu, 27 Apr 2006 17:56:25 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76EE643D48 for ; Thu, 27 Apr 2006 17:56:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3RHuP9x086064 for ; Thu, 27 Apr 2006 17:56:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3RHuPJF086058 for perforce@freebsd.org; Thu, 27 Apr 2006 17:56:25 GMT (envelope-from marcel@freebsd.org) Date: Thu, 27 Apr 2006 17:56:25 GMT Message-Id: <200604271756.k3RHuPJF086058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 96226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Apr 2006 17:56:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=96226 Change 96226 by marcel@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);