From owner-p4-projects@FreeBSD.ORG  Thu Apr 27 18:06:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6913416A4E3; Thu, 27 Apr 2006 18:06:44 +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 3468416A41F
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 18:06:43 +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 6181D43D6A
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 18:06:39 +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 k3RI6cpR092649
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 18:06:38 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3RI6cIB092646
	for perforce@freebsd.org; Thu, 27 Apr 2006 18:06:38 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 27 Apr 2006 18:06:38 GMT
Message-Id: <200604271806.k3RI6cIB092646@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96228 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Apr 2006 18:06:46 -0000

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

Change 96228 by marcel@marcel_nfs on 2006/04/27 18:05:56

	Sync with NetBSD: Add AMC-chip based 8-port UART.

Affected files ...

.. //depot/projects/uart/dev/puc/pucdata.c#44 edit

Differences ...

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

@@ -46,6 +46,7 @@
 #include <dev/puc/puc_bus.h>
 #include <dev/puc/puc_cfg.h>
 
+static puc_config_f puc_config_amc;
 static puc_config_f puc_config_cronyx;
 static puc_config_f puc_config_diva;
 static puc_config_f puc_config_icbook;
@@ -164,6 +165,13 @@
 	    PUC_PORT_2P, 0x20, 4, 0,
 	},
 
+	{   0x10e8, 0x818e, 0xffff, 0,
+	    "Applied Micro Circuits 8 Port UART",
+            DEFAULT_RCLK,
+            PUC_PORT_8S, 0x14, -1, -1,
+	    .config_function = puc_config_amc
+        },
+
 	{   0x11fe, 0x8010, 0xffff, 0,
 	    "Comtrol RocketPort 550/8 RJ11 part A",
 	    DEFAULT_RCLK * 4,
@@ -778,6 +786,23 @@
 };
 
 static int
+puc_config_amc(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
+    intptr_t *res)
+{
+	switch (cmd) {
+	case PUC_CFG_GET_OFS:
+		*res = 8 * (port & 1);
+		return (0);
+	case PUC_CFG_GET_RID:
+		*res = 0x14 + (port >> 1) * 4;
+		return (0);
+	default:
+		break;
+	}
+	return (ENXIO);
+}
+
+static int
 puc_config_cronyx(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
     intptr_t *res)
 {