From owner-p4-projects@FreeBSD.ORG Tue Aug 19 18:28:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57F5D16A4C1; Tue, 19 Aug 2003 18:28:28 -0700 (PDT) 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 DD3D116A4BF for ; Tue, 19 Aug 2003 18:28:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57E3643FBD for ; Tue, 19 Aug 2003 18:28:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7K1SR0U002598 for ; Tue, 19 Aug 2003 18:28:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7K1SQZs002594 for perforce@freebsd.org; Tue, 19 Aug 2003 18:28:26 -0700 (PDT) Date: Tue, 19 Aug 2003 18:28:26 -0700 (PDT) Message-Id: <200308200128.h7K1SQZs002594@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 Subject: PERFORCE change 36459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Aug 2003 01:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=36459 Change 36459 by marcel@marcel_nfs on 2003/08/19 18:28:01 Remove DEFAULT_RCLK and instead use zero (0) to mean the default rclk for a particular device. This makes it easier when multiple devices are supported and each device has a different default value (ie sparc64). The hardware driver is responsible to initialize bas->rclk if it's zero (0). This will follow in the next commit. Affected files ... .. //depot/projects/uart/dev/uart/uart_cpu_alpha.c#2 edit .. //depot/projects/uart/dev/uart/uart_cpu_i386.c#2 edit .. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#2 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_cpu_alpha.c#2 (text+ko) ==== @@ -38,8 +38,6 @@ #include #include -#define DEFAULT_RCLK 1843200 - int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { @@ -55,7 +53,7 @@ di->bas.bst = busspace_isa_io; di->bas.bsh = 0x3f8; di->bas.regshft = 0; - di->bas.rclk = DEFAULT_RCLK; + di->bas.rclk = 0; di->baudrate = 9600; di->databits = 8; di->stopbits = 1; @@ -91,7 +89,7 @@ di->bas.bst = busspace_isa_io; di->bas.bsh = ivar; di->bas.regshft = 0; - di->bas.rclk = DEFAULT_RCLK; + di->bas.rclk = 0; if (resource_int_value("uart", i, "baud", &ivar) != 0) ivar = 0; di->baudrate = ivar; ==== //depot/projects/uart/dev/uart/uart_cpu_i386.c#2 (text+ko) ==== @@ -36,8 +36,6 @@ #include #include -#define DEFAULT_RCLK 1843200 - int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { @@ -73,7 +71,7 @@ di->bas.bst = I386_BUS_SPACE_IO; di->bas.bsh = ivar; di->bas.regshft = 0; - di->bas.rclk = DEFAULT_RCLK; + di->bas.rclk = 0; if (resource_int_value("uart", i, "baud", &ivar) != 0) ivar = 0; di->baudrate = ivar; ==== //depot/projects/uart/dev/uart/uart_cpu_ia64.c#2 (text+ko) ==== @@ -39,8 +39,6 @@ #include #include -#define DEFAULT_RCLK 1843200 - static int dig64_to_uart_parity[] = { UART_PARITY_NONE, UART_PARITY_NONE, UART_PARITY_EVEN, UART_PARITY_ODD, UART_PARITY_MARK, UART_PARITY_SPACE @@ -77,8 +75,7 @@ di->bas.bsh = (di->bas.bsh << 32) + ent->address.addr_low; di->bas.regshft = 0; - di->bas.rclk = (ent->pclock == 0) ? DEFAULT_RCLK - : ent->pclock << 4; /* rclk = 16 * pclock */ + di->bas.rclk = ent->pclock << 4; /* We don't deal with 64-bit baud rates. */ di->baudrate = ent->baud_low; di->databits = ent->databits; @@ -121,7 +118,7 @@ di->bas.bst = IA64_BUS_SPACE_IO; di->bas.bsh = ivar; di->bas.regshft = 0; - di->bas.rclk = DEFAULT_RCLK; + di->bas.rclk = 0; if (resource_int_value("uart", i, "baud", &ivar) != 0) ivar = 0; di->baudrate = ivar;