Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/samsung Allow setting of console speed in init.



details:   https://anonhg.NetBSD.org/src/rev/4c828b1c6aa8
branches:  trunk
changeset: 328847:4c828b1c6aa8
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Apr 20 22:45:27 2014 +0000

description:
Allow setting of console speed in init.

diffstat:

 sys/arch/arm/samsung/sscom.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (43 lines):

diff -r 428479949e3e -r 4c828b1c6aa8 sys/arch/arm/samsung/sscom.c
--- a/sys/arch/arm/samsung/sscom.c      Sun Apr 20 22:39:51 2014 +0000
+++ b/sys/arch/arm/samsung/sscom.c      Sun Apr 20 22:45:27 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sscom.c,v 1.4 2014/04/18 11:37:17 reinoud Exp $ */
+/*     $NetBSD: sscom.c,v 1.5 2014/04/20 22:45:27 matt Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.4 2014/04/18 11:37:17 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.5 2014/04/20 22:45:27 matt Exp $");
 
 #include "opt_sscom.h"
 #include "opt_ddb.h"
@@ -1866,11 +1866,9 @@
            UFCON_RXFIFO_RESET);
        /* tx/rx fifo reset are auto-cleared */
 
-#if 0
        rate = sscomspeed(rate, frequency);
-       bus_space_write_2(iot, ioh, SSCOM_UBRDIV, rate);
-#endif
-       bus_space_write_1(iot, ioh, SSCOM_ULCON, cflag2lcr(cflag));
+       bus_space_write_4(iot, ioh, SSCOM_UBRDIV, rate);
+       bus_space_write_4(iot, ioh, SSCOM_ULCON, cflag2lcr(cflag));
 
        /* enable UART */
        bus_space_write_4(iot, ioh, SSCOM_UCON, 
@@ -1900,8 +1898,8 @@
 {
        int res;
 
-       res = sscom_init(iot, ioh, config,
-               rate, frequency, cflag, &sscomconsioh);
+       res = sscom_init(iot, ioh, config, rate, frequency, cflag,
+           &sscomconsioh);
        if (res)
                return res;
 



Home | Main Index | Thread Index | Old Index