Module Name: src
Committed By: bsh
Date: Sun Feb 21 06:08:53 UTC 2010
Modified Files:
src/sys/arch/arm/s3c2xx0: s3c24x0reg.h s3c2800reg.h s3c2xx0reg.h
Log Message:
Modify definitions for ULCOM register of UART according to S3C2800
User's manual rev 1.3.
The values of ULCON_PARITY_SHIFT and ULCON_IR are now same to those
for S3C2410. So the definitions are moved to s3c2xx0reg.h. (Old
definitions from User's manual rev1.1 were differ to those for
S3C2410, and that was why I put them in s3c2800reg.h and s3c24x0reg.h.
There's no description in errata about this changes.)
Also, fix the value for UMSTAT_DCTS on 2800.
The values of UMCON_AFC and UMSTAT_DCTS still differ between 2800 and
2410.
Reported by Brett Slager. Thank you very much.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/s3c2xx0/s3c24x0reg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/s3c2800reg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/s3c2xx0/s3c24x0reg.h
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0reg.h:1.8 src/sys/arch/arm/s3c2xx0/s3c24x0reg.h:1.9
--- src/sys/arch/arm/s3c2xx0/s3c24x0reg.h:1.8 Sun Dec 11 12:16:51 2005
+++ src/sys/arch/arm/s3c2xx0/s3c24x0reg.h Sun Feb 21 06:08:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0reg.h,v 1.8 2005/12/11 12:16:51 christos Exp $ */
+/* $NetBSD: s3c24x0reg.h,v 1.9 2010/02/21 06:08:53 bsh Exp $ */
/*
* Copyright (c) 2003 Genetec corporation All rights reserved.
@@ -335,8 +335,6 @@
/* diffs to s3c2800 */
#define UMCON_AFC (1<<4) /* auto flow control */
#define UMSTAT_DCTS (1<<2) /* CTS change */
-#define ULCON_IR (1<<6)
-#define ULCON_PARITY_SHIFT 3
#define S3C24X0_UART_SIZE 0x2c
Index: src/sys/arch/arm/s3c2xx0/s3c2800reg.h
diff -u src/sys/arch/arm/s3c2xx0/s3c2800reg.h:1.6 src/sys/arch/arm/s3c2xx0/s3c2800reg.h:1.7
--- src/sys/arch/arm/s3c2xx0/s3c2800reg.h:1.6 Sun Dec 11 12:16:51 2005
+++ src/sys/arch/arm/s3c2xx0/s3c2800reg.h Sun Feb 21 06:08:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800reg.h,v 1.6 2005/12/11 12:16:51 christos Exp $ */
+/* $NetBSD: s3c2800reg.h,v 1.7 2010/02/21 06:08:53 bsh Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -239,9 +239,7 @@
/* UART (Small diffs to S3C2400's UART) */
#define UMCON_AFC (1<<1) /* auto flow control */
-#define UMSTAT_DCTS (1<<4) /* CTS change */
-#define ULCON_IR (1<<7)
-#define ULCON_PARITY_SHIFT 4
+#define UMSTAT_DCTS (1<<1) /* CTS change */
/* Interrupt controller */
#define INTCTL_IRQPND 0x0c /* IRQ pending */
Index: src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h
diff -u src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h:1.5 src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h:1.6
--- src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h:1.5 Sun Dec 11 12:16:51 2005
+++ src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h Sun Feb 21 06:08:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0reg.h,v 1.5 2005/12/11 12:16:51 christos Exp $ */
+/* $NetBSD: s3c2xx0reg.h,v 1.6 2010/02/21 06:08:53 bsh Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -46,14 +46,13 @@
* Following definitions can be foune in s3c{2800,24x0}reg.h for
* that reason.
*
- * ULCON_IR (Infra-red mode)
- * ULCON_PARITY_SHIFT (Parity mode bit position)
* UMCON_AFC (Auto flow control)
* UMSTAT_DCTS (CTS change)
*/
#define SSCOM_ULCON 0x00 /* UART line control */
-/* ULCON_PARITY_SHIFT and ULCON_IR is defined in s3c{2800,24x0}reg.h */
+#define ULCON_IR (1<<6)
+#define ULCON_PARITY_SHIFT 3
#define ULCON_PARITY_NONE (0<<ULCON_PARITY_SHIFT)
#define ULCON_PARITY_ODD (4<<ULCON_PARITY_SHIFT)
#define ULCON_PARITY_EVEN (5<<ULCON_PARITY_SHIFT)
