From owner-p4-projects@FreeBSD.ORG Sat Jul 5 19:43:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F36A21065674; Sat, 5 Jul 2008 19:43:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7DCF1065671 for ; Sat, 5 Jul 2008 19:43:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A55F18FC18 for ; Sat, 5 Jul 2008 19:43:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m65JhH3o066373 for ; Sat, 5 Jul 2008 19:43:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m65JhHZ6066371 for perforce@freebsd.org; Sat, 5 Jul 2008 19:43:17 GMT (envelope-from marcel@freebsd.org) Date: Sat, 5 Jul 2008 19:43:17 GMT Message-Id: <200807051943.m65JhHZ6066371@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 144741 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: Sat, 05 Jul 2008 19:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=144741 Change 144741 by marcel@marcel_xcllnt on 2008/07/05 19:43:13 Unify even more... Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_isa.c#10 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_isa.c#10 (text+ko) ==== @@ -1,6 +1,7 @@ /*- + * Copyright (c) 2008 TAKAHASHI Yoshihiro + * Copyright (c) 2008 Marcel Moolenaar * Copyright (c) 2001 M. Warner Losh - * Copyright (c) 2008 TAKAHASHI Yoshihiro * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,7 +66,6 @@ {0x1005d041, "Generic IRDA-compatible device"}, /* PNP0510 */ {0x1105d041, "Generic IRDA-compatible device"}, /* PNP0511 */ /* Devices that do not have a compatid */ -#ifndef PC98 {0x12206804, NULL}, /* ACH2012 - 5634BTS 56K Video Ready Modem */ {0x7602a904, NULL}, /* AEI0276 - 56K v.90 Fax Modem (LKT) */ {0x00007905, NULL}, /* AKY0000 - 56K Plug&Play Modem */ @@ -144,7 +144,7 @@ {0x0300695c, NULL}, /* WCI0003 - Fax/Voice/Modem/Speakphone/Asvd */ {0x01a0896a, NULL}, /* ZTIA001 - Zoom Internal V90 Faxmodem */ {0x61f7896a, NULL}, /* ZTIF761 - Zoom ComStar 33.6 */ -#else + /* The following are found in PC98 hardware. */ {0x4180a3b8, NULL}, /* NEC8041 - PC-9821CB-B04 */ {0x0181a3b8, NULL}, /* NEC8101 - PC-9821CB2-B04 */ {0x5181a3b8, NULL}, /* NEC8151 - Internal FAX/Modem for Cx3, Cb3 */ @@ -156,17 +156,16 @@ {0x5182a3b8, NULL}, /* NEC8251 - Internel FAX/Modem */ {0x7182a3b8, NULL}, /* NEC8271 - PC-9801-125 */ {0x11802fbf, NULL}, /* OYO8011 - Internal FAX/Modem (Ring) */ -#endif {0} }; -#ifdef PC98 -extern struct uart_class *uart_pc98_getdev(u_long); - static struct isa_pnp_id isa_i8251_ids[] = { {0x0100e4a5, "RSA-98III"}, {0} }; + +#ifdef PC98 +extern struct uart_class *uart_pc98_getdev(u_long); #endif static int @@ -184,18 +183,18 @@ return (uart_bus_probe(dev, 0, 0, 0, 0)); } -#ifndef PC98 - return (ENXIO); -#else /* Probe PnP _and_ non-PnP i8251 here. */ if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) { sc->sc_class = &uart_i8251_class; return (uart_bus_probe(dev, 0, 0, 0, 0)); } +#ifdef PC98 sc->sc_class = uart_pc98_getdev(bus_get_resource_start(dev, SYS_RES_IOPORT, 0)); return (uart_bus_probe(dev, 0, 0, 0, 0)); +#else + return (ENXIO); #endif }