From owner-svn-src-projects@FreeBSD.ORG Sat Mar 20 05:11:56 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A16BD1065670; Sat, 20 Mar 2010 05:11:56 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 759978FC13; Sat, 20 Mar 2010 05:11:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2K5BuVs074939; Sat, 20 Mar 2010 05:11:56 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2K5Buhu074936; Sat, 20 Mar 2010 05:11:56 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201003200511.o2K5Buhu074936@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 20 Mar 2010 05:11:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205362 - projects/altix/sys/dev/uart X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2010 05:11:56 -0000 Author: marcel Date: Sat Mar 20 05:11:56 2010 New Revision: 205362 URL: http://svn.freebsd.org/changeset/base/205362 Log: Allow specifications that lack an I/O port or memory mapped I/O address when the UART class doesn't need it. A class doesn't need it when the I/O range is 0. This makes the L1 console work with the following specification: set hw.uart.console="dt:sgisn" Modified: projects/altix/sys/dev/uart/uart_dev_sgisn.c projects/altix/sys/dev/uart/uart_subr.c Modified: projects/altix/sys/dev/uart/uart_dev_sgisn.c ============================================================================== --- projects/altix/sys/dev/uart/uart_dev_sgisn.c Sat Mar 20 05:10:44 2010 (r205361) +++ projects/altix/sys/dev/uart/uart_dev_sgisn.c Sat Mar 20 05:11:56 2010 (r205362) @@ -148,7 +148,7 @@ struct uart_class uart_sgisn_class = { sgisn_methods, sizeof(struct sgisn_softc), .uc_ops = &uart_sgisn_ops, - .uc_range = 2, + .uc_range = 0, .uc_rclk = 0 }; Modified: projects/altix/sys/dev/uart/uart_subr.c ============================================================================== --- projects/altix/sys/dev/uart/uart_subr.c Sat Mar 20 05:10:44 2010 (r205361) +++ projects/altix/sys/dev/uart/uart_subr.c Sat Mar 20 05:11:56 2010 (r205362) @@ -195,7 +195,7 @@ uart_getenv(int devtype, struct uart_dev { __const char *spec; bus_addr_t addr = ~0U; - int error; + int error, range; /* * All uart_class references are weak. Make sure the default @@ -273,13 +273,25 @@ uart_getenv(int devtype, struct uart_dev spec++; } + di->ops = uart_getops(class); + range = uart_getrange(class); + /* * If we still have an invalid address, the specification must be - * missing an I/O port or memory address. We don't like that. + * missing an I/O port or memory address. We don't like that if + * the class expects an I/O port or memory range. */ - if (addr == ~0U) + if (addr == ~0U && range != 0) return (EINVAL); + /* Create a bus space handle if applicable. */ + if (addr != ~0U && range != 0) { + error = bus_space_map(di->bas.bst, addr, range, 0, + &di->bas.bsh); + if (error) + return (error); + } + /* * Accept only the well-known baudrates. Any invalid baudrate * is silently replaced with a 0-valued baudrate. The 0 baudrate @@ -299,9 +311,5 @@ uart_getenv(int devtype, struct uart_dev } else di->baudrate = 0; - /* Set the ops and create a bus space handle. */ - di->ops = uart_getops(class); - error = bus_space_map(di->bas.bst, addr, uart_getrange(class), 0, - &di->bas.bsh); - return (error); + return (0); }