CVS commit: src/sys/arch/zaurus/zaurus

2021-06-20 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Jun 21 03:05:24 UTC 2021

Modified Files:
src/sys/arch/zaurus/zaurus: autoconf.c

Log Message:
fix proplib deprecation


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/zaurus/autoconf.c

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/zaurus/zaurus/autoconf.c
diff -u src/sys/arch/zaurus/zaurus/autoconf.c:1.13 src/sys/arch/zaurus/zaurus/autoconf.c:1.14
--- src/sys/arch/zaurus/zaurus/autoconf.c:1.13	Wed Nov 13 12:48:03 2019
+++ src/sys/arch/zaurus/zaurus/autoconf.c	Sun Jun 20 23:05:24 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.13 2019/11/13 17:48:03 tsutsui Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.14 2021/06/21 03:05:24 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2019/11/13 17:48:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2021/06/21 03:05:24 christos Exp $");
 
 #include "opt_md.h"
 
@@ -227,7 +227,7 @@ device_register(device_t dev, void *aux)
 	 */
 	if (device_is_a(dev, "iic") &&
 	device_is_a(dev->dv_parent, "ziic")) {
-		(void)prop_dictionary_set_cstring_nocopy(device_properties(dev),
+		(void)prop_dictionary_set_string_nocopy(device_properties(dev),
 		I2C_PROP_INDIRECT_PROBE_STRATEGY, I2C_PROBE_STRATEGY_NONE);
 	}
 }

CVS commit: src/sys/arch/zaurus/dev

2021-04-13 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Tue Apr 13 13:18:50 UTC 2021

Modified Files:
src/sys/arch/zaurus/dev: w100lcd.c

Log Message:
Make LCD BrightnessUp/BrightnessDown work on C7x0/860.

Patch from steleto:
 https://gist.github.com/steleto/10f62a074bff0c188fcc10c14ef40b5a
and also confirmed by me on SL-C700.

Worth to pullup to netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/dev/w100lcd.c

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/zaurus/dev/w100lcd.c
diff -u src/sys/arch/zaurus/dev/w100lcd.c:1.2 src/sys/arch/zaurus/dev/w100lcd.c:1.3
--- src/sys/arch/zaurus/dev/w100lcd.c:1.2	Fri Feb 10 11:25:42 2012
+++ src/sys/arch/zaurus/dev/w100lcd.c	Tue Apr 13 13:18:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: w100lcd.c,v 1.2 2012/02/10 11:25:42 tsutsui Exp $ */
+/* $NetBSD: w100lcd.c,v 1.3 2021/04/13 13:18:50 tsutsui Exp $ */
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
@@ -39,7 +39,9 @@
  * LCD on/off switch and backlight brightness are done in lcdctl.c.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.2 2012/02/10 11:25:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.3 2021/04/13 13:18:50 tsutsui Exp $");
+
+#include "lcdctl.h"
 
 #include 
 #include 
@@ -58,6 +60,9 @@ __KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 
 
 #include 
 #include 
+#if NLCDCTL > 0
+#include 
+#endif
 
 /*
  * wsdisplay glue

CVS commit: src/sys/arch/zaurus/dev

2020-11-21 Thread Jason R Thorpe 
Module Name:src
Committed By:   thorpej
Date:   Sat Nov 21 17:22:03 UTC 2020

Modified Files:
src/sys/arch/zaurus/dev: w100.c zkbd.c

Log Message:
malloc(9) -> kmem(9)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/dev/w100.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/zaurus/dev/zkbd.c

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/zaurus/dev/w100.c
diff -u src/sys/arch/zaurus/dev/w100.c:1.2 src/sys/arch/zaurus/dev/w100.c:1.3
--- src/sys/arch/zaurus/dev/w100.c:1.2	Sun Nov 10 21:16:34 2019
+++ src/sys/arch/zaurus/dev/w100.c	Sat Nov 21 17:22:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: w100.c,v 1.2 2019/11/10 21:16:34 chs Exp $ */
+/* $NetBSD: w100.c,v 1.3 2020/11/21 17:22:03 thorpej Exp $ */
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
@@ -28,13 +28,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: w100.c,v 1.2 2019/11/10 21:16:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: w100.c,v 1.3 2020/11/21 17:22:03 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 			/* for cold */
 
 #include 
@@ -235,7 +235,7 @@ w100_new_screen(struct w100_softc *sc, i
 	struct w100_screen *scr = NULL;
 	int error = 0;
 
-	scr = malloc(sizeof(*scr), M_DEVBUF, M_WAITOK | M_ZERO);
+	scr = kmem_zalloc(sizeof(*scr), KM_SLEEP);
 	scr->buf_va = (u_char *)bus_space_vaddr(sc->iot, sc->ioh_vram);
 	scr->depth = depth;
 

Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.19 src/sys/arch/zaurus/dev/zkbd.c:1.20
--- src/sys/arch/zaurus/dev/zkbd.c:1.19	Sun Nov 10 21:16:34 2019
+++ src/sys/arch/zaurus/dev/zkbd.c	Sat Nov 21 17:22:03 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.19 2019/11/10 21:16:34 chs Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.20 2020/11/21 17:22:03 thorpej Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.19 2019/11/10 21:16:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.20 2020/11/21 17:22:03 thorpej Exp $");
 
 #include "opt_wsdisplay_compat.h"
 #if 0	/* XXX */
@@ -29,7 +29,7 @@ __KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.1
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -283,10 +283,10 @@ zkbd_attach(device_t parent, device_t se
 		aprint_error_dev(sc->sc_dev,
 		"couldn't establish power handler\n");
 
-	sc->sc_okeystate = malloc(sc->sc_nsense * sc->sc_nstrobe,
-	M_DEVBUF, M_WAITOK | M_ZERO);
-	sc->sc_keystate = malloc(sc->sc_nsense * sc->sc_nstrobe,
-	M_DEVBUF, M_WAITOK | M_ZERO);
+	sc->sc_okeystate = kmem_zalloc(sc->sc_nsense * sc->sc_nstrobe,
+	KM_SLEEP);
+	sc->sc_keystate = kmem_zalloc(sc->sc_nsense * sc->sc_nstrobe,
+	KM_SLEEP);
 
 	/* set all the strobe bits */
 	for (i = 0; i < sc->sc_nstrobe; i++) {

CVS commit: src/sys/arch/zaurus/include

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:24:39 UTC 2020

Modified Files:
src/sys/arch/zaurus/include: intr.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/include/intr.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/zaurus/include/intr.h
diff -u src/sys/arch/zaurus/include/intr.h:1.9 src/sys/arch/zaurus/include/intr.h:1.10
--- src/sys/arch/zaurus/include/intr.h:1.9	Sun Jul 27 08:55:39 2014
+++ src/sys/arch/zaurus/include/intr.h	Thu Jul 23 19:24:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.9 2014/07/27 08:55:39 skrll Exp $	*/
+/*	$NetBSD: intr.h,v 1.10 2020/07/23 19:24:38 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -68,14 +68,6 @@
 
 #include 
 
-#if defined(_LKM)
-
-int	_splraise(int);
-int	_spllower(int);
-void	splx(int);
-
-#else	/* _LKM */
-
 #include "opt_arm_intr_impl.h"
 
 #if defined(ARM_INTR_IMPL)
@@ -119,8 +111,6 @@ void	splx(int);
 
 #endif	/* ARM_INTR_IMPL */
 
-#endif /* _LKM */
-
 #define	splsoft()	_splraise(IPL_SOFT)
 
 typedef uint8_t ipl_t;

CVS commit: src/sys/arch/zaurus/stand/zboot

2020-05-03 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sun May  3 21:02:24 UTC 2020

Modified Files:
src/sys/arch/zaurus/stand/zboot: boot.h

Log Message:
Avoid common symbol declarations.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/stand/zboot/boot.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/zaurus/stand/zboot/boot.h
diff -u src/sys/arch/zaurus/stand/zboot/boot.h:1.3 src/sys/arch/zaurus/stand/zboot/boot.h:1.4
--- src/sys/arch/zaurus/stand/zboot/boot.h:1.3	Sat Jun 28 09:16:18 2014
+++ src/sys/arch/zaurus/stand/zboot/boot.h	Sun May  3 21:02:24 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.h,v 1.3 2014/06/28 09:16:18 rtr Exp $	*/
+/*	$NetBSD: boot.h,v 1.4 2020/05/03 21:02:24 joerg Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro
@@ -37,9 +37,9 @@
 extern int debug;
 
 /* boot.c */
-char *default_devname;
-uint default_unit, default_partition;
-const char *default_filename;
+extern char *default_devname;
+extern uint default_unit, default_partition;
+extern const char *default_filename;
 extern int default_timeout;
 
 void boot(dev_t);

CVS commit: src/sys/arch/zaurus/conf

2020-01-11 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sun Jan 12 06:41:02 UTC 2020

Modified Files:
src/sys/arch/zaurus/conf: Makefile.zaurus.inc

Log Message:
Revert "Compile with -O2 by default" change in previous rev 1.11.

COPTS is defined properly after sys/arch/arm/conf/Makefile.arm rev 1.53.
See discussion in source-changes-d@ for details:
 https://mail-index.netbsd.org/source-changes-d/2020/01/thread1.html#011984


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/zaurus/conf/Makefile.zaurus.inc

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/zaurus/conf/Makefile.zaurus.inc
diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.11 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.12
--- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.11	Fri Jan  3 10:01:07 2020
+++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc	Sun Jan 12 06:41:02 2020
@@ -1,8 +1,7 @@
-#	$NetBSD: Makefile.zaurus.inc,v 1.11 2020/01/03 10:01:07 martin Exp $
+#	$NetBSD: Makefile.zaurus.inc,v 1.12 2020/01/12 06:41:02 tsutsui Exp $
 
 MACHINE_ARCH?=		arm
 CPPFLAGS+=		-D${MACHINE}
-COPTS?=			-O2
 
 SYSTEM_FIRST_OBJ=	zaurus_start.o
 SYSTEM_FIRST_SFILE=	${THISARM}/zaurus/zaurus_start.S

CVS commit: src/sys/arch/zaurus/conf

2020-01-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Jan  3 10:01:07 UTC 2020

Modified Files:
src/sys/arch/zaurus/conf: Makefile.zaurus.inc ldscript.zaurus

Log Message:
Drop CTF sections from this size restricted kernel (especially as the
size check is on the total size of the binary, not any content/sections -
is this a bug?)
Compile with -O2 by default (to shrink the kernel to a usable size again
and unbreak the build)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/conf/Makefile.zaurus.inc
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/zaurus/conf/ldscript.zaurus

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/zaurus/conf/Makefile.zaurus.inc
diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.10 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.11
--- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.10	Sat Oct 26 09:49:13 2019
+++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc	Fri Jan  3 10:01:07 2020
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile.zaurus.inc,v 1.10 2019/10/26 09:49:13 tsutsui Exp $
+#	$NetBSD: Makefile.zaurus.inc,v 1.11 2020/01/03 10:01:07 martin Exp $
 
 MACHINE_ARCH?=		arm
 CPPFLAGS+=		-D${MACHINE}
+COPTS?=			-O2
 
 SYSTEM_FIRST_OBJ=	zaurus_start.o
 SYSTEM_FIRST_SFILE=	${THISARM}/zaurus/zaurus_start.S

Index: src/sys/arch/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.11 src/sys/arch/zaurus/conf/ldscript.zaurus:1.12
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.11	Sun Aug 23 08:57:25 2015
+++ src/sys/arch/zaurus/conf/ldscript.zaurus	Fri Jan  3 10:01:07 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldscript.zaurus,v 1.11 2015/08/23 08:57:25 uebayasi Exp $	*/
+/*	$NetBSD: ldscript.zaurus,v 1.12 2020/01/03 10:01:07 martin Exp $	*/
 
 ENTRY(KERNEL_BASE_phys)
 SECTIONS
@@ -72,6 +72,7 @@ SECTIONS
   /DISCARD/ : {
 *(.eh_frame_hdr)
 *(.eh_frame)
+*(.SUNW_ctf)
   }
 }
 SECTIONS

CVS commit: src/sys/arch/zaurus/conf

2019-03-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Mar 29 21:06:51 UTC 2019

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
bye ddb and we fit again.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.84 src/sys/arch/zaurus/conf/GENERIC:1.85
--- src/sys/arch/zaurus/conf/GENERIC:1.84	Thu Feb  7 16:53:50 2019
+++ src/sys/arch/zaurus/conf/GENERIC	Fri Mar 29 17:06:51 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.84 2019/02/07 21:53:50 rin Exp $
+#	$NetBSD: GENERIC,v 1.85 2019/03/29 21:06:51 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -150,8 +150,8 @@ options 	WSDISPLAY_COMPAT_RAWKBD		# can 
 options 	DIAGNOSTIC		# internal consistency checks
 #options 	DEBUG
 #options 	VERBOSE_INIT_ARM	# verbose bootstraping messages
-options 	DDB			# in-kernel debugger
-options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
+#options 	DDB			# in-kernel debugger
+#options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 #makeoptions 	DEBUG="-g"		# compile full symbol table
 makeoptions	COPY_SYMTAB=1

CVS commit: src/sys/arch/zaurus/zaurus

2019-03-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Mar 29 20:27:45 UTC 2019

Modified Files:
src/sys/arch/zaurus/zaurus: machdep.c

Log Message:
Yes, we need to load symbols, but we don't need the whole DDB infrastructure
for that.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/zaurus/zaurus/machdep.c

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/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.39 src/sys/arch/zaurus/zaurus/machdep.c:1.40
--- src/sys/arch/zaurus/zaurus/machdep.c:1.39	Sun Oct 28 10:30:33 2018
+++ src/sys/arch/zaurus/zaurus/machdep.c	Fri Mar 29 16:27:45 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.39 2018/10/28 14:30:33 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.40 2019/03/29 20:27:45 christos Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2018/10/28 14:30:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2019/03/29 20:27:45 christos Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1109,9 +1109,13 @@ initarm(void *arg)
 	md_root_setconf(memory_disk, sizeof memory_disk);
 #endif
 
-#if NKSYMS || defined(DDB) || defined(MODULAR)
-	/* Firmware doesn't load symbols. */
+#if NKSYMS || defined(MODULAR)
+# ifdef DDB
 	ddb_init(0, NULL, NULL);
+# else
+	/* Firmware doesn't load symbols. */
+	ksyms_addsyms_elf(0, NULL, NULL);
+# endif
 #endif
 
 #ifdef KGDB

CVS commit: src/sys/arch/zaurus/conf

2019-02-07 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Thu Feb  7 21:53:50 UTC 2019

Modified Files:
src/sys/arch/zaurus/conf: GENERIC INSTALL_C700

Log Message:
Add commented-out modern USB NICs for users easily finding them out.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/conf/INSTALL_C700

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.83 src/sys/arch/zaurus/conf/GENERIC:1.84
--- src/sys/arch/zaurus/conf/GENERIC:1.83	Thu Feb  7 21:51:59 2019
+++ src/sys/arch/zaurus/conf/GENERIC	Thu Feb  7 21:53:50 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.83 2019/02/07 21:51:59 rin Exp $
+#	$NetBSD: GENERIC,v 1.84 2019/02/07 21:53:50 rin Exp $
 #
 # GENERIC machine description file
 #
@@ -308,6 +308,7 @@ cd*	at atapibus? drive ?		# ATAPI CD-ROM
 # USB Ethernet adapters
 aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
 axe*	at uhub? port ?		# ASIX AX88172 based adapters
+#axen*	at uhub? port ?		# ASIX AX88178a/AX88179 based adapters
 cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
 cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
 kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
@@ -315,6 +316,8 @@ mue*	at uhub? port ?		# Microchip LAN75x
 udav*	at uhub? port ?		# Davicom DM9601 based adapters
 #ure*	at uhub? port ?		# Realtek RTL8152/RTL8153 based adapters
 url*	at uhub? port ?		# Realtek RTL8150L based adapters
+#urndis*	at uhub? port ?	# Microsoft RNDIS specification
+#usmsc*	at uhub? port ?		# SMSC95xx based adapters
 
 # Kyocera AIR-EDGE PHONE
 #ukyopon* at uhub? port ?

Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.10 src/sys/arch/zaurus/conf/INSTALL_C700:1.11
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.10	Thu Feb  7 21:51:59 2019
+++ src/sys/arch/zaurus/conf/INSTALL_C700	Thu Feb  7 21:53:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.10 2019/02/07 21:51:59 rin Exp $
+# $NetBSD: INSTALL_C700,v 1.11 2019/02/07 21:53:50 rin Exp $
 #
 # INSTALL config file (C700 with memory disk root)
 #
@@ -39,6 +39,7 @@ no cd*
 
 no aue*
 no axe*
+#no axen*
 no cdce*
 no cue*
 no kue*
@@ -46,3 +47,5 @@ no mue*
 no udav*
 #no ure*
 no url*
+#no urndis*
+#no usmsc*

CVS commit: src/sys/arch/zaurus/conf

2019-02-07 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Thu Feb  7 21:51:59 UTC 2019

Modified Files:
src/sys/arch/zaurus/conf: GENERIC INSTALL_C700

Log Message:
Comment out ure(4) and its PHY drivers for now to unbreak build.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/conf/INSTALL_C700

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.82 src/sys/arch/zaurus/conf/GENERIC:1.83
--- src/sys/arch/zaurus/conf/GENERIC:1.82	Thu Feb  7 20:56:27 2019
+++ src/sys/arch/zaurus/conf/GENERIC	Thu Feb  7 21:51:59 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.82 2019/02/07 20:56:27 rin Exp $
+#	$NetBSD: GENERIC,v 1.83 2019/02/07 21:51:59 rin Exp $
 #
 # GENERIC machine description file
 #
@@ -313,7 +313,7 @@ cue*	at uhub? port ?		# CATC USB-EL1201A
 kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
 mue*	at uhub? port ?		# Microchip LAN75xx/LAN78xx based adapters
 udav*	at uhub? port ?		# Davicom DM9601 based adapters
-ure*	at uhub? port ?		# Realtek RTL8152/RTL8153 based adapters
+#ure*	at uhub? port ?		# Realtek RTL8152/RTL8153 based adapters
 url*	at uhub? port ?		# Realtek RTL8150L based adapters
 
 # Kyocera AIR-EDGE PHONE
@@ -341,8 +341,8 @@ nsphy*  at mii? phy ?			# NS83840 PHYs
 nsphyter* at mii? phy ?			# NS83843 PHYs
 pnaphy* at mii? phy ?			# generic HomePNA PHYs
 qsphy*  at mii? phy ?			# Quality Semiconductor QS6612 PHYs
-rgephy*  at mii? phy ?			# Realtek 8169S/8110S/8211 PHYs
-rlphy*  at mii? phy ?			# Realtek 8139/8201L PHYs
+#rgephy*  at mii? phy ?			# Realtek 8169S/8110S/8211 PHYs
+#rlphy*  at mii? phy ?			# Realtek 8139/8201L PHYs
 sqphy*  at mii? phy ?			# Seeq 80220/80221/80223 PHYs
 tlphy*  at mii? phy ?			# ThunderLAN PHYs
 tqphy*  at mii? phy ?			# TDK Semiconductor PHYs

Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.9 src/sys/arch/zaurus/conf/INSTALL_C700:1.10
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.9	Thu Feb  7 20:56:27 2019
+++ src/sys/arch/zaurus/conf/INSTALL_C700	Thu Feb  7 21:51:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.9 2019/02/07 20:56:27 rin Exp $
+# $NetBSD: INSTALL_C700,v 1.10 2019/02/07 21:51:59 rin Exp $
 #
 # INSTALL config file (C700 with memory disk root)
 #
@@ -44,5 +44,5 @@ no cue*
 no kue*
 no mue*
 no udav*
-no ure*
+#no ure*
 no url*

CVS commit: src/sys/arch/zaurus/conf

2019-02-07 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Thu Feb  7 20:56:27 UTC 2019

Modified Files:
src/sys/arch/zaurus/conf: GENERIC INSTALL INSTALL_C700

Log Message:
Oops, revert previous.
Combinations between NICs and PHYs are unpredictable...


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/zaurus/conf/INSTALL
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/conf/INSTALL_C700

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.81 src/sys/arch/zaurus/conf/GENERIC:1.82
--- src/sys/arch/zaurus/conf/GENERIC:1.81	Thu Feb  7 20:33:44 2019
+++ src/sys/arch/zaurus/conf/GENERIC	Thu Feb  7 20:56:27 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.81 2019/02/07 20:33:44 rin Exp $
+#	$NetBSD: GENERIC,v 1.82 2019/02/07 20:56:27 rin Exp $
 #
 # GENERIC machine description file
 #
@@ -308,7 +308,6 @@ cd*	at atapibus? drive ?		# ATAPI CD-ROM
 # USB Ethernet adapters
 aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
 axe*	at uhub? port ?		# ASIX AX88172 based adapters
-axen*	at uhub? port ?		# ASIX AX88178a/AX88179 based adapters
 cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
 cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
 kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
@@ -316,8 +315,6 @@ mue*	at uhub? port ?		# Microchip LAN75x
 udav*	at uhub? port ?		# Davicom DM9601 based adapters
 ure*	at uhub? port ?		# Realtek RTL8152/RTL8153 based adapters
 url*	at uhub? port ?		# Realtek RTL8150L based adapters
-urndis*	at uhub? port ?		# Microsoft RNDIS specification
-usmsc*  at uhub? port ?		# SMSC95xx based adapters
 
 # Kyocera AIR-EDGE PHONE
 #ukyopon* at uhub? port ?
@@ -327,11 +324,32 @@ usmsc*  at uhub? port ?		# SMSC95xx base
 ugen*	at uhub? port ?
 
 # MII/PHY support
+acphy*  at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
+amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
+bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
+brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
+dmphy*  at mii? phy ?			# Davicom DM9101 PHYs
+exphy*  at mii? phy ?			# 3Com internal PHYs
+glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
+gphyter* at mii? phy ?			# NS83861 Gig-E PHY
+icsphy* at mii? phy ?			# Integrated Circuit Systems ICS189x
+inphy*  at mii? phy ?			# Intel 82555 PHYs
+iophy*  at mii? phy ?			# Intel 82553 PHYs
+lxtphy* at mii? phy ?			# Level One LXT-970 PHYs
+makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
+nsphy*  at mii? phy ?			# NS83840 PHYs
+nsphyter* at mii? phy ?			# NS83843 PHYs
+pnaphy* at mii? phy ?			# generic HomePNA PHYs
+qsphy*  at mii? phy ?			# Quality Semiconductor QS6612 PHYs
 rgephy*  at mii? phy ?			# Realtek 8169S/8110S/8211 PHYs
 rlphy*  at mii? phy ?			# Realtek 8139/8201L PHYs
+sqphy*  at mii? phy ?			# Seeq 80220/80221/80223 PHYs
+tlphy*  at mii? phy ?			# ThunderLAN PHYs
+tqphy*  at mii? phy ?			# TDK Semiconductor PHYs
 ukphy*  at mii? phy ?			# generic unknown PHYs
 urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
 
+
 # integrated MMC/SD contoller
 pxamci0 at pxaip? addr 0x4110 size 0x48
 sdmmc* at pxamci?

Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.38 src/sys/arch/zaurus/conf/INSTALL:1.39
--- src/sys/arch/zaurus/conf/INSTALL:1.38	Thu Feb  7 20:33:44 2019
+++ src/sys/arch/zaurus/conf/INSTALL	Thu Feb  7 20:56:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.38 2019/02/07 20:33:44 rin Exp $
+# $NetBSD: INSTALL,v 1.39 2019/02/07 20:56:27 rin Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -78,6 +78,16 @@ no ugen*
 
 no uk* at scsibus?
 
+no acphy*
+no amhphy*
+no bmtphy*
+no glxtphy*
+no gphyter*
+no makphy*
+no tlphy*
+no tqphy*
+no urlphy*
+
 no pseudo-device	vnd
 no options 		VND_COMPRESSION
 no pseudo-device	accf_data

Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.8 src/sys/arch/zaurus/conf/INSTALL_C700:1.9
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.8	Thu Feb  7 20:33:44 2019
+++ src/sys/arch/zaurus/conf/INSTALL_C700	Thu Feb  7 20:56:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.8 2019/02/07 20:33:44 rin Exp $
+# $NetBSD: INSTALL_C700,v 1.9 2019/02/07 20:56:27 rin Exp $
 #
 # INSTALL config file (C700 with memory disk root)
 #
@@ -39,7 +39,6 @@ no cd*
 
 no aue*
 no axe*
-no axen*
 no cdce*
 no cue*
 no kue*
@@ -47,5 +46,3 @@ no mue*
 no udav*
 no ure*
 no url*
-no urndis*
-no usmsc*

CVS commit: src/sys/arch/zaurus/conf

2019-02-07 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Thu Feb  7 20:33:44 UTC 2019

Modified Files:
src/sys/arch/zaurus/conf: GENERIC INSTALL INSTALL_C700

Log Message:
Fix kernel size overflow caused by addition of ure(4) and PHY drivers.

Modern USB NICs are useful due to availability in the market, although
they cannot exhibit full performance with ohci(4). Also, some of them
support RX/TX offloading, which can be useful even with ohci(4).

Therefore, rather add modern NICs in usbdevices.config.

Instead, remove PHY drivers that cannot be used with zaurus.

Now, all kernels fits within 5 MiB = 5120 KiB:
- GENERIC   5105K ( 15K free)
- C700  5098K ( 22K free)
- INSTALL   4991K (129K free)
- INSTALL_C700  4681K (439K free)


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/zaurus/conf/INSTALL
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/conf/INSTALL_C700

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.80 src/sys/arch/zaurus/conf/GENERIC:1.81
--- src/sys/arch/zaurus/conf/GENERIC:1.80	Wed Feb  6 11:58:32 2019
+++ src/sys/arch/zaurus/conf/GENERIC	Thu Feb  7 20:33:44 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.80 2019/02/06 11:58:32 rin Exp $
+#	$NetBSD: GENERIC,v 1.81 2019/02/07 20:33:44 rin Exp $
 #
 # GENERIC machine description file
 #
@@ -308,6 +308,7 @@ cd*	at atapibus? drive ?		# ATAPI CD-ROM
 # USB Ethernet adapters
 aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
 axe*	at uhub? port ?		# ASIX AX88172 based adapters
+axen*	at uhub? port ?		# ASIX AX88178a/AX88179 based adapters
 cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
 cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
 kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
@@ -315,6 +316,8 @@ mue*	at uhub? port ?		# Microchip LAN75x
 udav*	at uhub? port ?		# Davicom DM9601 based adapters
 ure*	at uhub? port ?		# Realtek RTL8152/RTL8153 based adapters
 url*	at uhub? port ?		# Realtek RTL8150L based adapters
+urndis*	at uhub? port ?		# Microsoft RNDIS specification
+usmsc*  at uhub? port ?		# SMSC95xx based adapters
 
 # Kyocera AIR-EDGE PHONE
 #ukyopon* at uhub? port ?
@@ -324,32 +327,11 @@ url*	at uhub? port ?		# Realtek RTL8150L
 ugen*	at uhub? port ?
 
 # MII/PHY support
-acphy*  at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
-amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
-bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
-brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
-dmphy*  at mii? phy ?			# Davicom DM9101 PHYs
-exphy*  at mii? phy ?			# 3Com internal PHYs
-glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
-gphyter* at mii? phy ?			# NS83861 Gig-E PHY
-icsphy* at mii? phy ?			# Integrated Circuit Systems ICS189x
-inphy*  at mii? phy ?			# Intel 82555 PHYs
-iophy*  at mii? phy ?			# Intel 82553 PHYs
-lxtphy* at mii? phy ?			# Level One LXT-970 PHYs
-makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
-nsphy*  at mii? phy ?			# NS83840 PHYs
-nsphyter* at mii? phy ?			# NS83843 PHYs
-pnaphy* at mii? phy ?			# generic HomePNA PHYs
-qsphy*  at mii? phy ?			# Quality Semiconductor QS6612 PHYs
 rgephy*  at mii? phy ?			# Realtek 8169S/8110S/8211 PHYs
 rlphy*  at mii? phy ?			# Realtek 8139/8201L PHYs
-sqphy*  at mii? phy ?			# Seeq 80220/80221/80223 PHYs
-tlphy*  at mii? phy ?			# ThunderLAN PHYs
-tqphy*  at mii? phy ?			# TDK Semiconductor PHYs
 ukphy*  at mii? phy ?			# generic unknown PHYs
 urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
 
-
 # integrated MMC/SD contoller
 pxamci0 at pxaip? addr 0x4110 size 0x48
 sdmmc* at pxamci?

Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.37 src/sys/arch/zaurus/conf/INSTALL:1.38
--- src/sys/arch/zaurus/conf/INSTALL:1.37	Thu Jun  7 13:36:29 2018
+++ src/sys/arch/zaurus/conf/INSTALL	Thu Feb  7 20:33:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.37 2018/06/07 13:36:29 thorpej Exp $
+# $NetBSD: INSTALL,v 1.38 2019/02/07 20:33:44 rin Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -78,16 +78,6 @@ no ugen*
 
 no uk* at scsibus?
 
-no acphy*
-no amhphy*
-no bmtphy*
-no glxtphy*
-no gphyter*
-no makphy*
-no tlphy*
-no tqphy*
-no urlphy*
-
 no pseudo-device	vnd
 no options 		VND_COMPRESSION
 no pseudo-device	accf_data

Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.7 src/sys/arch/zaurus/conf/INSTALL_C700:1.8
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.7	Wed Feb  6 11:58:32 2019
+++ src/sys/arch/zaurus/conf/INSTALL_C700	Thu Feb  7 20:33:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.7 2019/02/06 11:58:32 rin Exp $
+# $NetBSD: INSTALL_C700,v 1.8 2019/02/07 20:33:44 rin Exp $
 #
 # INSTALL config file (C700 with memory disk root)
 #
@@

CVS commit: src/sys/arch/zaurus/conf

2018-08-26 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Sun Aug 26 23:30:29 UTC 2018

Modified Files:
src/sys/arch/zaurus/conf: INSTALL_C700

Log Message:
Disable mue(4) for INSTALL_C70 like other USB NICs.
Should fix build.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/conf/INSTALL_C700

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/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.4 src/sys/arch/zaurus/conf/INSTALL_C700:1.5
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.4	Thu Jun  7 13:36:29 2018
+++ src/sys/arch/zaurus/conf/INSTALL_C700	Sun Aug 26 23:30:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.4 2018/06/07 13:36:29 thorpej Exp $
+# $NetBSD: INSTALL_C700,v 1.5 2018/08/26 23:30:29 rin Exp $
 #
 # INSTALL config file (C700 with memory disk root)
 #
@@ -43,5 +43,6 @@ no axe*
 no cdce*
 no cue*
 no kue*
+no mue*
 no udav*
 no url*

CVS commit: src/sys/arch/zaurus/conf

2018-05-14 Thread Jason R Thorpe 
Module Name:src
Committed By:   thorpej
Date:   Tue May 15 00:44:56 UTC 2018

Modified Files:
src/sys/arch/zaurus/conf: GENERIC INSTALL INSTALL_C700

Log Message:
Fully specifiy the location of indirectly-configured I2C devices. In
particular, the parent spec must not be wild-carded, as doing so doesn't
work well on systems where more than one I2C bus is present.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/zaurus/conf/INSTALL
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/conf/INSTALL_C700

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.75 src/sys/arch/zaurus/conf/GENERIC:1.76
--- src/sys/arch/zaurus/conf/GENERIC:1.75	Thu Sep 14 07:58:44 2017
+++ src/sys/arch/zaurus/conf/GENERIC	Tue May 15 00:44:56 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.75 2017/09/14 07:58:44 mrg Exp $
+#	$NetBSD: GENERIC,v 1.76 2018/05/15 00:44:56 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -192,7 +192,7 @@ scoop0 at pxaip?
 scoop1 at pxaip?
 
 # alternate GPIO contoller for SL-C1000
-ioexp0 at iic? addr 0x18
+ioexp0 at iic0 addr 0x18
 
 # ADC, touchpad, backlight
 zssp0 at pxaip?
@@ -218,7 +218,7 @@ wsdisplay* at w100lcd? console ?
 lcdctl0 at zssp0
 
 # WM8750 Audio
-zaudio0 at iic? addr 0x1b
+zaudio0 at iic0 addr 0x1b
 audio* at zaudio?
 #options 	ZAUDIO_VOLUME_STRIDE=8
 

Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.35 src/sys/arch/zaurus/conf/INSTALL:1.36
--- src/sys/arch/zaurus/conf/INSTALL:1.35	Sun Jan 28 01:09:58 2018
+++ src/sys/arch/zaurus/conf/INSTALL	Tue May 15 00:44:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.35 2018/01/28 01:09:58 rin Exp $
+# $NetBSD: INSTALL,v 1.36 2018/05/15 00:44:56 thorpej Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -68,7 +68,7 @@ no zrc0 at pxaip?
 no ztp0 at zssp?
 no wsmouse* at ztp?
 
-no zaudio0 at iic?
+no zaudio0 at iic0
 no audio* at zaudio?
 no spkr* at audio?
 

Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.2 src/sys/arch/zaurus/conf/INSTALL_C700:1.3
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.2	Fri Aug 12 09:26:35 2016
+++ src/sys/arch/zaurus/conf/INSTALL_C700	Tue May 15 00:44:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.2 2016/08/12 09:26:35 nonaka Exp $
+# $NetBSD: INSTALL_C700,v 1.3 2018/05/15 00:44:56 thorpej Exp $
 #
 # INSTALL config file (C700 with memory disk root)
 #
@@ -15,7 +15,7 @@ no makeoptions	LOADADDRESS
 makeoptions	LOADADDRESS="0xc040"
 
 no scoop1 at pxaip?
-no ioexp0 at iic?
+no ioexp0 at iic0
 
 no lcd0 at pxaip?
 no wsdisplay* at lcd?

CVS commit: src/sys/arch/zaurus/conf

2018-03-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Mar  9 17:15:14 UTC 2018

Modified Files:
src/sys/arch/zaurus/conf: files.zaurus

Log Message:
revert previous; this was no typo.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/zaurus/conf/files.zaurus

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/zaurus/conf/files.zaurus
diff -u src/sys/arch/zaurus/conf/files.zaurus:1.14 src/sys/arch/zaurus/conf/files.zaurus:1.15
--- src/sys/arch/zaurus/conf/files.zaurus:1.14	Tue Mar  6 17:21:01 2018
+++ src/sys/arch/zaurus/conf/files.zaurus	Fri Mar  9 12:15:14 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.zaurus,v 1.14 2018/03/06 22:21:01 christos Exp $
+#	$NetBSD: files.zaurus,v 1.15 2018/03/09 17:15:14 christos Exp $
 #
 # Sharp Zaurus specific configuration info
 #
@@ -92,7 +92,7 @@ attach ztp at zssp
 file arch/zaurus/dev/ztp.c		ztp
 
 # WM8750 audio
-device zaudio: audiobus, auconv, mulaw, aurateconv, pxaiic
+device zaudio: audiobus, auconv, mulaw, aurateconv, pxaiis
 attach zaudio at iic
 file arch/zaurus/dev/zaudio.c		zaudio
 file arch/zaurus/dev/wm8731_zaudio.c	zaudio & cpu_xscale_pxa250

CVS commit: src/sys/arch/zaurus/conf

2018-03-06 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Mar  6 22:21:01 UTC 2018

Modified Files:
src/sys/arch/zaurus/conf: files.zaurus

Log Message:
fix typo (thanks gcc-6). There is no "pxaiis"


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/conf/files.zaurus

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/zaurus/conf/files.zaurus
diff -u src/sys/arch/zaurus/conf/files.zaurus:1.13 src/sys/arch/zaurus/conf/files.zaurus:1.14
--- src/sys/arch/zaurus/conf/files.zaurus:1.13	Tue Aug 11 09:12:25 2015
+++ src/sys/arch/zaurus/conf/files.zaurus	Tue Mar  6 17:21:01 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.zaurus,v 1.13 2015/08/11 13:12:25 nonaka Exp $
+#	$NetBSD: files.zaurus,v 1.14 2018/03/06 22:21:01 christos Exp $
 #
 # Sharp Zaurus specific configuration info
 #
@@ -92,7 +92,7 @@ attach ztp at zssp
 file arch/zaurus/dev/ztp.c		ztp
 
 # WM8750 audio
-device zaudio: audiobus, auconv, mulaw, aurateconv, pxaiis
+device zaudio: audiobus, auconv, mulaw, aurateconv, pxaiic
 attach zaudio at iic
 file arch/zaurus/dev/zaudio.c		zaudio
 file arch/zaurus/dev/wm8731_zaudio.c	zaudio & cpu_xscale_pxa250

CVS commit: src/sys/arch/zaurus/conf

2017-12-20 Thread Rin Okuyama 
Module Name:src
Committed By:   rin
Date:   Wed Dec 20 08:10:13 UTC 2017

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
Disable compat stuffs that are accidentally accidentally added to rev 1.33.
Now INSTALL kernel fits within 5MB again.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.33 src/sys/arch/zaurus/conf/INSTALL:1.34
--- src/sys/arch/zaurus/conf/INSTALL:1.33	Thu Sep 14 07:58:44 2017
+++ src/sys/arch/zaurus/conf/INSTALL	Wed Dec 20 08:10:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.33 2017/09/14 07:58:44 mrg Exp $
+# $NetBSD: INSTALL,v 1.34 2017/12/20 08:10:13 rin Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -35,8 +35,10 @@ no file-system		TMPFS
 
 no options 		WAPBL
 
-include 		"conf/compat_netbsd14.config"
 no options 		COMPAT_NETBSD32
+no options 		COMPAT_13
+no options 		COMPAT_43
+no options 		COMPAT_44
 
 no options 		COMPAT_OSSAUDIO

CVS commit: src/sys/arch/zaurus/conf

2017-04-02 Thread Sevan Janiyan 
Module Name:src
Committed By:   sevan
Date:   Mon Apr  3 00:11:45 UTC 2017

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Drop NOPORTALGO option which was introduce in r1.69.No other reference exists 
in src or
history in CVS. The introductory commit was related to sound so assuming it
crept in by mistake.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.72 src/sys/arch/zaurus/conf/GENERIC:1.73
--- src/sys/arch/zaurus/conf/GENERIC:1.72	Sun Feb 26 12:03:15 2017
+++ src/sys/arch/zaurus/conf/GENERIC	Mon Apr  3 00:11:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.72 2017/02/26 12:03:15 rin Exp $
+#	$NetBSD: GENERIC,v 1.73 2017/04/03 00:11:45 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -137,7 +137,6 @@ options 	SYSVSHM		# System V-like memory
 #options 	USERCONF	# userconf(4) support
 #options 	PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 #options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
-options		NOPORTALGO
 
 #
 # wscons options

CVS commit: src/sys/arch/zaurus/conf

2017-01-29 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Mon Jan 30 02:41:12 UTC 2017

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
reduce install kernel size.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.30 src/sys/arch/zaurus/conf/INSTALL:1.31
--- src/sys/arch/zaurus/conf/INSTALL:1.30	Tue Dec 13 20:42:21 2016
+++ src/sys/arch/zaurus/conf/INSTALL	Mon Jan 30 02:41:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.30 2016/12/13 20:42:21 christos Exp $
+# $NetBSD: INSTALL,v 1.31 2017/01/30 02:41:12 nonaka Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -69,6 +69,8 @@ no options 		DDB
 no options 		DDB_HISTORY_SIZE
 no makeoptions	COPY_SYMTAB
 
+no options 		PXA2X0_DMAC_DMOVER_CONCURRENCY
+
 no zrc0 at pxaip?
 
 no ztp0 at zssp?

CVS commit: src/sys/arch/zaurus/conf

2016-08-12 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Fri Aug 12 09:26:35 UTC 2016

Modified Files:
src/sys/arch/zaurus/conf: INSTALL INSTALL_C700

Log Message:
remove some phy(4) from zaurus INSTALL kernel.

avoid kernel size limit...


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/zaurus/conf/INSTALL
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/conf/INSTALL_C700

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.27 src/sys/arch/zaurus/conf/INSTALL:1.28
--- src/sys/arch/zaurus/conf/INSTALL:1.27	Tue Feb 16 05:14:31 2016
+++ src/sys/arch/zaurus/conf/INSTALL	Fri Aug 12 09:26:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.27 2016/02/16 05:14:31 nonaka Exp $
+# $NetBSD: INSTALL,v 1.28 2016/08/12 09:26:35 nonaka Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -83,6 +83,16 @@ no ugen*
 
 no uk* at scsibus?
 
+no acphy*
+no amhphy*
+no bmtphy*
+no glxtphy*
+no gphyter*
+no makphy*
+no tlphy*
+no tqphy*
+no urlphy*
+
 no pseudo-device	vnd
 no options 		VND_COMPRESSION
 no pseudo-device	accf_data

Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.1 src/sys/arch/zaurus/conf/INSTALL_C700:1.2
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.1	Thu Feb  2 15:57:39 2012
+++ src/sys/arch/zaurus/conf/INSTALL_C700	Fri Aug 12 09:26:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.1 2012/02/02 15:57:39 tsutsui Exp $
+# $NetBSD: INSTALL_C700,v 1.2 2016/08/12 09:26:35 nonaka Exp $
 #
 # INSTALL config file (C700 with memory disk root)
 #
@@ -45,13 +45,3 @@ no cue*
 no kue*
 no udav*
 no url*
-
-no acphy*
-no amhphy*
-no bmtphy*
-no glxtphy*
-no gphyter*
-no makphy*
-no tlphy*
-no tqphy*
-no urlphy*

CVS commit: src/sys/arch/zaurus/stand/zboot

2016-06-11 Thread David A. Holland 
Module Name:src
Committed By:   dholland
Date:   Sat Jun 11 06:58:42 UTC 2016

Modified Files:
src/sys/arch/zaurus/stand/zboot: boot.c bootmenu.c

Log Message:
PR 51200 gets in libsa considered harmful: use kgets


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/stand/zboot/boot.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/stand/zboot/bootmenu.c

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/zaurus/stand/zboot/boot.c
diff -u src/sys/arch/zaurus/stand/zboot/boot.c:1.7 src/sys/arch/zaurus/stand/zboot/boot.c:1.8
--- src/sys/arch/zaurus/stand/zboot/boot.c:1.7	Tue May 31 04:13:26 2016
+++ src/sys/arch/zaurus/stand/zboot/boot.c	Sat Jun 11 06:58:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.7 2016/05/31 04:13:26 dholland Exp $	*/
+/*	$NetBSD: boot.c,v 1.8 2016/06/11 06:58:42 dholland Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro 
@@ -416,7 +416,7 @@ bootmenu(void)
 
 		input[0] = '\0';
 		printf("> ");
-		gets(input);
+		kgets(input, sizeof(input));
 
 		/*
 		 * Skip leading whitespace.

Index: src/sys/arch/zaurus/stand/zboot/bootmenu.c
diff -u src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.4 src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.5
--- src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.4	Sun Aug 10 07:40:50 2014
+++ src/sys/arch/zaurus/stand/zboot/bootmenu.c	Sat Jun 11 06:58:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootmenu.c,v 1.4 2014/08/10 07:40:50 isaki Exp $	*/
+/*	$NetBSD: bootmenu.c,v 1.5 2016/06/11 06:58:42 dholland Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@ doboottypemenu(void)
 printf("\nOption: [%d]:",
 bootcfg_info.def + 1);
 
-			gets(input);
+			kgets(input, sizeof(input));
 			choice = getchoicefrominput(input, bootcfg_info.def);
 		} else if (bootcfg_info.timeout == 0)
 			choice = bootcfg_info.def;

CVS commit: src/sys/arch/zaurus/zaurus

2016-05-30 Thread David A. Holland 
Module Name:src
Committed By:   dholland
Date:   Tue May 31 04:14:12 UTC 2016

Modified Files:
src/sys/arch/zaurus/zaurus: machdep.c

Log Message:
PR 51196 David Binderman: simplify redundant conditional.
(yet another copy)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/zaurus/zaurus/machdep.c

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/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.35 src/sys/arch/zaurus/zaurus/machdep.c:1.36
--- src/sys/arch/zaurus/zaurus/machdep.c:1.35	Sun Aug 18 21:42:16 2013
+++ src/sys/arch/zaurus/zaurus/machdep.c	Tue May 31 04:14:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.35 2013/08/18 21:42:16 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.36 2016/05/31 04:14:12 dholland Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35 2013/08/18 21:42:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.36 2016/05/31 04:14:12 dholland Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1205,7 +1205,7 @@ gettrailer(char *arg)
 		*options++ = '\0';
 
 	/* trim leading blanks */
-	while (*options && *options == ' ')
+	while (*options == ' ')
 		options++;
 
 	return options;

CVS commit: src/sys/arch/zaurus/stand/zboot

2016-05-30 Thread David A. Holland 
Module Name:src
Committed By:   dholland
Date:   Tue May 31 04:13:26 UTC 2016

Modified Files:
src/sys/arch/zaurus/stand/zboot: boot.c

Log Message:
PR 51195 David Binderman: simplify redundant conditional.

XXX: there are too many copies of this function floating around ("gettrailer")


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/stand/zboot/boot.c

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/zaurus/stand/zboot/boot.c
diff -u src/sys/arch/zaurus/stand/zboot/boot.c:1.6 src/sys/arch/zaurus/stand/zboot/boot.c:1.7
--- src/sys/arch/zaurus/stand/zboot/boot.c:1.6	Sat Jun 28 09:16:18 2014
+++ src/sys/arch/zaurus/stand/zboot/boot.c	Tue May 31 04:13:26 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.6 2014/06/28 09:16:18 rtr Exp $	*/
+/*	$NetBSD: boot.c,v 1.7 2016/05/31 04:13:26 dholland Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro 
@@ -445,7 +445,7 @@ gettrailer(char *arg)
 		*options++ = '\0';
 
 	/* trim leading blanks */
-	while (*options && *options == ' ')
+	while (*options == ' ')
 		options++;
 
 	return options;

CVS commit: src/sys/arch/zaurus/conf

2016-02-15 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Tue Feb 16 05:14:31 UTC 2016

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
Reduced INSTALL kernel size.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.26 src/sys/arch/zaurus/conf/INSTALL:1.27
--- src/sys/arch/zaurus/conf/INSTALL:1.26	Sun Jul 19 09:26:50 2015
+++ src/sys/arch/zaurus/conf/INSTALL	Tue Feb 16 05:14:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.26 2015/07/19 09:26:50 martin Exp $
+# $NetBSD: INSTALL,v 1.27 2016/02/16 05:14:31 nonaka Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -28,12 +28,14 @@ no options 		INSECURE
 
 no file-system		KERNFS
 no file-system		NULLFS
+no file-system		PUFFS
 no file-system		PROCFS
 no file-system		PTYFS
 no file-system		TMPFS
 
 no options 		WAPBL
 
+no options		COMPAT_NETBSD32
 no options		COMPAT_13
 no options		COMPAT_14
 no options		COMPAT_15
@@ -88,3 +90,6 @@ no pseudo-device	accf_http
 no pseudo-device	ksyms
 no pseudo-device	wsfont
 options 	NO_DEV_PTM
+no pseudo-device	clockctl
+no pseudo-device	drvctl
+no pseudo-device	putter

CVS commit: src/sys/arch/zaurus/stand

2016-01-31 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Jan 31 15:32:13 UTC 2016

Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile
src/sys/arch/zaurus/stand/zbsdmod: Makefile

Log Message:
include bsd.init.mk to get Makefile.inc


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/zaurus/stand/zboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/stand/zbsdmod/Makefile

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/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.17 src/sys/arch/zaurus/stand/zboot/Makefile:1.18
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.17	Tue Aug 26 23:17:21 2014
+++ src/sys/arch/zaurus/stand/zboot/Makefile	Sun Jan 31 10:32:12 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2014/08/27 03:17:21 matt Exp $
+#	$NetBSD: Makefile,v 1.18 2016/01/31 15:32:12 christos Exp $
 
 PROG=		zboot
 
@@ -12,7 +12,7 @@ SRCS+=		pathfs.c
 
 NOMAN=		# defined
 
-.include 
+.include 
 
 CFLAGS+=	-Wall -Wno-main
 CFLAGS+=	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith

Index: src/sys/arch/zaurus/stand/zbsdmod/Makefile
diff -u src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.9 src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.10
--- src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.9	Tue Oct 14 04:33:38 2014
+++ src/sys/arch/zaurus/stand/zbsdmod/Makefile	Sun Jan 31 10:32:13 2016
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.9 2014/10/14 08:33:38 nonaka Exp $
+#	$NetBSD: Makefile,v 1.10 2016/01/31 15:32:13 christos Exp $
 
 WARNS?=	4
 
+.include 
+
 S=	${.CURDIR}/../../../..
 
 OBJS=	zbsdmod.o

CVS commit: src/sys/arch/zaurus/stand

2016-01-23 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Jan 23 22:28:09 UTC 2016

Modified Files:
src/sys/arch/zaurus/stand: Makefile.inc

Log Message:
revert previous, we'll do differently


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/stand/Makefile.inc

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/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.4 src/sys/arch/zaurus/stand/Makefile.inc:1.5
--- src/sys/arch/zaurus/stand/Makefile.inc:1.4	Sat Jan 23 17:20:45 2016
+++ src/sys/arch/zaurus/stand/Makefile.inc	Sat Jan 23 17:28:09 2016
@@ -1,5 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2016/01/23 22:20:45 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2016/01/23 22:28:09 christos Exp $
 
 BINDIR=		/usr/mdec
 KLINK_MACHINE=	zaurus
-CPPFLAGS+=	-D_KERNTYPES

CVS commit: src/sys/arch/zaurus/stand

2016-01-23 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Jan 23 22:20:45 UTC 2016

Modified Files:
src/sys/arch/zaurus/stand: Makefile.inc

Log Message:
Add -D_KERNTYPES


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/stand/Makefile.inc

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/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.3 src/sys/arch/zaurus/stand/Makefile.inc:1.4
--- src/sys/arch/zaurus/stand/Makefile.inc:1.3	Thu May  2 00:22:45 2013
+++ src/sys/arch/zaurus/stand/Makefile.inc	Sat Jan 23 17:20:45 2016
@@ -1,4 +1,5 @@
-#	$NetBSD: Makefile.inc,v 1.3 2013/05/02 04:22:45 matt Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2016/01/23 22:20:45 christos Exp $
 
 BINDIR=		/usr/mdec
 KLINK_MACHINE=	zaurus
+CPPFLAGS+=	-D_KERNTYPES

CVS commit: src/sys/arch/zaurus/conf

2015-08-20 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Fri Aug 21 03:36:32 UTC 2015

Modified Files:
src/sys/arch/zaurus/conf: ldscript.zaurus

Log Message:
Simplify this by deciding load address at one place.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/conf/ldscript.zaurus

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/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.7 src/sys/arch/zaurus/conf/ldscript.zaurus:1.8
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.7	Thu Aug 20 07:00:49 2015
+++ src/sys/arch/zaurus/conf/ldscript.zaurus	Fri Aug 21 03:36:32 2015
@@ -1,28 +1,24 @@
-/*	$NetBSD: ldscript.zaurus,v 1.7 2015/08/20 07:00:49 uebayasi Exp $	*/
+/*	$NetBSD: ldscript.zaurus,v 1.8 2015/08/21 03:36:32 uebayasi Exp $	*/
 
 OUTPUT_ARCH(arm)
 ENTRY(KERNEL_BASE_phys)
 SECTIONS
 {
-  KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
-  KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
   /* Kernel start: */
-  .start (KERNEL_BASE_phys) :
+  .start :
   {
 *(.start)
-  } =0
+  }
 
   /* Read-only sections, merged into text segment: */
-  .text (KERNEL_BASE_virt + SIZEOF(.start)) :
-  AT (LOADADDR(.start) + SIZEOF(.start))
+  .text :
   {
 *(.text)
 *(.text.*)
 *(.stub)
 *(.glue_7t) *(.glue_7)
 *(.rodata) *(.rodata.*)
-  } =0
+  }
   .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
   PROVIDE (__exidx_start = .);
   .ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
@@ -34,14 +30,12 @@ SECTIONS
  boundary.  */
   . = ALIGN(0x8000);
   .data:
-  AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
   {
 __data_start = . ;
 *(.data)
 *(.data.*)
   }
   .sdata :
-  AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
   {
 *(.sdata)
 *(.sdata.*)
@@ -87,3 +81,19 @@ SECTIONS
 *(.rela.eh_frame)
   }
 }
+SECTIONS
+{
+  KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+  KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
+  .start (KERNEL_BASE_phys) :
+  {
+*(.start)
+  } =0
+
+  .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+  AT (LOADADDR(.start) + SIZEOF(.start))
+  {
+*(.text)
+  } =0
+}

CVS commit: src/sys/arch/zaurus/conf

2015-08-18 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Wed Aug 19 04:33:00 UTC 2015

Modified Files:
src/sys/arch/zaurus/conf: Makefile.zaurus.inc

Log Message:
Use ${KERNLDSCRIPT} so it is added to ${SYSTEM_DEP}.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/conf/Makefile.zaurus.inc

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/zaurus/conf/Makefile.zaurus.inc
diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.6 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.7
--- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.6	Sat Nov 15 13:34:30 2014
+++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc	Wed Aug 19 04:33:00 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.zaurus.inc,v 1.6 2014/11/15 13:34:30 uebayasi Exp $
+#	$NetBSD: Makefile.zaurus.inc,v 1.7 2015/08/19 04:33:00 uebayasi Exp $
 
 MACHINE_ARCH?=		arm
 CPPFLAGS+=		-D${MACHINE}
@@ -19,12 +19,11 @@ SYSTEM_LD_TAIL_EXTRA+=; \
 
 KERNEL_BASE_VIRT=	$(LOADADDRESS)
 
-LINKSCRIPT=		-T ldscript
+KERNLDSCRIPT=		ldscript
+LINKSCRIPT=		-T ${KERNLDSCRIPT}
 
 EXTRA_CLEAN+=		netbsd.map assym.d ldscript tmp
 
-netbsd:	ldscript	# XXX
-
 # generate ldscript from common template
 ldscript: ${THISARM}/conf/ldscript.zaurus ${THISARM}/conf/Makefile.zaurus.inc Makefile
 	${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \

CVS commit: src/sys/arch/zaurus/conf

2015-08-11 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Tue Aug 11 13:12:25 UTC 2015

Modified Files:
src/sys/arch/zaurus/conf: files.zaurus

Log Message:
armfpe is gone.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/zaurus/conf/files.zaurus

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/zaurus/conf/files.zaurus
diff -u src/sys/arch/zaurus/conf/files.zaurus:1.12 src/sys/arch/zaurus/conf/files.zaurus:1.13
--- src/sys/arch/zaurus/conf/files.zaurus:1.12	Tue Sep 23 14:49:46 2014
+++ src/sys/arch/zaurus/conf/files.zaurus	Tue Aug 11 13:12:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: files.zaurus,v 1.12 2014/09/23 14:49:46 nonaka Exp $
+#	$NetBSD: files.zaurus,v 1.13 2015/08/11 13:12:25 nonaka Exp $
 #
 # Sharp Zaurus specific configuration info
 #
@@ -39,11 +39,6 @@ file	dev/kloader.ckloader
 file	arch/zaurus/zaurus/kloader_machdep.c	kloader
 file	arch/zaurus/zaurus/kloader_zaurus.S	kloader
 
-# ARM FPE
-file	arch/arm32/fpe-arm/armfpe_glue.S	armfpe
-file	arch/arm32/fpe-arm/armfpe_init.c	armfpe
-file	arch/arm32/fpe-arm/armfpe.s		armfpe
-
 # Include Intel XScale PXA2x0 config definitions.
 include arch/arm/xscale/files.pxa2x0

CVS commit: src/sys/arch/zaurus/conf

2015-07-19 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sun Jul 19 09:26:50 UTC 2015

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
Backout previous, it does not work.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.25 src/sys/arch/zaurus/conf/INSTALL:1.26
--- src/sys/arch/zaurus/conf/INSTALL:1.25	Fri Jul 17 19:32:24 2015
+++ src/sys/arch/zaurus/conf/INSTALL	Sun Jul 19 09:26:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.25 2015/07/17 19:32:24 martin Exp $
+# $NetBSD: INSTALL,v 1.26 2015/07/19 09:26:50 martin Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -9,7 +9,7 @@ include 	arch/zaurus/conf/GENERIC
 options 	MEMORY_DISK_HOOKS	# enable root ramdisk
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_ROOT_SIZE=4710	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=4516	# size of memory disk, in blocks
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 
 # for reduce kernel size.

CVS commit: src/sys/arch/zaurus/conf

2015-07-17 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Jul 17 19:32:24 UTC 2015

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
Provide a bit more space for the ram disk image


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.24 src/sys/arch/zaurus/conf/INSTALL:1.25
--- src/sys/arch/zaurus/conf/INSTALL:1.24	Sun Aug 17 21:17:44 2014
+++ src/sys/arch/zaurus/conf/INSTALL	Fri Jul 17 19:32:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.24 2014/08/17 21:17:44 joerg Exp $
+# $NetBSD: INSTALL,v 1.25 2015/07/17 19:32:24 martin Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -9,7 +9,7 @@ include 	arch/zaurus/conf/GENERIC
 options 	MEMORY_DISK_HOOKS	# enable root ramdisk
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_ROOT_SIZE=4516	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=4710	# size of memory disk, in blocks
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 
 # for reduce kernel size.

CVS commit: src/sys/arch/zaurus/conf

2015-02-05 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu Feb  5 14:32:31 UTC 2015

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Added drvctl, putter and PUFFS.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.65 src/sys/arch/zaurus/conf/GENERIC:1.66
--- src/sys/arch/zaurus/conf/GENERIC:1.65	Sun Nov 16 16:01:43 2014
+++ src/sys/arch/zaurus/conf/GENERIC	Thu Feb  5 14:32:31 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.65 2014/11/16 16:01:43 manu Exp $
+#	$NetBSD: GENERIC,v 1.66 2015/02/05 14:32:31 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -60,6 +60,7 @@ file-system	MSDOSFS		# MS-DOS file syste
 file-system	KERNFS		# /kern
 file-system	NULLFS		# loopback file system
 #file-system	OVERLAY		# overlay file system
+file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g  sshfs)
 file-system	PROCFS		# /proc
 #file-system	UMAPFS		# NULLFS + uid and gid remapping
 #file-system	UNION		# union file system
@@ -392,7 +393,9 @@ pseudo-device	accf_http		# httpready a
 pseudo-device	pty			# pseudo-terminals
 #pseudo-device	sequencer		# MIDI sequencer
 pseudo-device	clockctl		# user control of clock subsystem
+pseudo-device	drvctl			# user control of drive subsystem
 pseudo-device	ksyms			# /dev/ksyms
+pseudo-device	putter			# for puffs and pud
 
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache - venus comm.

CVS commit: src/sys/arch/zaurus/include

2015-01-07 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jan  8 01:52:42 UTC 2015

Modified Files:
src/sys/arch/zaurus/include: bootconfig.h

Log Message:
merge common information (fix build)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/include/bootconfig.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/zaurus/include/bootconfig.h
diff -u src/sys/arch/zaurus/include/bootconfig.h:1.1 src/sys/arch/zaurus/include/bootconfig.h:1.2
--- src/sys/arch/zaurus/include/bootconfig.h:1.1	Sat Dec 16 00:43:15 2006
+++ src/sys/arch/zaurus/include/bootconfig.h	Wed Jan  7 20:52:42 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootconfig.h,v 1.1 2006/12/16 05:43:15 ober Exp $	*/
+/*	$NetBSD: bootconfig.h,v 1.2 2015/01/08 01:52:42 christos Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -41,6 +41,10 @@
  *
  * Based on kate/boot/bootconfig.h
  */
+#ifndef _ZAURUS_BOOTCONFIG_H_
+#define _ZAURUS_BOOTCONFIG_H_
+
+#include arm/bootconfig.h
 
 typedef struct _PhysMem {
 	u_int address;
@@ -59,17 +63,8 @@ typedef struct _BootConfig {
 extern BootConfig bootconfig;
 #define	MAX_BOOT_STRING			255
 
-#define BOOTOPT_TYPE_BOOLEAN		0
-#define BOOTOPT_TYPE_STRING		1
-#define BOOTOPT_TYPE_INT		2
-#define BOOTOPT_TYPE_BININT		3
-#define BOOTOPT_TYPE_HEXINT		4
-#define BOOTOPT_TYPE_MASK		7
-
-int get_bootconf_option(char *, const char *, int, void *);
-
-extern char *boot_args;
 extern char *boot_file;
 #endif	/* _KERNEL */
 
-/* End of bootconfig.h */
+#endif /* _ZAURUS_BOOTCONFIG_H_ */
+

CVS commit: src/sys/arch/zaurus/conf

2014-11-15 Thread Masao Uebayashi 
Module Name:src
Committed By:   uebayasi
Date:   Sat Nov 15 13:34:30 UTC 2014

Modified Files:
src/sys/arch/zaurus/conf: Makefile.zaurus.inc

Log Message:
Use LINKSCRIPT.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/conf/Makefile.zaurus.inc

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/zaurus/conf/Makefile.zaurus.inc
diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.5 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.6
--- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.5	Sun Mar  2 16:18:41 2014
+++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc	Sat Nov 15 13:34:30 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.zaurus.inc,v 1.5 2014/03/02 16:18:41 joerg Exp $
+#	$NetBSD: Makefile.zaurus.inc,v 1.6 2014/11/15 13:34:30 uebayasi Exp $
 
 MACHINE_ARCH?=		arm
 CPPFLAGS+=		-D${MACHINE}
@@ -19,7 +19,7 @@ SYSTEM_LD_TAIL_EXTRA+=; \
 
 KERNEL_BASE_VIRT=	$(LOADADDRESS)
 
-LINKFLAGS=		-T ldscript
+LINKSCRIPT=		-T ldscript
 
 EXTRA_CLEAN+=		netbsd.map assym.d ldscript tmp

CVS commit: src/sys/arch/zaurus/stand/zbsdmod

2014-10-14 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Tue Oct 14 08:33:38 UTC 2014

Modified Files:
src/sys/arch/zaurus/stand/zbsdmod: Makefile

Log Message:
Avoid unhandled relocation of type 3 for error when load module.
insmod zbsdmod.o is successful now.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/stand/zbsdmod/Makefile

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/zaurus/stand/zbsdmod/Makefile
diff -u src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.8 src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.9
--- src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.8	Sun Dec 15 18:08:37 2013
+++ src/sys/arch/zaurus/stand/zbsdmod/Makefile	Tue Oct 14 08:33:38 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2013/12/15 18:08:37 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2014/10/14 08:33:38 nonaka Exp $
 
 WARNS?=	4
 
@@ -9,6 +9,7 @@ SRCS=	zbsdmod.c
 NOMAN=	# defined
 
 realall: ${OBJS}
+	${OBJCOPY} -R .eh_frame ${.OBJDIR}/zbsdmod.o
 
 .include bsd.klinks.mk
 .include bsd.prog.mk

CVS commit: src/sys/arch/zaurus

2014-09-23 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Tue Sep 23 14:49:46 UTC 2014

Modified Files:
src/sys/arch/zaurus/conf: files.zaurus
src/sys/arch/zaurus/dev: scoop.c scoopreg.h scoopvar.h zaudio.c
Added Files:
src/sys/arch/zaurus/dev: wm8731_zaudio.c wm8731reg.h wm8731var.h
wm8750_zaudio.c wm8750var.h zaudiovar.h

Log Message:
Apply WM8731 support patch from TOYOKURA Atsushi, arranged by me.

- SL-C700: work fine
- SL-C750: attach failed
- SL-C860: not tested


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/zaurus/conf/files.zaurus
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/zaurus/dev/scoop.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/dev/scoopreg.h \
src/sys/arch/zaurus/dev/scoopvar.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/dev/wm8731_zaudio.c \
src/sys/arch/zaurus/dev/wm8731reg.h src/sys/arch/zaurus/dev/wm8731var.h \
src/sys/arch/zaurus/dev/wm8750_zaudio.c \
src/sys/arch/zaurus/dev/wm8750var.h src/sys/arch/zaurus/dev/zaudiovar.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/zaurus/dev/zaudio.c

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/zaurus/conf/files.zaurus
diff -u src/sys/arch/zaurus/conf/files.zaurus:1.11 src/sys/arch/zaurus/conf/files.zaurus:1.12
--- src/sys/arch/zaurus/conf/files.zaurus:1.11	Sun Jan 29 10:12:41 2012
+++ src/sys/arch/zaurus/conf/files.zaurus	Tue Sep 23 14:49:46 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.zaurus,v 1.11 2012/01/29 10:12:41 tsutsui Exp $
+#	$NetBSD: files.zaurus,v 1.12 2014/09/23 14:49:46 nonaka Exp $
 #
 # Sharp Zaurus specific configuration info
 #
@@ -100,6 +100,8 @@ file arch/zaurus/dev/ztp.c		ztp
 device zaudio: audiobus, auconv, mulaw, aurateconv, pxaiis
 attach zaudio at iic
 file arch/zaurus/dev/zaudio.c		zaudio
+file arch/zaurus/dev/wm8731_zaudio.c	zaudio  cpu_xscale_pxa250
+file arch/zaurus/dev/wm8750_zaudio.c	zaudio  cpu_xscale_pxa270
 defparam opt_zaudio.h			ZAUDIO_VOLUME_STRIDE
 
 # Zaurus remote control

Index: src/sys/arch/zaurus/dev/scoop.c
diff -u src/sys/arch/zaurus/dev/scoop.c:1.12 src/sys/arch/zaurus/dev/scoop.c:1.13
--- src/sys/arch/zaurus/dev/scoop.c:1.12	Sat Oct 27 17:18:14 2012
+++ src/sys/arch/zaurus/dev/scoop.c	Tue Sep 23 14:49:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: scoop.c,v 1.12 2012/10/27 17:18:14 chs Exp $	*/
+/*	$NetBSD: scoop.c,v 1.13 2014/09/23 14:49:46 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_scoop.c,v 1.12 2005/11/17 05:26:31 uwe Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scoop.c,v 1.12 2012/10/27 17:18:14 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: scoop.c,v 1.13 2014/09/23 14:49:46 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -245,16 +245,45 @@ scoop_set_headphone(int on)
 }
 
 /*
+ * Enable or disable the speaker output connection.
+ */
+void
+scoop_set_speaker(int onoff)
+{
+	struct scoop_softc *sc;
+
+	if (!ZAURUS_ISC860)
+		return;
+
+	sc = device_lookup_private(scoop_cd, 0);
+	if (sc == NULL)
+		return;
+
+	scoop_gpio_pin_ctl(sc, SCOOP0_AMP_ON, GPIO_PIN_OUTPUT);
+	if (onoff) {
+		scoop_gpio_pin_write(sc, SCOOP0_AMP_ON, GPIO_PIN_HIGH);
+	} else {
+		scoop_gpio_pin_write(sc, SCOOP0_AMP_ON, GPIO_PIN_LOW);
+	}
+}
+
+/*
  * Enable or disable the mic bias
  */
 void
 scoop_set_mic_bias(int onoff)
 {
+	struct scoop_softc *sc0;
 	struct scoop_softc *sc1;
 
+	sc0 = device_lookup_private(scoop_cd, 0);
 	sc1 = device_lookup_private(scoop_cd, 1);
-	if (sc1 != NULL)
+
+	if (sc1 != NULL) {
 		scoop_gpio_pin_write(sc1, SCOOP1_MIC_BIAS, onoff);
+	} else if (sc0 != NULL) {
+		scoop_gpio_pin_write(sc0, SCOOP0_MIC_BIAS, onoff);
+	}
 }
 
 /*

Index: src/sys/arch/zaurus/dev/scoopreg.h
diff -u src/sys/arch/zaurus/dev/scoopreg.h:1.5 src/sys/arch/zaurus/dev/scoopreg.h:1.6
--- src/sys/arch/zaurus/dev/scoopreg.h:1.5	Sun Jan 29 10:12:41 2012
+++ src/sys/arch/zaurus/dev/scoopreg.h	Tue Sep 23 14:49:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: scoopreg.h,v 1.5 2012/01/29 10:12:41 tsutsui Exp $	*/
+/*	$NetBSD: scoopreg.h,v 1.6 2014/09/23 14:49:46 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_scoopreg.h,v 1.7 2005/07/01 23:51:55 uwe Exp $	*/
 
 /*
@@ -68,7 +68,7 @@
 #define SCOOP0_MUTE_R			5
 #define SCOOP0_AKIN_PULLUP		6
 #define SCOOP0_CF_POWER_C3000		6
-#define SCOOP0_APM_ON			7
+#define SCOOP0_AMP_ON			7
 #define SCOOP0_LED_ORANGE_C3000		7
 #define SCOOP0_BACKLIGHT_CONT		8
 #define SCOOP0_JK_A_C3000		8
Index: src/sys/arch/zaurus/dev/scoopvar.h
diff -u src/sys/arch/zaurus/dev/scoopvar.h:1.5 src/sys/arch/zaurus/dev/scoopvar.h:1.6
--- src/sys/arch/zaurus/dev/scoopvar.h:1.5	Sat Apr 18 05:20:21 2009
+++ src/sys/arch/zaurus/dev/scoopvar.h	Tue Sep 23 14:49:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: scoopvar.h,v 1.5 2009/04/18 05:20:21 nonaka Exp $	*/
+/*	$NetBSD: scoopvar.h,v 1.6 2014/09/23 14:49:46 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_scoopvar.h,v 1.10 2005/11/17 05:26:31 uwe Exp $	*/
 
 /*
@@ -32,6 +32,7 @@ void

CVS commit: src/sys/arch/zaurus/stand/zboot

2014-08-26 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Wed Aug 27 03:17:21 UTC 2014

Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile

Log Message:
Don't use ${MACHINE} but zaurus instead.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/zaurus/stand/zboot/Makefile

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/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.16 src/sys/arch/zaurus/stand/zboot/Makefile:1.17
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.16	Sun Jan 12 15:26:31 2014
+++ src/sys/arch/zaurus/stand/zboot/Makefile	Wed Aug 27 03:17:21 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2014/01/12 15:26:31 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.17 2014/08/27 03:17:21 matt Exp $
 
 PROG=		zboot
 
@@ -61,7 +61,7 @@ LIBSA=		${SALIB}
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${VERSIONFILE}
 	${_MKTARGET_LINK}
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
-	${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
+	${VERSIONFILE} zaurus ${NEWVERSWHAT}
 	${CC} ${CFLAGS} ${CPPFLAGS} -c vers.c
 	${LD} ${LDFLAGS} -o ${PROG} ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}

CVS commit: src/sys/arch/zaurus/conf

2014-08-04 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Mon Aug  4 20:59:19 UTC 2014

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
Adapt to increased ramdisk size


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.21 src/sys/arch/zaurus/conf/INSTALL:1.22
--- src/sys/arch/zaurus/conf/INSTALL:1.21	Sat Mar  1 12:40:50 2014
+++ src/sys/arch/zaurus/conf/INSTALL	Mon Aug  4 20:59:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.21 2014/03/01 12:40:50 joerg Exp $
+# $NetBSD: INSTALL,v 1.22 2014/08/04 20:59:19 martin Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -9,7 +9,7 @@ include 	arch/zaurus/conf/GENERIC
 options 	MEMORY_DISK_HOOKS	# enable root ramdisk
 options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
 options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_ROOT_SIZE=4424	# size of memory disk, in blocks
+options 	MEMORY_DISK_ROOT_SIZE=4516	# size of memory disk, in blocks
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 
 # for reduce kernel size.

CVS commit: src/sys/arch/zaurus/include

2014-07-27 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Jul 27 08:55:39 UTC 2014

Modified Files:
src/sys/arch/zaurus/include: intr.h

Log Message:
unifdef -U__OLD_INTERRUPT_CODE


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/include/intr.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/zaurus/include/intr.h
diff -u src/sys/arch/zaurus/include/intr.h:1.8 src/sys/arch/zaurus/include/intr.h:1.9
--- src/sys/arch/zaurus/include/intr.h:1.8	Sun Jun 10 13:15:24 2012
+++ src/sys/arch/zaurus/include/intr.h	Sun Jul 27 08:55:39 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.8 2012/06/10 13:15:24 skrll Exp $	*/
+/*	$NetBSD: intr.h,v 1.9 2014/07/27 08:55:39 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -64,20 +64,6 @@
 #define IST_EDGE_RISING  5
 #define IST_EDGE_BOTH6
 
-#ifdef __OLD_INTERRUPT_CODE	/* XXX XXX XXX */
-
-/* Software interrupt priority levels */
-
-#define SOFTIRQ_CLOCK   0
-#define SOFTIRQ_NET 1
-#define SOFTIRQ_SERIAL  2
-
-#define SOFTIRQ_BIT(x)  (1  x)
-
-#include arm/arm32/psl.h
-
-#else /* ! __OLD_INTERRUPT_CODE */
-
 #ifndef _LOCORE
 
 #include sys/queue.h
@@ -162,8 +148,6 @@ splraiseipl(ipl_cookie_t icookie)
 
 #endif /* ! _LOCORE */
 
-#endif /* __OLD_INTERRUPT_CODE */
-
 #endif /* _KERNEL */
 
 #endif	/* _ZAURUS_INTR_H_ */

CVS commit: src/sys/arch/zaurus/stand/zboot

2014-03-26 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar 26 08:02:38 UTC 2014

Modified Files:
src/sys/arch/zaurus/stand/zboot: unixcons.c

Log Message:
use snprintf


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/stand/zboot/unixcons.c

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/zaurus/stand/zboot/unixcons.c
diff -u src/sys/arch/zaurus/stand/zboot/unixcons.c:1.2 src/sys/arch/zaurus/stand/zboot/unixcons.c:1.3
--- src/sys/arch/zaurus/stand/zboot/unixcons.c:1.2	Sat Nov 30 21:54:53 2013
+++ src/sys/arch/zaurus/stand/zboot/unixcons.c	Wed Mar 26 04:02:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: unixcons.c,v 1.2 2013/12/01 02:54:53 joerg Exp $	*/
+/*	$NetBSD: unixcons.c,v 1.3 2014/03/26 08:02:38 christos Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
@@ -170,8 +170,7 @@ awaitkey(int timeout, int tell)
 			char numbuf[20];
 			int len, j;
 
-			sprintf(numbuf, %d , i);
-			len = strlen(numbuf);
+			len = snprintf(numbuf, sizeof(numbuf), %d , i);
 			for (j = 0; j  len; j++)
 numbuf[len + j] = '\b';
 			numbuf[len + j] = '\0';

CVS commit: src/sys/arch/zaurus/zaurus

2014-03-08 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sat Mar  8 17:05:09 UTC 2014

Modified Files:
src/sys/arch/zaurus/zaurus: kloader_machdep.c

Log Message:
Remove unused variable


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/zaurus/kloader_machdep.c

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/zaurus/zaurus/kloader_machdep.c
diff -u src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.6 src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.7
--- src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.6	Sat Jan 21 18:56:51 2012
+++ src/sys/arch/zaurus/zaurus/kloader_machdep.c	Sat Mar  8 17:05:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kloader_machdep.c,v 1.6 2012/01/21 18:56:51 nonaka Exp $	*/
+/*	$NetBSD: kloader_machdep.c,v 1.7 2014/03/08 17:05:08 skrll Exp $	*/
 
 /*-
  * Copyright (C) 2009-2012 NONAKA Kimihiro non...@netbsd.org
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.6 2012/01/21 18:56:51 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.7 2014/03/08 17:05:08 skrll Exp $);
 
 #include debug_kloader.h
 
@@ -78,7 +78,7 @@ kloader_zaurus_jump(kloader_bootfunc_t f
 	extern char KERNEL_BASE_virt[];
 	void (*bootinfop)(void *, void *);
 	uint32_t *bootmagicp;
-	vaddr_t top, ptr;
+	vaddr_t ptr;
 	struct bootinfo *bootinfo;
 	struct btinfo_howto *bi_howto;
 	struct btinfo_rootdevice *bi_rootdv;
@@ -96,7 +96,7 @@ kloader_zaurus_jump(kloader_bootfunc_t f
 	memset(bootmagicp, 0, BOOTARGS_BUFSIZ);
 	bootinfo = (struct bootinfo *)(bootmagicp + 1);
 	bootinfo-nentries = 0;
-	top = ptr = (vaddr_t)bootinfo-info;
+	ptr = (vaddr_t)bootinfo-info;
 
 	/* pass to howto for new kernel */
 	bi_howto = (struct btinfo_howto *)ptr;

CVS commit: src/sys/arch/zaurus/conf

2014-03-02 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sun Mar  2 16:18:41 UTC 2014

Modified Files:
src/sys/arch/zaurus/conf: Makefile.zaurus.inc

Log Message:
Don't overwrite MACHINE_ARCH if it is already set.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/conf/Makefile.zaurus.inc

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/zaurus/conf/Makefile.zaurus.inc
diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.4 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.5
--- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.4	Fri Jan 20 15:00:27 2012
+++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc	Sun Mar  2 16:18:41 2014
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile.zaurus.inc,v 1.4 2012/01/20 15:00:27 nonaka Exp $
+#	$NetBSD: Makefile.zaurus.inc,v 1.5 2014/03/02 16:18:41 joerg Exp $
 
-MACHINE_ARCH=		arm
+MACHINE_ARCH?=		arm
 CPPFLAGS+=		-D${MACHINE}
 
 SYSTEM_FIRST_OBJ=	zaurus_start.o

CVS commit: src/sys/arch/zaurus/conf

2014-03-01 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sat Mar  1 12:40:50 UTC 2014

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
Typo


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.20 src/sys/arch/zaurus/conf/INSTALL:1.21
--- src/sys/arch/zaurus/conf/INSTALL:1.20	Fri Sep 13 15:00:47 2013
+++ src/sys/arch/zaurus/conf/INSTALL	Sat Mar  1 12:40:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.20 2013/09/13 15:00:47 christos Exp $
+# $NetBSD: INSTALL,v 1.21 2014/03/01 12:40:50 joerg Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -13,7 +13,7 @@ options 	MEMORY_DISK_ROOT_SIZE=4424	# si
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 
 # for reduce kernel size.
-# kernei size must be less than 5MB.
+# kernel size must be less than 5MB.
 # - see src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:bsdimage[]
 
 makeoptions		COPTS=-Os

CVS commit: src/sys/arch/zaurus/stand/zboot

2013-11-30 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sun Dec  1 02:54:53 UTC 2013

Modified Files:
src/sys/arch/zaurus/stand/zboot: unixcons.c

Log Message:
Use format string.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/stand/zboot/unixcons.c

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/zaurus/stand/zboot/unixcons.c
diff -u src/sys/arch/zaurus/stand/zboot/unixcons.c:1.1 src/sys/arch/zaurus/stand/zboot/unixcons.c:1.2
--- src/sys/arch/zaurus/stand/zboot/unixcons.c:1.1	Mon Mar  2 09:33:02 2009
+++ src/sys/arch/zaurus/stand/zboot/unixcons.c	Sun Dec  1 02:54:53 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: unixcons.c,v 1.1 2009/03/02 09:33:02 nonaka Exp $	*/
+/*	$NetBSD: unixcons.c,v 1.2 2013/12/01 02:54:53 joerg Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
@@ -175,7 +175,7 @@ awaitkey(int timeout, int tell)
 			for (j = 0; j  len; j++)
 numbuf[len + j] = '\b';
 			numbuf[len + j] = '\0';
-			printf(numbuf);
+			printf(%s, numbuf);
 		}
 		c = common_getc(infd, 1);
 		if (c == 0)

CVS commit: src/sys/arch/zaurus/stand/zboot

2013-11-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Nov  4 21:30:16 UTC 2013

Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile

Log Message:
fix more -mno-thumb.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/zaurus/stand/zboot/Makefile

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/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.12 src/sys/arch/zaurus/stand/zboot/Makefile:1.13
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.12	Thu Aug 15 17:41:09 2013
+++ src/sys/arch/zaurus/stand/zboot/Makefile	Mon Nov  4 16:30:16 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2013/08/15 21:41:09 matt Exp $
+#	$NetBSD: Makefile,v 1.13 2013/11/04 21:30:16 christos Exp $
 
 PROG=		zboot
 
@@ -22,7 +22,11 @@ CPPFLAGS+=	-nostdinc -I. -I${.CURDIR} -I
 CPPFLAGS+=	-D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=	-DLIBSA_ENABLE_LS_OP
 CPPFLAGS+=	-mabi=apcs-gnu -mfloat-abi=soft -mcpu=xscale
+.if ${HAVE_GCC}  48
 CPPFLAGS+=	-mno-thumb -mno-thumb-interwork
+.else
+CPPFLAGS+=	-marm
+.endif
 CPUFLAGS=
 AFLAGS+=	-D_LOCORE
 LDFLAGS+=	-nostdlib -Bstatic

CVS commit: src/sys/arch/zaurus/stand/zboot

2013-11-04 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Nov  4 21:59:15 UTC 2013

Modified Files:
src/sys/arch/zaurus/stand/zboot: unixdev.c

Log Message:
fix unused variables


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/stand/zboot/unixdev.c

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/zaurus/stand/zboot/unixdev.c
diff -u src/sys/arch/zaurus/stand/zboot/unixdev.c:1.3 src/sys/arch/zaurus/stand/zboot/unixdev.c:1.4
--- src/sys/arch/zaurus/stand/zboot/unixdev.c:1.3	Wed Jan 18 18:12:21 2012
+++ src/sys/arch/zaurus/stand/zboot/unixdev.c	Mon Nov  4 16:59:15 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: unixdev.c,v 1.3 2012/01/18 23:12:21 nonaka Exp $	*/
+/*	$NetBSD: unixdev.c,v 1.4 2013/11/04 21:59:15 christos Exp $	*/
 /*	$OpenBSD: unixdev.c,v 1.6 2007/06/16 00:26:33 deraadt Exp $	*/
 
 /*
@@ -86,6 +86,8 @@ unixopen(struct open_file *f, ...)
 #ifdef UNIX_DEBUG
 	printf(%s: devname=%s, unit=%d, partition=%d, fname=%s\n,
 	__func__, devname, unit, partition, fname);
+#else
+	__USE(fname);
 #endif
 
 	f-f_devdata = NULL;
@@ -146,6 +148,8 @@ unixpathopen(struct open_file *f, ...)
 #ifdef UNIX_DEBUG
 	printf(%s: devname=%s, unit=%d, partition=%d, fname=%s\n,
 	__func__, devname, unit, partition, fname);
+#else
+	__USE(devname); __USE(partition); __USE(unit);
 #endif
 
 	if (fname == NULL || fname[0] == '\0')

CVS commit: src/sys/arch/zaurus/conf

2013-10-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct  3 23:48:34 UTC 2013

Modified Files:
src/sys/arch/zaurus/conf: ldscript.zaurus

Log Message:
delete eh_frame gunk, which hopefully will make the kernel small enough to boot.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/conf/ldscript.zaurus

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/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.3 src/sys/arch/zaurus/conf/ldscript.zaurus:1.4
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.3	Fri Jan 20 10:00:27 2012
+++ src/sys/arch/zaurus/conf/ldscript.zaurus	Thu Oct  3 19:48:34 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldscript.zaurus,v 1.3 2012/01/20 15:00:27 nonaka Exp $	*/
+/*	$NetBSD: ldscript.zaurus,v 1.4 2013/10/03 23:48:34 christos Exp $	*/
 
 OUTPUT_ARCH(arm)
 ENTRY(KERNEL_BASE_phys)
@@ -76,4 +76,10 @@ SECTIONS
   {
 KEEP(*(.note.netbsd.ident));
   }
+  /DISCARD/ : {
+*(.eh_frame_hdr)
+*(.eh_frame)
+*(.rel.eh_frame)
+*(.rela.eh_frame)
+  }
 }

CVS commit: src/sys/arch/zaurus/conf

2013-09-13 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Sep 13 15:00:47 UTC 2013

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
disable more stuff.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.19 src/sys/arch/zaurus/conf/INSTALL:1.20
--- src/sys/arch/zaurus/conf/INSTALL:1.19	Fri Jun 28 15:24:28 2013
+++ src/sys/arch/zaurus/conf/INSTALL	Fri Sep 13 11:00:47 2013
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.19 2013/06/28 19:24:28 he Exp $
+# $NetBSD: INSTALL,v 1.20 2013/09/13 15:00:47 christos Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -32,6 +32,8 @@ no file-system		PROCFS
 no file-system		PTYFS
 no file-system		TMPFS
 
+no options 		WAPBL
+
 no options		COMPAT_13
 no options		COMPAT_14
 no options		COMPAT_15
@@ -45,6 +47,8 @@ no options		COMPAT_43
 
 no options 		COMPAT_OSSAUDIO
 
+no options		DKWEDGE_AUTODISCOVER
+
 no options 		SYSVMSG
 no options 		SYSVSEM
 no options 		SYSVSHM

CVS commit: src/sys/arch/zaurus/stand/zboot

2013-08-12 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Mon Aug 12 22:50:51 UTC 2013

Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile

Log Message:
Add -fno-unwind-tables


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/stand/zboot/Makefile

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/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.10 src/sys/arch/zaurus/stand/zboot/Makefile:1.11
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.10	Thu May  2 03:56:42 2013
+++ src/sys/arch/zaurus/stand/zboot/Makefile	Mon Aug 12 22:50:51 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2013/05/02 03:56:42 matt Exp $
+#	$NetBSD: Makefile,v 1.11 2013/08/12 22:50:51 matt Exp $
 
 PROG=		zboot
 
@@ -17,6 +17,7 @@ NOMAN=		# defined
 CFLAGS+=	-Wall -Wno-main
 CFLAGS+=	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 CFLAGS+=	-fno-stack-protector -fno-builtin -ffreestanding
+CFLAGS+=	-fno-unwind-tables
 CPPFLAGS+=	-nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S}
 CPPFLAGS+=	-D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=	-DLIBSA_ENABLE_LS_OP

CVS commit: src/sys/arch/zaurus/stand

2013-05-01 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Wed May  1 22:16:16 UTC 2013

Modified Files:
src/sys/arch/zaurus/stand: Makefile Makefile.inc
src/sys/arch/zaurus/stand/zboot: Makefile
src/sys/arch/zaurus/stand/zbsdmod: Makefile

Log Message:
Force abi/float-abi/cpu
Only allow to build on little-endian.
Force MACHINE to be zaurus.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/stand/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/stand/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/stand/zboot/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/stand/zbsdmod/Makefile

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/zaurus/stand/Makefile
diff -u src/sys/arch/zaurus/stand/Makefile:1.2 src/sys/arch/zaurus/stand/Makefile:1.3
--- src/sys/arch/zaurus/stand/Makefile:1.2	Mon Mar  2 09:33:02 2009
+++ src/sys/arch/zaurus/stand/Makefile	Wed May  1 22:16:15 2013
@@ -1,5 +1,9 @@
-#	$NetBSD: Makefile,v 1.2 2009/03/02 09:33:02 nonaka Exp $
+#	$NetBSD: Makefile,v 1.3 2013/05/01 22:16:15 matt Exp $
 
+.include bsd.endian.mk
+
+.if ${TARGET_ENDIANNESS} == 1234
 SUBDIR=	zbsdmod zboot
+.endif
 
 .include bsd.subdir.mk

Index: src/sys/arch/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.1 src/sys/arch/zaurus/stand/Makefile.inc:1.2
--- src/sys/arch/zaurus/stand/Makefile.inc:1.1	Thu Aug  9 16:08:59 2007
+++ src/sys/arch/zaurus/stand/Makefile.inc	Wed May  1 22:16:15 2013
@@ -1,3 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.1 2007/08/09 16:08:59 nonaka Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2013/05/01 22:16:15 matt Exp $
 
 BINDIR=		/usr/mdec
+MACHINE=	zaurus

Index: src/sys/arch/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.8 src/sys/arch/zaurus/stand/zboot/Makefile:1.9
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.8	Wed Jan 18 23:12:21 2012
+++ src/sys/arch/zaurus/stand/zboot/Makefile	Wed May  1 22:16:16 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2012/01/18 23:12:21 nonaka Exp $
+#	$NetBSD: Makefile,v 1.9 2013/05/01 22:16:16 matt Exp $
 
 PROG=		zboot
 
@@ -20,6 +20,8 @@ CFLAGS+=	-fno-stack-protector -fno-built
 CPPFLAGS+=	-nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S}
 CPPFLAGS+=	-D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=	-DLIBSA_ENABLE_LS_OP
+CPPFLAGS+=	-mabi=apcs-gnu -mfloat-abi=soft -mcpu=xscale
+CPUFLAGS=
 AFLAGS+=	-D_LOCORE
 LDFLAGS+=	-nostdlib -Bstatic
 
@@ -50,6 +52,7 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE
 LIBSA=		${SALIB}
 
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${VERSIONFILE}
+	${_MKTARGET_LINK}
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
 	${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
 	${CC} -c vers.c

Index: src/sys/arch/zaurus/stand/zbsdmod/Makefile
diff -u src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.6 src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.7
--- src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.6	Sun Dec 11 14:05:39 2011
+++ src/sys/arch/zaurus/stand/zbsdmod/Makefile	Wed May  1 22:16:16 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2011/12/11 14:05:39 nonaka Exp $
+#	$NetBSD: Makefile,v 1.7 2013/05/01 22:16:16 matt Exp $
 
 WARNS?=	4
 
@@ -21,6 +21,7 @@ CPUFLAGS=
 COPTS=		-Os
 CFLAGS+=	-fno-strict-aliasing
 CFLAGS+=	-DMACHINE=\${MACHINE}\ -DUTS_RELEASE=\2.4.20\
+CPPFLAGS+=	-mabi=apcs-gnu -mfloat-abi=soft -mcpu=xscale
 CPPFLAGS+=  -nostdinc -D_STANDALONE
 CPPFLAGS+=	-I${.OBJDIR} -I${S}

CVS commit: src/sys/arch/zaurus/dev

2013-03-30 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat Mar 30 08:35:06 UTC 2013

Modified Files:
src/sys/arch/zaurus/dev: zkbd.c

Log Message:
Apply patch from steleto, arranged by me.
- Avoid chattering for SL-C7x0/860
- Add more stuck keys.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/zaurus/dev/zkbd.c

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/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.17 src/sys/arch/zaurus/dev/zkbd.c:1.18
--- src/sys/arch/zaurus/dev/zkbd.c:1.17	Sat Oct 27 17:18:14 2012
+++ src/sys/arch/zaurus/dev/zkbd.c	Sat Mar 30 08:35:06 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.17 2012/10/27 17:18:14 chs Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.18 2013/03/30 08:35:06 nonaka Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.17 2012/10/27 17:18:14 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.18 2013/03/30 08:35:06 nonaka Exp $);
 
 #include opt_wsdisplay_compat.h
 #if 0	/* XXX */
@@ -75,6 +75,14 @@ static const int gpio_strobe_pins_c3000[
 	114
 };
 
+static const int stuck_keys_c3000[] = {
+	1,  7,  15, 22, 23, 31, 39, 47,
+	53, 55, 60, 63, 66, 67, 69, 71,
+	72, 73, 74, 75, 76, 77, 78, 79,
+	82, 85, 86, 87, 90, 91, 92, 94,
+	95
+};
+
 static const int gpio_sense_pins_c860[] = {
 	58,
 	59,
@@ -101,11 +109,11 @@ static const int gpio_strobe_pins_c860[]
 	77
 };
 
-static const int stuck_keys[] = {
-	7,
-	15,
-	23,
-	31
+static const int stuck_keys_c860[] = {
+	0,  1,  47, 53, 55, 60, 63, 66,
+	67, 69, 71, 72, 73, 74, 76, 77,
+	78, 79, 80, 81, 82, 83, 85, 86,
+	87, 88, 89, 90, 91, 92, 94, 95
 };
 
 #define REP_DELAY1 400
@@ -158,7 +166,8 @@ static void	zkbd_attach(device_t, device
 CFATTACH_DECL_NEW(zkbd, sizeof(struct zkbd_softc),
 	zkbd_match, zkbd_attach, NULL, NULL);
 
-static int	zkbd_irq(void *v);
+static int	zkbd_irq_c3000(void *v);
+static int	zkbd_irq_c860(void *v);
 static void	zkbd_poll(void *v);
 static int	zkbd_on(void *v);
 static int	zkbd_sync(void *v);
@@ -238,8 +247,8 @@ zkbd_attach(device_t parent, device_t se
 		sc-sc_strobe_array = gpio_strobe_pins_c3000;
 		sc-sc_nsense = __arraycount(gpio_sense_pins_c3000);
 		sc-sc_nstrobe = __arraycount(gpio_strobe_pins_c3000);
-		sc-sc_stuck_keys = stuck_keys;
-		sc-sc_nstuck = __arraycount(stuck_keys);
+		sc-sc_stuck_keys = stuck_keys_c3000;
+		sc-sc_nstuck = __arraycount(stuck_keys_c3000);
 		sc-sc_maxkbdcol = 10;
 		sc-sc_onkey_pin = 95;
 		sc-sc_sync_pin = 16;
@@ -254,8 +263,8 @@ zkbd_attach(device_t parent, device_t se
 		sc-sc_strobe_array = gpio_strobe_pins_c860;
 		sc-sc_nsense = __arraycount(gpio_sense_pins_c860);
 		sc-sc_nstrobe = __arraycount(gpio_strobe_pins_c860);
-		sc-sc_stuck_keys = NULL;
-		sc-sc_nstuck = 0;
+		sc-sc_stuck_keys = stuck_keys_c860;
+		sc-sc_nstuck = __arraycount(stuck_keys_c860);
 		sc-sc_maxkbdcol = 0;
 		sc-sc_onkey_pin = -1;
 		sc-sc_sync_pin = -1;
@@ -296,8 +305,13 @@ zkbd_attach(device_t parent, device_t se
 		if (pin == -1)
 			continue;
 		pxa2x0_gpio_set_function(pin, GPIO_IN);
-		pxa2x0_gpio_intr_establish(pin, IST_EDGE_BOTH, IPL_TTY,
-		zkbd_irq, sc);
+		if (ZAURUS_ISC1000 || ZAURUS_ISC3000) {
+			pxa2x0_gpio_intr_establish(pin, IST_EDGE_BOTH,
+			IPL_TTY, zkbd_irq_c3000, sc);
+		} else if (ZAURUS_ISC860) {
+			pxa2x0_gpio_intr_establish(pin, IST_EDGE_RISING,
+			IPL_TTY, zkbd_irq_c860, sc);
+		}
 	}
 
 	if (sc-sc_onkey_pin = 0)
@@ -346,7 +360,7 @@ zkbd_rawrepeat(void *v)
 /* XXX are some not in the array? */
 /* handle keypress interrupt */
 static int
-zkbd_irq(void *v)
+zkbd_irq_c3000(void *v)
 {
 
 	zkbd_poll(v);
@@ -354,6 +368,19 @@ zkbd_irq(void *v)
 	return 1;
 }
 
+/* Avoid chattering only for SL-C7x0/860 */
+static int
+zkbd_irq_c860(void *v)
+{
+	struct zkbd_softc *sc = (struct zkbd_softc *)v;
+
+	if (!callout_pending(sc-sc_roll_to)) {
+		zkbd_poll(v);
+	}
+
+	return 1;
+}
+
 static void
 zkbd_poll(void *v)
 {

CVS commit: src/sys/arch/zaurus/dev

2012-08-12 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sun Aug 12 08:59:58 UTC 2012

Modified Files:
src/sys/arch/zaurus/dev: w100reg.h

Log Message:
fix RCSID.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/w100reg.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/zaurus/dev/w100reg.h
diff -u src/sys/arch/zaurus/dev/w100reg.h:1.1 src/sys/arch/zaurus/dev/w100reg.h:1.2
--- src/sys/arch/zaurus/dev/w100reg.h:1.1	Sun Jan 29 10:12:42 2012
+++ src/sys/arch/zaurus/dev/w100reg.h	Sun Aug 12 08:59:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD */
+/* $NetBSD: w100reg.h,v 1.2 2012/08/12 08:59:58 nonaka Exp $ */
 
 #define W100_REG_PCLK_CTRL   0x0090

CVS commit: src/sys/arch/zaurus/zaurus

2012-08-12 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sun Aug 12 17:25:32 UTC 2012

Modified Files:
src/sys/arch/zaurus/zaurus: machdep.c zaurus_reg.h

Log Message:
To reset the watchdog timer in SL-C7x0/SL-C860.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/zaurus/zaurus/machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/zaurus/zaurus_reg.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/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.31 src/sys/arch/zaurus/zaurus/machdep.c:1.32
--- src/sys/arch/zaurus/zaurus/machdep.c:1.31	Sun Jul 29 00:07:06 2012
+++ src/sys/arch/zaurus/zaurus/machdep.c	Sun Aug 12 17:25:32 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.31 2012/07/29 00:07:06 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.32 2012/08/12 17:25:32 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.31 2012/07/29 00:07:06 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.32 2012/08/12 17:25:32 nonaka Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -163,6 +163,8 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v 
 #include arm/xscale/pxa2x0var.h
 #include arm/xscale/pxa2x0_gpio.h
 
+#include arm/sa11x0/sa11x0_ostvar.h
+
 #include arch/zaurus/zaurus/zaurus_reg.h
 #include arch/zaurus/zaurus/zaurus_var.h
 
@@ -457,11 +459,16 @@ zaurus_restart(void)
 
 		/* External reset circuit presumably asserts nRESET_GPIO. */
 		pxa2x0_gpio_set_function(89, GPIO_OUT | GPIO_SET);
-	} else if (ZAURUS_ISC860) {
-		/* XXX not yet */
-		printf(zaurus_restart() for C7x0 is not implemented yet.\n);
+	} else {
+		/* SL-C7x0/SL-C860 */
+		/* Clear all reset status */
+		ioreg_write(ZAURUS_POWMAN_VBASE + POWMAN_RCSR,
+		POWMAN_HWR|POWMAN_WDR|POWMAN_SMR|POWMAN_GPR);
+
+		/* watchdog reset */
+		saost_reset();
 	}
-	delay(1 * 1000* 1000);	/* wait 1s */
+	delay(1 * 1000 * 1000);	/* wait 1s */
 }
 
 static inline pd_entry_t *
@@ -546,6 +553,12 @@ static const struct pmap_devmap zaurus_d
 	_S(4 * COM_NPORTS),
 	VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE,
 },
+{
+	ZAURUS_POWMAN_VBASE,
+	_A(PXA2X0_POWMAN_BASE),
+	_S(PXA2X0_POWMAN_SIZE),
+	VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE,
+},
 
 {0, 0, 0, 0, 0,}
 };

Index: src/sys/arch/zaurus/zaurus/zaurus_reg.h
diff -u src/sys/arch/zaurus/zaurus/zaurus_reg.h:1.4 src/sys/arch/zaurus/zaurus/zaurus_reg.h:1.5
--- src/sys/arch/zaurus/zaurus/zaurus_reg.h:1.4	Sun Jan 29 10:12:42 2012
+++ src/sys/arch/zaurus/zaurus/zaurus_reg.h	Sun Aug 12 17:25:32 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: zaurus_reg.h,v 1.4 2012/01/29 10:12:42 tsutsui Exp $	*/
+/*	$NetBSD: zaurus_reg.h,v 1.5 2012/08/12 17:25:32 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_reg.h,v 1.7 2005/12/14 14:39:38 uwe Exp $	*/
 /*	NetBSD: lubbock_reg.h,v 1.1 2003/06/18 10:51:15 bsh Exp */
 
@@ -49,7 +49,8 @@
 #define ZAURUS_FFUART_VBASE	0xfd60
 #define ZAURUS_BTUART_VBASE	0xfd70
 #define ZAURUS_STUART_VBASE	0xfd80
-#define ZAURUS_VBASE_FREE	0xfd90
+#define ZAURUS_POWMAN_VBASE	0xfd90
+#define ZAURUS_VBASE_FREE	0xfda0
 
 #define ioreg_read(a)		(*(volatile uint32_t *)(a))
 #define ioreg_write(a,v)	(*(volatile uint32_t *)(a)=(v))

CVS commit: src/sys/arch/zaurus/zaurus

2012-06-13 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Wed Jun 13 20:04:30 UTC 2012

Modified Files:
src/sys/arch/zaurus/zaurus: autoconf.c

Log Message:
Make detection of root on wedges (dk(4)) machine independent. Remove
MD code for zaurus.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/zaurus/autoconf.c

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/zaurus/zaurus/autoconf.c
diff -u src/sys/arch/zaurus/zaurus/autoconf.c:1.10 src/sys/arch/zaurus/zaurus/autoconf.c:1.11
--- src/sys/arch/zaurus/zaurus/autoconf.c:1.10	Thu May  5 08:46:12 2011
+++ src/sys/arch/zaurus/zaurus/autoconf.c	Wed Jun 13 20:04:30 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.10 2011/05/05 08:46:12 nonaka Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.11 2012/06/13 20:04:30 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.10 2011/05/05 08:46:12 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.11 2012/06/13 20:04:30 mlelstv Exp $);
 
 #include opt_md.h
 
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, $NetBSD: autoconf.c,v
 #include machine/bootinfo.h
 #include machine/config_hook.h
 
-static void handle_wedges(device_t dv, int par);
 static int is_valid_disk(device_t dv);
 static int match_bootdisk(device_t dv, struct btinfo_bootdisk *bid);
 static void findroot(void);
@@ -69,17 +68,6 @@ cpu_configure(void)
 	spl0();
 }
 
-static void
-handle_wedges(device_t dv, int par)
-{
-
-	if (config_handle_wedges(dv, par) == 0)
-		return;
-
-	booted_device = dv;
-	booted_partition = par;
-}
-
 static int
 is_valid_disk(device_t dv)
 {
@@ -168,7 +156,8 @@ findroot(void)
 
 			if (strncmp(cd-cf_name, biv-devname, len) == 0 
 			biv-devname[len] - '0' == cd-cf_unit) {
-handle_wedges(dv, biv-devname[len + 1] - 'a');
+booted_device = dv;
+booted_partition = biv-devname[len + 1] - 'a';
 break;
 			}
 		}
@@ -205,7 +194,8 @@ findroot(void)
 device_xname(dv));
 continue;
 			}
-			handle_wedges(dv, bid-partition);
+			booted_device = dv;
+			booted_partition = bid-partition;
 		}
 		deviter_release(di);

CVS commit: src/sys/arch/zaurus/dev

2012-05-07 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Mon May  7 18:36:16 UTC 2012

Modified Files:
src/sys/arch/zaurus/dev: zkbdmap.h

Log Message:
Fix wrong raw keycode in xt_keymap_c860[] so that right shift properly works
on Xserver on C7x0/860.  From steleto.

Should be pulled up to netbsd-6.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/dev/zkbdmap.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/zaurus/dev/zkbdmap.h
diff -u src/sys/arch/zaurus/dev/zkbdmap.h:1.6 src/sys/arch/zaurus/dev/zkbdmap.h:1.7
--- src/sys/arch/zaurus/dev/zkbdmap.h:1.6	Sun Jan 29 10:12:42 2012
+++ src/sys/arch/zaurus/dev/zkbdmap.h	Mon May  7 18:36:16 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbdmap.h,v 1.6 2012/01/29 10:12:42 tsutsui Exp $	*/
+/*	$NetBSD: zkbdmap.h,v 1.7 2012/05/07 18:36:16 tsutsui Exp $	*/
 /* $OpenBSD: zaurus_kbdmap.h,v 1.19 2005/05/10 08:26:12 espie Exp $ */
 
 /*
@@ -327,7 +327,7 @@ static const char xt_keymap_c860[] = {
 /* KC(72), */	0x00, /* NC */
 /* KC(73), */	0x00, /* NC */
 /* KC(74), */	0x00, /* NC */
-/* KC(75), */	0x00, /* NC */
+/* KC(75), */	0x36, /* KS_Shift_R, */
 /* KC(76), */	0x00, /* NC */
 /* KC(77), */	0x00, /* NC */
 /* KC(78), */	0x00, /* NC */
@@ -335,7 +335,7 @@ static const char xt_keymap_c860[] = {
 /* KC(80), */	0x00, /* NC */
 /* KC(81), */	0x00, /* NC */
 /* KC(82), */	0x00, /* NC */
-/* KC(83), */	0x36, /* KS_Shift_R, */
+/* KC(83), */	0x00, /* NC */
 /* KC(84), */	0x2a, /* KS_Shift_L, */
 /* KC(85), */	0x00, /* NC */
 /* KC(86), */	0x00, /* NC */

CVS commit: src/sys/arch/zaurus/conf

2012-04-07 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat Apr  7 09:09:43 UTC 2012

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
bump up SYMTAB_SPACE.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.52 src/sys/arch/zaurus/conf/GENERIC:1.53
--- src/sys/arch/zaurus/conf/GENERIC:1.52	Sat Mar 10 21:51:57 2012
+++ src/sys/arch/zaurus/conf/GENERIC	Sat Apr  7 09:09:43 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.52 2012/03/10 21:51:57 joerg Exp $
+#	$NetBSD: GENERIC,v 1.53 2012/04/07 09:09:43 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -164,7 +164,7 @@ options 	DDB			# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 #makeoptions 	DEBUG=-g		# compile full symbol table
-options 	SYMTAB_SPACE=512000
+options 	SYMTAB_SPACE=64
 
 
 # Kernel root file system and dump configuration.

CVS commit: src/sys/arch/zaurus/include

2012-02-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Feb 18 16:23:13 UTC 2012

Modified Files:
src/sys/arch/zaurus/include: vmparam.h

Log Message:
expose more for kmemuser


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/include/vmparam.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/zaurus/include/vmparam.h
diff -u src/sys/arch/zaurus/include/vmparam.h:1.3 src/sys/arch/zaurus/include/vmparam.h:1.4
--- src/sys/arch/zaurus/include/vmparam.h:1.3	Sat Nov  6 11:42:50 2010
+++ src/sys/arch/zaurus/include/vmparam.h	Sat Feb 18 11:23:13 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.3 2010/11/06 15:42:50 uebayasi Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.4 2012/02/18 16:23:13 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -32,7 +32,7 @@
 #ifndef	_ZAURUS_VMPARAM_H_
 #define	_ZAURUS_VMPARAM_H_
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_KMEMUSER)
 
 #include arm/arm32/vmparam.h
 
@@ -86,6 +86,6 @@
 #define	VM_FREELIST_DEFAULT	0
 #define	VM_FREELIST_ISADMA	1
 
-#endif /* _KERNEL */
+#endif /* _KERNEL || _KMEMUSER */
 
 #endif	/* _ZAURUS_VMPARAM_H_ */

CVS commit: src/sys/arch/zaurus/conf

2012-02-02 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Thu Feb  2 15:57:39 UTC 2012

Added Files:
src/sys/arch/zaurus/conf: INSTALL_C700

Log Message:
Add INSTALL kernel config for SL-C700.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/conf/INSTALL_C700

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u /dev/null src/sys/arch/zaurus/conf/INSTALL_C700:1.1
--- /dev/null	Thu Feb  2 15:57:39 2012
+++ src/sys/arch/zaurus/conf/INSTALL_C700	Thu Feb  2 15:57:39 2012
@@ -0,0 +1,57 @@
+# $NetBSD: INSTALL_C700,v 1.1 2012/02/02 15:57:39 tsutsui Exp $
+#
+# INSTALL config file (C700 with memory disk root)
+#
+# Note: C700 seems to have more size restriction.
+#
+
+include 	arch/zaurus/conf/INSTALL
+
+no options 	CPU_XSCALE_PXA270
+
+no makeoptions	KERNEL_BASE_PHYS
+makeoptions	KERNEL_BASE_PHYS=0xa040
+no makeoptions	LOADADDRESS
+makeoptions	LOADADDRESS=0xc040
+
+no scoop1 at pxaip?
+no ioexp0 at iic?
+
+no lcd0 at pxaip?
+no wsdisplay* at lcd?
+
+no zusb*
+no ohci0
+no usb*
+no uhub* 
+
+no uhidev*
+no ukbd*
+no wskbd* at ukbd?
+no uhid*
+
+no umass*
+no wd* at umass?
+
+no scsibus*
+no atapibus*
+no sd*
+no cd*
+
+no aue*
+no axe*
+no cdce*
+no cue*
+no kue*
+no udav*
+no url*
+
+no acphy*
+no amhphy*
+no bmtphy*
+no glxtphy*
+no gphyter*
+no makphy*
+no tlphy*
+no tqphy*
+no urlphy*

CVS commit: src/sys/arch/zaurus/dev

2012-01-27 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri Jan 27 14:48:22 UTC 2012

Modified Files:
src/sys/arch/zaurus/dev: lcdctl.c scoop.c

Log Message:
Allow calling scoop_set_backlight() even before scoop is attached and
schedule initial values in that case as ioexp does. Suggested by nonaka@.
Now lcdctl no longer has to defer lcdctl_set_brightness() by
config_finalize_register(9), which is a bit too late.
(i.e. no backlight during USB/SD probe by config_interrupt(9) in previous)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/lcdctl.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/dev/scoop.c

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/zaurus/dev/lcdctl.c
diff -u src/sys/arch/zaurus/dev/lcdctl.c:1.1 src/sys/arch/zaurus/dev/lcdctl.c:1.2
--- src/sys/arch/zaurus/dev/lcdctl.c:1.1	Wed Jan 25 16:51:17 2012
+++ src/sys/arch/zaurus/dev/lcdctl.c	Fri Jan 27 14:48:22 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: lcdctl.c,v 1.1 2012/01/25 16:51:17 tsutsui Exp $	*/
+/*	$NetBSD: lcdctl.c,v 1.2 2012/01/27 14:48:22 tsutsui Exp $	*/
 
 /*-
  * Copyright (C) 2012 NONAKA Kimihiro non...@netbsd.org
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lcdctl.c,v 1.1 2012/01/25 16:51:17 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: lcdctl.c,v 1.2 2012/01/27 14:48:22 tsutsui Exp $);
 
 #include ioexp.h
 
@@ -79,7 +79,6 @@ static void	lcdctl_attach(device_t, devi
 CFATTACH_DECL_NEW(lcdctl, sizeof(struct lcdctl_softc),
 	lcdctl_match, lcdctl_attach, NULL, NULL);
 
-static int lcdctl_finalize(device_t);
 static void lcdctl_brightness_up(device_t);
 static void lcdctl_brightness_down(device_t);
 static void lcdctl_display_on(device_t);
@@ -119,8 +118,10 @@ lcdctl_attach(device_t parent, device_t 
 	sc-sc_nbacklighttbl = __arraycount(lcdctl_backlight_c3000);
 	sc-sc_backlighttbl = lcdctl_backlight_c3000;
 
-	/* schedule adjustment of LCD brightness after all devices are ready */
-	config_finalize_register(self, lcdctl_finalize);
+	/* Start with approximately 40% of full brightness. */
+	lcdctl_set_brightness(sc, 3);
+
+	lcdctl_sc = sc;
 
 	if (!pmf_event_register(self, PMFE_DISPLAY_BRIGHTNESS_UP,
 	lcdctl_brightness_up, true))
@@ -136,19 +137,6 @@ lcdctl_attach(device_t parent, device_t 
 		aprint_error_dev(self, couldn't register event handler\n);
 }
 
-static int
-lcdctl_finalize(device_t dv)
-{
-	struct lcdctl_softc *sc = device_private(dv);
-
-	/* Start with approximately 40% of full brightness. */
-	lcdctl_set_brightness(sc, 3);
-
-	lcdctl_sc = sc;
-
-	return 0;
-}
-
 static void
 lcdctl_brightness_up(device_t dv)
 {

Index: src/sys/arch/zaurus/dev/scoop.c
diff -u src/sys/arch/zaurus/dev/scoop.c:1.9 src/sys/arch/zaurus/dev/scoop.c:1.10
--- src/sys/arch/zaurus/dev/scoop.c:1.9	Tue Jul 19 15:11:49 2011
+++ src/sys/arch/zaurus/dev/scoop.c	Fri Jan 27 14:48:22 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: scoop.c,v 1.9 2011/07/19 15:11:49 dyoung Exp $	*/
+/*	$NetBSD: scoop.c,v 1.10 2012/01/27 14:48:22 tsutsui Exp $	*/
 /*	$OpenBSD: zaurus_scoop.c,v 1.12 2005/11/17 05:26:31 uwe Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scoop.c,v 1.9 2011/07/19 15:11:49 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: scoop.c,v 1.10 2012/01/27 14:48:22 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -58,6 +58,10 @@ static int	scoop_gpio_pin_read(struct sc
 static void	scoop_gpio_pin_write(struct scoop_softc *, int, int);
 static void	scoop_gpio_pin_ctl(struct scoop_softc *, int, int);
 
+static struct scoop_softc *backlight_sc;
+static uint8_t backlight_on_init = 1;
+static uint8_t backlight_cont_init = 0;
+
 enum scoop_card {
 	SD_CARD,
 	CF_CARD		/* socket 0 (external) */
@@ -108,9 +112,13 @@ scoopattach(device_t parent, device_t se
 	if (ZAURUS_ISC3000  sc-sc_dev-dv_unit == 1) {
 		scoop_gpio_pin_ctl(sc, SCOOP1_AKIN_PULLUP, GPIO_PIN_OUTPUT);
 		scoop_gpio_pin_write(sc, SCOOP1_AKIN_PULLUP, GPIO_PIN_LOW);
+		backlight_sc = sc;
+		scoop_set_backlight(backlight_on_init, backlight_cont_init);
 	} else if (ZAURUS_ISC860) {
 		scoop_gpio_pin_ctl(sc, SCOOP0_AKIN_PULLUP, GPIO_PIN_OUTPUT);
 		scoop_gpio_pin_write(sc, SCOOP0_AKIN_PULLUP, GPIO_PIN_LOW);
+		backlight_sc = sc;
+		scoop_set_backlight(backlight_on_init, backlight_cont_init);
 	}
 }
 
@@ -161,25 +169,19 @@ scoop_gpio_pin_ctl(struct scoop_softc *s
 void
 scoop_set_backlight(int on, int cont)
 {
-	struct scoop_softc *sc;
-#if 0
-	struct scoop_softc *sc0;
+	struct scoop_softc *sc = backlight_sc;
 
-	sc0 = device_lookup_private(scoop_cd, 0);
-#endif
-
-	sc = device_lookup_private(scoop_cd, 1);
-	if (sc != NULL) {
-		/* C3000 */
-		scoop_gpio_pin_write(sc, SCOOP1_BACKLIGHT_CONT, !cont);
-		scoop_gpio_pin_write(sc, SCOOP1_BACKLIGHT_ON, on);
-	}
-#if 0
-	else if (sc0 != NULL) {
-		scoop_gpio_pin_write(sc0,
-		SCOOP0_BACKLIGHT_CONT, cont);
+	if (sc == NULL) {
+		backlight_cont_init =

CVS commit: src/sys/arch/zaurus/dev

2012-01-27 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri Jan 27 15:07:42 UTC 2012

Modified Files:
src/sys/arch/zaurus/dev: zlcd.c

Log Message:
Update comments for recent lcdctl changes.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/zaurus/dev/zlcd.c

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/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.16 src/sys/arch/zaurus/dev/zlcd.c:1.17
--- src/sys/arch/zaurus/dev/zlcd.c:1.16	Wed Jan 25 16:51:17 2012
+++ src/sys/arch/zaurus/dev/zlcd.c	Fri Jan 27 15:07:41 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcd.c,v 1.16 2012/01/25 16:51:17 tsutsui Exp $	*/
+/*	$NetBSD: zlcd.c,v 1.17 2012/01/27 15:07:41 tsutsui Exp $	*/
 /*	$OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $	*/
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 
@@ -38,12 +38,13 @@
  * integrated LCD controller.  Codes for it is arm/xscale/pxa2x0_lcd.c.
  *
  * Codes in this file provide platform specific things including:
- *   LCD on/off switch and backlight brightness
  *   LCD panel geometry
+ *
+ * LCD on/off switch and backlight brightness are done in lcdctl.c.
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.16 2012/01/25 16:51:17 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.17 2012/01/27 15:07:41 tsutsui Exp $);
 
 #include lcdctl.h

CVS commit: src/sys/arch/zaurus/dev

2012-01-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Wed Jan 25 15:58:11 UTC 2012

Modified Files:
src/sys/arch/zaurus/dev: zaudio.c zrc.c ztp.c

Log Message:
Defer device initializations which implicitly depend on scoop or ioexp
via config_finalize_register(9).


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/zaurus/dev/zaudio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/dev/zrc.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/dev/ztp.c

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/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.17 src/sys/arch/zaurus/dev/zaudio.c:1.18
--- src/sys/arch/zaurus/dev/zaudio.c:1.17	Sat Jan 21 18:56:51 2012
+++ src/sys/arch/zaurus/dev/zaudio.c	Wed Jan 25 15:58:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: zaudio.c,v 1.17 2012/01/21 18:56:51 nonaka Exp $	*/
+/*	$NetBSD: zaudio.c,v 1.18 2012/01/25 15:58:10 tsutsui Exp $	*/
 /*	$OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $	*/
 
 /*
@@ -50,7 +50,7 @@
 #include opt_zaudio.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zaudio.c,v 1.17 2012/01/21 18:56:51 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zaudio.c,v 1.18 2012/01/25 15:58:10 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -132,6 +132,7 @@ static void	zaudio_attach(device_t, devi
 CFATTACH_DECL_NEW(zaudio, sizeof(struct zaudio_softc), 
 zaudio_match, zaudio_attach, NULL, NULL);
 
+static int	zaudio_finalize(device_t);
 static bool	zaudio_suspend(device_t, const pmf_qual_t *);
 static bool	zaudio_resume(device_t, const pmf_qual_t *);
 static void	zaudio_volume_up(device_t);
@@ -381,7 +382,8 @@ zaudio_attach(device_t parent, device_t 
 	(void) pxa2x0_gpio_intr_establish(GPIO_HP_IN_C3000, IST_EDGE_BOTH,
 	IPL_BIO, zaudio_jack_intr, sc);
 
-	zaudio_init(sc);
+	/* zaudio_init() implicitly depends on ioexp or scoop */
+	config_finalize_register(self, zaudio_finalize);
 
 	audio_attach_mi(wm8750_hw_if, sc, self);
 
@@ -405,6 +407,15 @@ fail_i2s:
 	pmf_device_deregister(self);
 }
 
+static int
+zaudio_finalize(device_t dv)
+{
+	struct zaudio_softc *sc = device_private(dv);
+
+	zaudio_init(sc);
+	return 0;
+}
+
 static bool
 zaudio_suspend(device_t dv, const pmf_qual_t *qual)
 {

Index: src/sys/arch/zaurus/dev/zrc.c
diff -u src/sys/arch/zaurus/dev/zrc.c:1.7 src/sys/arch/zaurus/dev/zrc.c:1.8
--- src/sys/arch/zaurus/dev/zrc.c:1.7	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zrc.c	Wed Jan 25 15:58:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: zrc.c,v 1.7 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zrc.c,v 1.8 2012/01/25 15:58:10 tsutsui Exp $	*/
 /*	$OpenBSD: zaurus_remote.c,v 1.1 2005/11/17 05:26:31 uwe Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zrc.c,v 1.7 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zrc.c,v 1.8 2012/01/25 15:58:10 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -101,6 +101,7 @@ static void	zrc_attach(struct device *, 
 CFATTACH_DECL_NEW(zrc, sizeof(struct zrc_softc), 
 zrc_match, zrc_attach, NULL, NULL);
 
+static int	zrc_finalize(device_t);
 static int	zrc_intr(void *);
 static void	zrc_timeout(void *);
 static int	zrc_scan(void);
@@ -190,11 +191,8 @@ zrc_attach(device_t parent, device_t sel
 		return;
 	}
 
-	/* Enable the pullup while waiting for an interrupt. */
-	if (ZAURUS_ISC1000)
-		ioexp_akin_pullup(1);
-	else
-		scoop_akin_pullup(1);
+	/* defer enabling pullup until ioexp or scoop is attached */
+	config_finalize_register(self, zrc_finalize);
 
 	sc-sc_keydown = KEY_RELEASE;
 
@@ -207,6 +205,19 @@ zrc_attach(device_t parent, device_t sel
 }
 
 static int
+zrc_finalize(device_t dv)
+{
+
+	/* Enable the pullup while waiting for an interrupt. */
+	if (ZAURUS_ISC1000)
+		ioexp_akin_pullup(1);
+	else
+		scoop_akin_pullup(1);
+
+	return 0;
+}
+
+static int
 zrc_intr(void *v)
 {
 	struct zrc_softc *sc = v;

Index: src/sys/arch/zaurus/dev/ztp.c
diff -u src/sys/arch/zaurus/dev/ztp.c:1.10 src/sys/arch/zaurus/dev/ztp.c:1.11
--- src/sys/arch/zaurus/dev/ztp.c:1.10	Wed Feb 24 22:37:56 2010
+++ src/sys/arch/zaurus/dev/ztp.c	Wed Jan 25 15:58:10 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ztp.c,v 1.10 2010/02/24 22:37:56 dyoung Exp $	*/
+/*	$NetBSD: ztp.c,v 1.11 2012/01/25 15:58:10 tsutsui Exp $	*/
 /* $OpenBSD: zts.c,v 1.9 2005/04/24 18:55:49 uwe Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ztp.c,v 1.10 2010/02/24 22:37:56 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ztp.c,v 1.11 2012/01/25 15:58:10 tsutsui Exp $);
 
 #include lcd.h
 
@@ -114,6 +114,7 @@ static void	ztp_attach(device_t, device_
 CFATTACH_DECL_NEW(ztp, sizeof(struct ztp_softc),
 	ztp_match, ztp_attach, NULL, NULL);
 
+static int	ztp_finalize(device_t);
 static int	ztp_enable(void *);
 static void	ztp_disable(void *);
 static bool	ztp_suspend(device_t dv, const pmf_qual_t *);
@@ -149,19

CVS commit: src/sys/arch/zaurus

2012-01-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Wed Jan 25 16:51:17 UTC 2012

Modified Files:
src/sys/arch/zaurus/conf: GENERIC INSTALL files.zaurus
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h zssp.c zsspvar.h ztp.c
src/sys/arch/zaurus/zaurus: machdep.c
Added Files:
src/sys/arch/zaurus/dev: lcdctl.c lcdctlvar.h

Log Message:
Reorganlization zlcd(4) and ztp(4) device attachments from nonaka@:
 - ztp depends on zssp so attach ztp at zssp rather than pxaip
 - split LCD backlight controls from zlcd(4) into new lcdctl device
   to share it among forthcoming SL-C7x0 variants


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/zaurus/conf/INSTALL
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/conf/files.zaurus
cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/dev/lcdctl.c \
src/sys/arch/zaurus/dev/lcdctlvar.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/zaurus/dev/zkbd.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/dev/zlcdvar.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/zaurus/dev/zssp.c \
src/sys/arch/zaurus/dev/ztp.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/zsspvar.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/zaurus/zaurus/machdep.c

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.48 src/sys/arch/zaurus/conf/GENERIC:1.49
--- src/sys/arch/zaurus/conf/GENERIC:1.48	Sun Dec 18 05:49:33 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Wed Jan 25 16:51:17 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.48 2011/12/18 05:49:33 dholland Exp $
+#	$NetBSD: GENERIC,v 1.49 2012/01/25 16:51:17 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -209,7 +209,7 @@ ioexp0 at iic? addr 0x18
 zssp0 at pxaip?
 
 # touchpad
-ztp0 at pxaip?
+ztp0 at zssp?
 wsmouse* at ztp? mux 0
 
 # keyboard
@@ -224,6 +224,7 @@ wskbd* at zrc? mux 1
 lcd0 at pxaip?
 options 	PXA2X0_LCD_WRITETHROUGH
 wsdisplay* at lcd? console ?
+lcdctl0 at zssp0
 
 # WM8750 Audio
 zaudio0 at iic? addr 0x1b

Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.11 src/sys/arch/zaurus/conf/INSTALL:1.12
--- src/sys/arch/zaurus/conf/INSTALL:1.11	Sat Nov 19 17:17:41 2011
+++ src/sys/arch/zaurus/conf/INSTALL	Wed Jan 25 16:51:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.11 2011/11/19 17:17:41 nonaka Exp $
+# $NetBSD: INSTALL,v 1.12 2012/01/25 16:51:17 tsutsui Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -49,7 +49,7 @@ no options 		SYMTAB_SPACE
 
 no zrc0 at pxaip?
 
-no ztp0 at pxaip?
+no ztp0 at zssp?
 no wsmouse* at ztp?
 
 no zaudio0 at iic?

Index: src/sys/arch/zaurus/conf/files.zaurus
diff -u src/sys/arch/zaurus/conf/files.zaurus:1.9 src/sys/arch/zaurus/conf/files.zaurus:1.10
--- src/sys/arch/zaurus/conf/files.zaurus:1.9	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/conf/files.zaurus	Wed Jan 25 16:51:17 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: files.zaurus,v 1.9 2011/06/19 16:20:09 nonaka Exp $
+#	$NetBSD: files.zaurus,v 1.10 2012/01/25 16:51:17 tsutsui Exp $
 #
 # Sharp Zaurus specific configuration info
 #
@@ -67,7 +67,7 @@ attach ioexp at iic
 file arch/zaurus/dev/ioexp.c		ioexp needs-flag
 
 # Dedicated SSP unit for ADC, touch screen, and backlight
-device zssp
+device zssp {}
 attach zssp at pxaip
 file arch/zaurus/dev/zssp.c		zssp
 
@@ -75,6 +75,11 @@ file arch/zaurus/dev/zssp.c		zssp
 attach lcd at pxaip with zlcd
 file arch/zaurus/dev/zlcd.c		zlcd
 
+# backlight, brightness Controller
+device lcdctl
+attach lcdctl at zssp
+file arch/zaurus/dev/lcdctl.c		lcdctl needs-flag
+
 # GPIO keyboard
 device zkbd: wskbddev
 attach zkbd at pxaip
@@ -82,7 +87,7 @@ file arch/zaurus/dev/zkbd.c		zkbd
 
 # Zaurus touchpad
 device ztp: wsmousedev, hpctpanel
-attach ztp at pxaip
+attach ztp at zssp
 file arch/zaurus/dev/ztp.c		ztp
 
 # WM8750 audio

Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.14 src/sys/arch/zaurus/dev/zkbd.c:1.15
--- src/sys/arch/zaurus/dev/zkbd.c:1.14	Tue Jun 21 18:13:19 2011
+++ src/sys/arch/zaurus/dev/zkbd.c	Wed Jan 25 16:51:17 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.15 2012/01/25 16:51:17 tsutsui Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,12 +18,13 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.15 2012/01/25 16:51:17 tsutsui Exp $);
 
 #include opt_wsdisplay_compat.h
 #if 0	/* XXX */
 #include apm.h
 #endif
+#include lcdctl.h
 
 #include sys/param.h
 #include sys/systm.h
@@ -44,7 +45,9 @@ __KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.1
 
 #include zaurus/zaurus/zaurus_var.h
 #include zaurus/dev/zkbdmap.h
-#include

CVS commit: src/sys/arch/zaurus/conf

2012-01-25 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Wed Jan 25 17:18:47 UTC 2012

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
- TAB/space cleanup
- add a comment


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.49 src/sys/arch/zaurus/conf/GENERIC:1.50
--- src/sys/arch/zaurus/conf/GENERIC:1.49	Wed Jan 25 16:51:17 2012
+++ src/sys/arch/zaurus/conf/GENERIC	Wed Jan 25 17:18:47 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.49 2012/01/25 16:51:17 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.50 2012/01/25 17:18:47 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -27,8 +27,8 @@ maxusers	32			# estimated number of user
 # CPU options
 
 # For XScale systems
-#options 	CPU_XSCALE_PXA250# Support the XScale PXA25x core
-options 	CPU_XSCALE_PXA270# Support the XScale PXA27x core
+#options 	CPU_XSCALE_PXA250	# Support the XScale PXA25x core
+options 	CPU_XSCALE_PXA270	# Support the XScale PXA27x core
 makeoptions	CPUFLAGS=-mcpu=xscale
 
 # Architecture options
@@ -123,14 +123,14 @@ options 	P1003_1B_SEMAPHORE	# p1003.1b s
 # Device options
 
 # Miscellaneous kernel options
-#options 	KTRACE  # system call tracing via ktrace(1)
-#options 	KMEMSTATS   # kernel memory statistics
-#options 	SCSIVERBOSE # Verbose SCSI errors
-#options 	MIIVERBOSE  # Verbose MII autoconfuration messages
-#options 	USBVERBOSE  # verbose USB device autoconfig messages
-#options 	USERCONF# userconf(4) support
+#options 	KTRACE		# system call tracing via ktrace(1)
+#options 	KMEMSTATS	# kernel memory statistics
+#options 	SCSIVERBOSE	# Verbose SCSI errors
+#options 	MIIVERBOSE	# Verbose MII autoconfuration messages
+#options 	USBVERBOSE	# verbose USB device autoconfig messages
+#options 	USERCONF	# userconf(4) support
 #options 	PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-#options 	SYSCTL_INCLUDE_DESCR# Include sysctl descriptions in kernel
+#options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
 #
 # wscons options
@@ -158,13 +158,13 @@ options 	WSDISPLAY_COMPAT_RAWKBD		# can 
 
 # Development and Debugging options
 
-options 	DIAGNOSTIC  # internal consistency checks
+options 	DIAGNOSTIC		# internal consistency checks
 #options 	DEBUG
-#options 	VERBOSE_INIT_ARM # verbose bootstraping messages
-options 	DDB # in-kernel debugger
-options 	DDB_HISTORY_SIZE=100# Enable history editing in DDB
+#options 	VERBOSE_INIT_ARM	# verbose bootstraping messages
+options 	DDB			# in-kernel debugger
+options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
-#makeoptions 	DEBUG=-g  # compile full symbol table
+#makeoptions 	DEBUG=-g		# compile full symbol table
 options 	SYMTAB_SPACE=512000
 
 
@@ -187,8 +187,8 @@ pxartc0 at pxaip? addr 0x4090 size 0
 
 # DMAC support
 pxadmac0 at pxaip? addr 0x4000 intr 25
-options		PXA2X0_DMAC_DMOVER_CONCURRENCY=4 # Enable dmover(9) backend
-#options	PXA2X0_DMAC_FIXED_PRIORITY	# Don't want multiple priority
+options 	PXA2X0_DMAC_DMOVER_CONCURRENCY=4 # Enable dmover(9) backend
+#options 	PXA2X0_DMAC_FIXED_PRIORITY	# Don't want multiple priority
 
 # I2C support
 ziic0 at pxaip?
@@ -221,7 +221,7 @@ zrc0 at pxaip?
 wskbd* at zrc? mux 1
 
 # LCD
-lcd0 at pxaip?
+lcd0 at pxaip?# PXA2x0 integrated LCD Controller
 options 	PXA2X0_LCD_WRITETHROUGH
 wsdisplay* at lcd? console ?
 lcdctl0 at zssp0
@@ -314,44 +314,44 @@ cd*	at atapibus? drive ?		# ATAPI CD-ROM
 #uaudio* at uhub? port ? configuration ?
 
 # USB Ethernet adapters
-aue*at uhub? port ? # ADMtek AN986 Pegasus based adapters
-axe*at uhub? port ? # ASIX AX88172 based adapters
-cdce*   at uhub? port ? # CDC, Ethernet Networking Control Model
-cue*at uhub? port ? # CATC USB-EL1201A based adapters
-kue*at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
-udav*   at uhub? port ? # Davicom DM9601 based adapters
-url*at uhub? port ? # Realtek RTL8150L based adapters
+aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
+axe*	at uhub? port ?		# ASIX AX88172 based adapters
+cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
+cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
+kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
+udav*	at uhub? port ?		# Davicom DM9601 based adapters
+url*	at uhub? port ?		# Realtek RTL8150L based adapters
 
 # Kyocera AIR-EDGE PHONE
 #ukyopon* at uhub? port ?
 #ucom* at ukyopon? portno ?
 
 # USB Generic driver
-ugen*   at uhub? port ?
+ugen*	at uhub? port ?
 
 # MII/PHY support
-acphy*  at mii? phy ?   # DAltima AC101 and AMD Am79c874 PHYs
-amhphy* at mii? phy ?   # AMD 79c901 Ethernet

CVS commit: src/sys/arch/zaurus

2012-01-21 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat Jan 21 18:56:52 UTC 2012

Modified Files:
src/sys/arch/zaurus/dev: zaudio.c zmci.c
src/sys/arch/zaurus/zaurus: kloader_machdep.c kloader_zaurus.S

Log Message:
fix my license notice.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/zaurus/dev/zaudio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/dev/zmci.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/zaurus/kloader_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/zaurus/kloader_zaurus.S

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/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.16 src/sys/arch/zaurus/dev/zaudio.c:1.17
--- src/sys/arch/zaurus/dev/zaudio.c:1.16	Wed Nov 23 23:07:30 2011
+++ src/sys/arch/zaurus/dev/zaudio.c	Sat Jan 21 18:56:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: zaudio.c,v 1.16 2011/11/23 23:07:30 jmcneill Exp $	*/
+/*	$NetBSD: zaudio.c,v 1.17 2012/01/21 18:56:51 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 /*-
- * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
+ * Copyright (C) 2009 NONAKA Kimihiro non...@netbsd.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,17 +30,16 @@
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /*
@@ -51,7 +50,7 @@
 #include opt_zaudio.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zaudio.c,v 1.16 2011/11/23 23:07:30 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: zaudio.c,v 1.17 2012/01/21 18:56:51 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h

Index: src/sys/arch/zaurus/dev/zmci.c
diff -u src/sys/arch/zaurus/dev/zmci.c:1.3 src/sys/arch/zaurus/dev/zmci.c:1.4
--- src/sys/arch/zaurus/dev/zmci.c:1.3	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zmci.c	Sat Jan 21 18:56:51 2012
@@ -1,7 +1,7 @@
-/*	$NetBSD: zmci.c,v 1.3 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zmci.c,v 1.4 2012/01/21 18:56:51 nonaka Exp $	*/
 
 /*-
- * Copyright (c) 2006-2008 NONAKA Kimihiro non...@netbsd.org
+ * Copyright (C) 2006-2008 NONAKA Kimihiro non...@netbsd.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,21 +13,20 @@
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE

CVS commit: src/sys/arch/zaurus

2012-01-20 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Fri Jan 20 15:00:27 UTC 2012

Modified Files:
src/sys/arch/zaurus/conf: Makefile.zaurus.inc std.zaurus
src/sys/arch/zaurus/zaurus: kloader_machdep.c machdep.c
Added Files:
src/sys/arch/zaurus/conf: ldscript.zaurus
Removed Files:
src/sys/arch/zaurus/conf: ldscript

Log Message:
Kernel load address can be changed now.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/conf/Makefile.zaurus.inc \
src/sys/arch/zaurus/conf/std.zaurus
cvs rdiff -u -r1.1 -r0 src/sys/arch/zaurus/conf/ldscript
cvs rdiff -u -r0 -r1.3 src/sys/arch/zaurus/conf/ldscript.zaurus
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/zaurus/kloader_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/zaurus/zaurus/machdep.c

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/zaurus/conf/Makefile.zaurus.inc
diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.3 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.4
--- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.3	Thu May  5 09:07:59 2011
+++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc	Fri Jan 20 15:00:27 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.zaurus.inc,v 1.3 2011/05/05 09:07:59 nonaka Exp $
+#	$NetBSD: Makefile.zaurus.inc,v 1.4 2012/01/20 15:00:27 nonaka Exp $
 
 MACHINE_ARCH=		arm
 CPPFLAGS+=		-D${MACHINE}
@@ -6,10 +6,6 @@ CPPFLAGS+=		-D${MACHINE}
 SYSTEM_FIRST_OBJ=	zaurus_start.o
 SYSTEM_FIRST_SFILE=	${THISARM}/zaurus/zaurus_start.S
 
-LINKFLAGS=		-T ${THISARM}/conf/ldscript
-
-EXTRA_CLEAN+= netbsd.map assym.d
-
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo Checking kernel size...; \
 	size=`wc -c $@ | ${TOOL_AWK} '{ print $$1 }'`; \
@@ -20,3 +16,17 @@ SYSTEM_LD_TAIL_EXTRA+=; \
 		echo Fatal: kernel size: $$size, max kernel size: $$maxsize; \
 		false; \
 	fi
+
+KERNEL_BASE_VIRT=	$(LOADADDRESS)
+
+LINKFLAGS=		-T ldscript
+
+EXTRA_CLEAN+=		netbsd.map assym.d ldscript tmp
+
+netbsd:	ldscript	# XXX
+
+# generate ldscript from common template
+ldscript: ${THISARM}/conf/ldscript.zaurus ${THISARM}/conf/Makefile.zaurus.inc Makefile
+	${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+	-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
+	${THISARM}/conf/ldscript.zaurus  tmp  mv tmp $@
Index: src/sys/arch/zaurus/conf/std.zaurus
diff -u src/sys/arch/zaurus/conf/std.zaurus:1.3 src/sys/arch/zaurus/conf/std.zaurus:1.4
--- src/sys/arch/zaurus/conf/std.zaurus:1.3	Sun Jan 27 12:37:12 2008
+++ src/sys/arch/zaurus/conf/std.zaurus	Fri Jan 20 15:00:27 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: std.zaurus,v 1.3 2008/01/27 12:37:12 chris Exp $
+#	$NetBSD: std.zaurus,v 1.4 2012/01/20 15:00:27 nonaka Exp $
 #
 # standard NetBSD/zaurus options
 
@@ -13,7 +13,8 @@ options 	EXEC_SCRIPT
 # To support easy transit to ../arch/arm/arm32
 options 	ARM32
 
-#options 	ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
+makeoptions	KERNEL_BASE_PHYS=0xa020
+makeoptions	LOADADDRESS=0xc020
 
 options 	ARM_INTR_IMPL=arch/arm/xscale/pxa2x0_intr.h
 

Index: src/sys/arch/zaurus/zaurus/kloader_machdep.c
diff -u src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.4 src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.5
--- src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.4	Sun Nov 20 04:07:50 2011
+++ src/sys/arch/zaurus/zaurus/kloader_machdep.c	Fri Jan 20 15:00:27 2012
@@ -1,7 +1,7 @@
-/*	$NetBSD: kloader_machdep.c,v 1.4 2011/11/20 04:07:50 nonaka Exp $	*/
+/*	$NetBSD: kloader_machdep.c,v 1.5 2012/01/20 15:00:27 nonaka Exp $	*/
 
 /*-
- * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
+ * Copyright (c) 2009-2012 NONAKA Kimihiro non...@netbsd.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.4 2011/11/20 04:07:50 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.5 2012/01/20 15:00:27 nonaka Exp $);
 
 #include debug_kloader.h
 
@@ -44,9 +44,7 @@ __KERNEL_RCSID(0, $NetBSD: kloader_mach
 
 #include zaurus/zaurus/zaurus_var.h
 
-#ifndef KERNEL_BASE
-#define	KERNEL_BASE	0xc000
-#endif
+#define	KERNEL_TEXT_BASE	((vaddr_t)KERNEL_BASE_virt)
 
 kloader_jumpfunc_t kloader_zaurus_jump __attribute__((__noreturn__));
 kloader_bootfunc_t kloader_zaurus_boot __attribute__((__noreturn__));
@@ -78,8 +76,9 @@ kloader_zaurus_jump(kloader_bootfunc_t f
 struct kloader_bootinfo *kbi, struct kloader_page_tag *tag)
 {
 	extern int kloader_howto;
-	void (*bootinfop)(void *, void *) = (void *)(0xc020 - PAGE_SIZE);
-	uint32_t *bootmagicp = (uint32_t *)(0xc020 - BOOTARGS_BUFSIZ);
+	extern char KERNEL_BASE_virt[];
+	void (*bootinfop)(void *, void *);
+	uint32_t *bootmagicp;
 	vaddr_t top, ptr;
 	struct bootinfo *bootinfo;
 	struct btinfo_howto *bi_howto;
@@ -88,11 +87,13 @@ kloader_zaurus_jump(kloader_bootfunc_t f
 	disable_interrupts(I32_bit|F32_bit);	
 
 	/* copy

CVS commit: src/sys/arch/zaurus/stand/zboot

2012-01-18 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Wed Jan 18 23:12:22 UTC 2012

Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile boot.c boot.h bootmenu.c
conf.c devopen.c diskprobe.c pathnames.h unixdev.c unixdev.h
version
Added Files:
src/sys/arch/zaurus/stand/zboot: pathfs.c pathfs.h

Log Message:
Support to read the kernel from local file system.

ex. boot path:/mnt/card/netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/stand/zboot/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/stand/zboot/boot.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/stand/zboot/boot.h \
src/sys/arch/zaurus/stand/zboot/bootmenu.c \
src/sys/arch/zaurus/stand/zboot/conf.c \
src/sys/arch/zaurus/stand/zboot/devopen.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/stand/zboot/diskprobe.c \
src/sys/arch/zaurus/stand/zboot/pathnames.h \
src/sys/arch/zaurus/stand/zboot/unixdev.c \
src/sys/arch/zaurus/stand/zboot/unixdev.h \
src/sys/arch/zaurus/stand/zboot/version
cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/stand/zboot/pathfs.c \
src/sys/arch/zaurus/stand/zboot/pathfs.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/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.7 src/sys/arch/zaurus/stand/zboot/Makefile:1.8
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.7	Sun Dec 25 06:09:10 2011
+++ src/sys/arch/zaurus/stand/zboot/Makefile	Wed Jan 18 23:12:21 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2011/12/25 06:09:10 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.8 2012/01/18 23:12:21 nonaka Exp $
 
 PROG=		zboot
 
@@ -8,6 +8,7 @@ SRCS=		crt0.c
 SRCS+=		boot.c bootinfo.c bootmenu.c conf.c devopen.c diskprobe.c
 SRCS+=		loadfile_zboot.c
 SRCS+=		getsecs.c termios.c unixcons.c unixdev.c unixsys.S
+SRCS+=		pathfs.c
 
 NOMAN=		# defined
 
@@ -33,7 +34,7 @@ NEWVERSWHAT?=   Boot
 VERSIONFILE?=	${.CURDIR}/version
 
 ### find out what to use for libkern
-KERN_AS=		library
+KERN_AS=	library
 .include ${S}/lib/libkern/Makefile.inc
 LIBKERN=	${KERNLIB}
 
@@ -48,7 +49,7 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE
 .include ${S}/lib/libsa/Makefile.inc
 LIBSA=		${SALIB}
 
-${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${VERSIONFILE}
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \
 	${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
 	${CC} -c vers.c

Index: src/sys/arch/zaurus/stand/zboot/boot.c
diff -u src/sys/arch/zaurus/stand/zboot/boot.c:1.4 src/sys/arch/zaurus/stand/zboot/boot.c:1.5
--- src/sys/arch/zaurus/stand/zboot/boot.c:1.4	Sun Dec 25 06:09:10 2011
+++ src/sys/arch/zaurus/stand/zboot/boot.c	Wed Jan 18 23:12:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.4 2011/12/25 06:09:10 tsutsui Exp $	*/
+/*	$NetBSD: boot.c,v 1.5 2012/01/18 23:12:21 nonaka Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
@@ -53,6 +53,7 @@ const char *default_filename;
 int default_timeout = 5;
 
 static char probed_disks[256];
+static char bootconfpath[1024];
 
 static void bootcmd_help(char *);
 static void bootcmd_ls(char *);
@@ -196,7 +197,10 @@ boot(dev_t bootdev)
 
 	diskprobe(probed_disks, sizeof(probed_disks));
 
-	parsebootconf(_PATH_BOOTCONF);
+	snprintf(bootconfpath, sizeof(bootconfpath), %s%d%c:%s,
+	default_devname, default_unit, 'a' + default_partition,
+	_PATH_BOOTCONF);
+	parsebootconf(bootconfpath);
 
 #ifdef SUPPORT_CONSDEV
 	/*
@@ -296,8 +300,9 @@ bootcmd_help(char *arg)
 {
 
 	printf(commands are:\n
-	boot [xdNx:][filename] [-acdqsv]\n
-	 (ex. \hd0a:netbsd.old -s\\n
+	boot [xdNx:][filename] [-1acdqsv]\n
+	 (ex. \boot hd0a:netbsd.old -s\)\n
+	 (ex. \boot path:/mnt/card/netbsd -1\)\n
 	ls [path]\n
 #ifdef SUPPORT_CONSDEV
 	consdev {glass|com [speed]}\n

Index: src/sys/arch/zaurus/stand/zboot/boot.h
diff -u src/sys/arch/zaurus/stand/zboot/boot.h:1.1 src/sys/arch/zaurus/stand/zboot/boot.h:1.2
--- src/sys/arch/zaurus/stand/zboot/boot.h:1.1	Mon Mar  2 09:33:02 2009
+++ src/sys/arch/zaurus/stand/zboot/boot.h	Wed Jan 18 23:12:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.h,v 1.1 2009/03/02 09:33:02 nonaka Exp $	*/
+/*	$NetBSD: boot.h,v 1.2 2012/01/18 23:12:21 nonaka Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro
@@ -52,6 +52,7 @@ void bootmenu(void);
 /* conf.c */
 extern char devname_hd[];
 extern char devname_mmcd[];
+extern char devname_path[];
 
 /* loadfile_zboot.c */
 int loadfile_zboot(const char *fname, u_long *marks, int flags);
Index: src/sys/arch/zaurus/stand/zboot/bootmenu.c
diff -u src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.1 src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.2
--- src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.1	Mon Mar  2 09:33:02 2009
+++ src/sys/arch/zaurus/stand/zboot/bootmenu.c	Wed Jan 18 23:12:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootmenu.c,v 1.1

CVS commit: src/sys/arch/zaurus/zaurus

2012-01-17 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Tue Jan 17 15:48:33 UTC 2012

Modified Files:
src/sys/arch/zaurus/zaurus: kloader_zaurus.S

Log Message:
fix struct kloader_bootinfo address.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/zaurus/kloader_zaurus.S

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/zaurus/zaurus/kloader_zaurus.S
diff -u src/sys/arch/zaurus/zaurus/kloader_zaurus.S:1.1 src/sys/arch/zaurus/zaurus/kloader_zaurus.S:1.2
--- src/sys/arch/zaurus/zaurus/kloader_zaurus.S:1.1	Wed Mar 11 09:02:05 2009
+++ src/sys/arch/zaurus/zaurus/kloader_zaurus.S	Tue Jan 17 15:48:33 2012
@@ -1,7 +1,7 @@
-/*	$NetBSD: kloader_zaurus.S,v 1.1 2009/03/11 09:02:05 nonaka Exp $	*/
+/*	$NetBSD: kloader_zaurus.S,v 1.2 2012/01/17 15:48:33 nonaka Exp $	*/
 
 /*-
- * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
+ * Copyright (c) 2009-2012 NONAKA Kimihiro non...@netbsd.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,9 +56,9 @@
  */
 	.global	_C_LABEL(kloader_zaurus_boot)
 _C_LABEL(kloader_zaurus_boot):
-	mov	r0, r12			/* r12: kbi */
-	bic	r12, r12, #0xff00
-	orr	r12, r12, #0xa000
+	mov	sp, r0			/* sp: kbi */
+	bic	sp, sp, #0xff00	/* clear upper 8 bits */
+	orr	sp, sp, #0xa000	/* OR in physical base address */
 
 	/* We will go ahead and disable the MMU here. */
 	adr	r8, .Lmmuoff
@@ -105,15 +105,13 @@ _C_LABEL(kloader_zaurus_boot):
 	bl	.Lputcrlf
 #endif
 
-	/* set temporary stack pointer */
+	/* Set kernel entry */
+	ldr	r0, [sp]
+
+	/* Set temporary stack pointer */
 	ldr	sp, .Lstack_addr
 
 	/* Jump to kernel entry */
-#if 0	/* XXX */
-	ldr	r0, [r12]	/* kbi-entry */
-#else
-	ldr	r0, .Lstart_addr
-#endif
 	mov	pc, r0
 
 99:	b	99b
@@ -121,9 +119,6 @@ _C_LABEL(kloader_zaurus_boot):
 .Lstack_addr:
 	.word	0xa0004000
 
-.Lstart_addr:
-	.word	0xa020
-
 #ifdef PROGRESS
 .Lprogress:
 	mov	r0, #0x2e /*'.'*/

CVS commit: src/sys/arch/zaurus/stand/zbsdmod

2011-12-16 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Fri Dec 16 14:17:41 UTC 2011

Modified Files:
src/sys/arch/zaurus/stand/zbsdmod: zbsdmod.c

Log Message:
more clean D-cache.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c

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/zaurus/stand/zbsdmod/zbsdmod.c
diff -u src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.7 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.8
--- src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.7	Sun Dec 11 14:05:39 2011
+++ src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c	Fri Dec 16 14:17:41 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zbsdmod.c,v 1.7 2011/12/11 14:05:39 nonaka Exp $	*/
+/*	$NetBSD: zbsdmod.c,v 1.8 2011/12/16 14:17:41 nonaka Exp $	*/
 /*	$OpenBSD: zbsdmod.c,v 1.7 2005/05/02 02:45:29 uwe Exp $	*/
 
 /*
@@ -94,6 +94,7 @@ static int havesyms;
 /* The maximum size of a kernel image is restricted to 5MB. */
 static u_int bsdimage[5242880/sizeof(u_int)];	/* XXX use kmalloc() */
 static char bootargs[BOOTARGS_BUFSIZ];
+static u_int datacacheclean[65536/sizeof(u_int)] __attribute__((aligned(32)));
 
 /*
  * Boot the loaded BSD kernel image, or return if an error is found.
@@ -265,17 +266,31 @@ elf32bsdboot(void)
 
 	addr = (int *)(elf-e_entry);
 	__asm volatile (
+		/* Clean D-cache */
+		mov	r0, %1;
+		mov	r1, #65536;
+		1:
+		ldr	r2, [r0], #32;
+		subs	r1, r1, #32;
+		bne	1b;
+		mcr	p15, 0, r1, c7, c10, 4; /*drain write and fill buffer*/
+		mrc	p15, 0, r1, c2, c0, 0; /* CPWAIT */
+		mov	r1, r1;
+		sub	pc, pc, #4;
+		/* Disable MMU and jump to kernel entry address */
 		mov	r0, %0;
-		mcr	p15, 0, r1, c7, c7, 0;
-		mrc	p15, 0, r1, c2, c0, 0;
+		mcr	p15, 0, r1, c7, c7, 0; /* flush I+D cache */
+		mrc	p15, 0, r1, c2, c0, 0; /* CPWAIT */
 		mov	r1, r1;
 		sub	pc, pc, #4;
 		mov	r1, #(0x0010 | 0x0020);
-		mcr	p15, 0, r1, c1, c0, 0;
-		mcr	p15, 0, r1, c8, c7, 0;
-		mrc	p15, 0, r1, c2, c0, 0;
+		mcr	p15, 0, r1, c1, c0, 0; /* Write new control register */
+		mcr	p15, 0, r1, c8, c7, 0; /* invalidate I+D TLB */
+		mcr	p15, 0, r1, c7, c5, 0; /* invalidate I$ and BTB */
+		mcr	p15, 0, r1, c7, c10, 4; /*drain write and fill buffer*/
+		mrc	p15, 0, r1, c2, c0, 0; /* CPWAIT_AND_RETURN */
 		sub	pc, r0, r1, lsr #32;
-		:: r (addr) : r0, r1);
+		:: r (addr), r (datacacheclean) : r0, r1, r2);
 }
 
 /*
@@ -329,7 +344,7 @@ zbsdmod_write(struct file *f, const char
 		return 0;
 
 	if (*offp + len = sizeof(bsdimage))
-		return EFBIG;
+		return -EFBIG;
 
 	memcpy(((char *)bsdimage) + *offp, buf, len);

CVS commit: src/sys/arch/zaurus/stand/zbsdmod

2011-12-11 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sun Dec 11 14:05:39 UTC 2011

Modified Files:
src/sys/arch/zaurus/stand/zbsdmod: Makefile compat_linux.h zbsdmod.c

Log Message:
- WARNS=4
- object size is more smaller.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/stand/zbsdmod/Makefile \
src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c

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/zaurus/stand/zbsdmod/Makefile
diff -u src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.5 src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.6
--- src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.5	Mon Apr 13 12:25:36 2009
+++ src/sys/arch/zaurus/stand/zbsdmod/Makefile	Sun Dec 11 14:05:39 2011
@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.5 2009/04/13 12:25:36 nonaka Exp $
+#	$NetBSD: Makefile,v 1.6 2011/12/11 14:05:39 nonaka Exp $
+
+WARNS?=	4
 
 S=	${.CURDIR}/../../../..
 
 OBJS=	zbsdmod.o
 SRCS=	zbsdmod.c
-NOMAN=	yes
+NOMAN=	# defined
 
 realall: ${OBJS}
 
@@ -15,7 +17,9 @@ afterinstall:
 	${INSTALL_FILE} ${INSTALL_COPY} -o root -g wheel -m 644 \
 		${OBJS} ${DESTDIR}/${BINDIR}
 
-CFLAGS=		-Wall -Wmissing-prototypes -Wstrict-prototypes
+CPUFLAGS=
+COPTS=		-Os
+CFLAGS+=	-fno-strict-aliasing
 CFLAGS+=	-DMACHINE=\${MACHINE}\ -DUTS_RELEASE=\2.4.20\
 CPPFLAGS+=  -nostdinc -D_STANDALONE
 CPPFLAGS+=	-I${.OBJDIR} -I${S}
Index: src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h
diff -u src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h:1.5 src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h:1.6
--- src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h:1.5	Sun Dec 26 09:02:52 2010
+++ src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h	Sun Dec 11 14:05:39 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_linux.h,v 1.5 2010/12/26 09:02:52 nonaka Exp $	*/
+/*	$NetBSD: compat_linux.h,v 1.6 2011/12/11 14:05:39 nonaka Exp $	*/
 /*	$OpenBSD: compat_linux.h,v 1.5 2006/01/15 17:58:27 deraadt Exp $	*/
 
 /*
@@ -31,12 +31,6 @@
 struct file;
 struct inode;
 
-#include sys/cdefs.h
-#define	ELFSIZE	32
-#include sys/exec_elf.h
-#include sys/types.h
-#include sys/errno.h
-
 typedef long loff_t;
 
 struct file_operations {
@@ -71,12 +65,6 @@ extern	int unregister_chrdev(unsigned in
 extern	void printk(const char *, ...) __printflike(1, 2);
 extern	void *memcpy(void *, const void *, size_t);
 
-/* Linux LKM support */
-static const char __module_kernel_version[] __attribute__((section(.modinfo))) =
-kernel_version= UTS_RELEASE;
-static const char __module_using_checksums[] __attribute__((section(.modinfo))) =
-using_checksums=1;
-
 /* procfs support */
 struct proc_dir_entry {
 unsigned short low_ino;

Index: src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c
diff -u src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.6 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.7
--- src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.6	Thu May  5 09:07:59 2011
+++ src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c	Sun Dec 11 14:05:39 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zbsdmod.c,v 1.6 2011/05/05 09:07:59 nonaka Exp $	*/
+/*	$NetBSD: zbsdmod.c,v 1.7 2011/12/11 14:05:39 nonaka Exp $	*/
 /*	$OpenBSD: zbsdmod.c,v 1.7 2005/05/02 02:45:29 uwe Exp $	*/
 
 /*
@@ -21,10 +21,22 @@
  * Zaurus NetBSD bootstrap loader.
  */
 
-#include compat_linux.h
+#include sys/cdefs.h
+#define ELFSIZE 32
+#include sys/exec_elf.h
+#include sys/types.h
+#include sys/errno.h
 
 #include machine/bootinfo.h
 
+#include compat_linux.h
+
+/* Linux LKM support */
+const char __module_kernel_version[] __attribute__((section(.modinfo))) =
+kernel_version= UTS_RELEASE;
+const char __module_using_checksums[] __attribute__((section(.modinfo))) =
+using_checksums=1;
+
 #define ZBOOTDEV_MAJOR	99
 #define ZBOOTDEV_MODE	0222
 #define ZBOOTDEV_NAME	zboot
@@ -57,6 +69,11 @@ static struct file_operations fops = {
 	0,			/* check media change */
 	0,			/* revalidate */
 	0,			/* lock */
+	0,			/* sendpage */
+	0,			/* get_unmapped_area */
+#ifdef	MAGIC_ROM_PTR
+	0,			/* romptr */
+#endif	/* MAGIC_ROM_PTR */
 };
 
 static int isopen;
@@ -108,7 +125,7 @@ elf32bsdboot(void)
 			continue;
 
 #define IS_TEXT(p)	(p.p_flags  PF_X)
-#define IS_DATA(p)	((p.p_flags  PF_X) == 0)
+#define IS_DATA(p)	(p.p_flags  PF_W)
 #define IS_BSS(p)	(p.p_filesz  p.p_memsz)
 		/*
 		 * XXX: Assume first address is lowest
@@ -249,16 +266,16 @@ elf32bsdboot(void)
 	addr = (int *)(elf-e_entry);
 	__asm volatile (
 		mov	r0, %0;
-		mov	r2, #0;
-		mcr	p15, 0, r2, c7, c7, 0;
-		mov	r2, r2;
+		mcr	p15, 0, r1, c7, c7, 0;
+		mrc	p15, 0, r1, c2, c0, 0;
+		mov	r1, r1;
 		sub	pc, pc, #4;
 		mov	r1, #(0x0010 | 0x0020);
 		mcr	p15, 0, r1, c1, c0, 0;
-		mcr	p15, 0, r2, c8, c7, 0;
-		mov	r2, r2;
-		sub	pc, pc, #4;
-		mov	pc, r0 :: r(addr) : r0,r1,r2);
+		mcr	p15, 0, r1, c8, c7, 0;
+		mrc	p15, 0, r1, c2, c0, 0;
+		sub	pc, r0, r1, lsr #32;
+		:: r (addr) : r0, r1);
 }

CVS commit: src/sys/arch/zaurus/conf

2011-11-19 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat Nov 19 17:17:42 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
disable kloader(4).


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.10 src/sys/arch/zaurus/conf/INSTALL:1.11
--- src/sys/arch/zaurus/conf/INSTALL:1.10	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/conf/INSTALL	Sat Nov 19 17:17:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.10 2011/06/19 16:20:09 nonaka Exp $
+# $NetBSD: INSTALL,v 1.11 2011/11/19 17:17:41 nonaka Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -18,6 +18,8 @@ options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	#
 
 makeoptions		COPTS=-Os
 
+no options 		KLOADER
+
 no options 		INSECURE
 
 no file-system		KERNFS

CVS commit: src/sys/arch/zaurus/zaurus

2011-11-19 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sun Nov 20 04:07:50 UTC 2011

Modified Files:
src/sys/arch/zaurus/zaurus: kloader_machdep.c

Log Message:
compile again.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/zaurus/kloader_machdep.c

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/zaurus/zaurus/kloader_machdep.c
diff -u src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.3 src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.4
--- src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.3	Sun Mar 15 02:23:52 2009
+++ src/sys/arch/zaurus/zaurus/kloader_machdep.c	Sun Nov 20 04:07:50 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kloader_machdep.c,v 1.3 2009/03/15 02:23:52 nonaka Exp $	*/
+/*	$NetBSD: kloader_machdep.c,v 1.4 2011/11/20 04:07:50 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
@@ -27,12 +27,13 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.3 2009/03/15 02:23:52 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.4 2011/11/20 04:07:50 nonaka Exp $);
 
 #include debug_kloader.h
 
 #include sys/param.h
 #include sys/systm.h
+#include sys/device.h
 #include sys/disklabel.h
 
 #include machine/kloader.h

CVS commit: src/sys/arch/zaurus/zaurus

2011-11-11 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat Nov 12 04:39:20 UTC 2011

Modified Files:
src/sys/arch/zaurus/zaurus: machdep.c

Log Message:
SL-C700 has PXA250 step B instead of PXA250 step A.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/zaurus/zaurus/machdep.c

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/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.26 src/sys/arch/zaurus/zaurus/machdep.c:1.27
--- src/sys/arch/zaurus/zaurus/machdep.c:1.26	Tue Jul 19 15:11:49 2011
+++ src/sys/arch/zaurus/zaurus/machdep.c	Sat Nov 12 04:39:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.26 2011/07/19 15:11:49 dyoung Exp $	*/
+/*	$NetBSD: machdep.c,v 1.27 2011/11/12 04:39:19 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.26 2011/07/19 15:11:49 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.27 2011/11/12 04:39:19 nonaka Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -713,7 +713,7 @@ initarm(void *arg)
 		zaurus_gpioconf = pxa27x_zaurus_gpioconf;
 	} else {
 		zaurusmod = ZAURUS_C860;		/* SL-C7x0/860 */
-		if (cputype == CPU_ID_PXA250A) {
+		if (cputype == CPU_ID_PXA250B) {
 			/* SL-C700 */
 			memsize =  0x0200;		/* 32MB */
 		}

CVS commit: src/sys/arch/zaurus

2011-07-19 Thread David Young 
Module Name:src
Committed By:   dyoung
Date:   Tue Jul 19 15:11:49 UTC 2011

Modified Files:
src/sys/arch/zaurus/dev: scoop.c zlcd.c zssp.c zusb.c
src/sys/arch/zaurus/include: Makefile
src/sys/arch/zaurus/zaurus: machdep.c
Added Files:
src/sys/arch/zaurus/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/zaurus/include: bus.h

Log Message:
Change machine/bus.h to sys/bus.h throughout.

Split bus.h - bus_{defs,funcs}.h.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/dev/scoop.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/dev/zusb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/zaurus/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/include/bus_defs.h \
src/sys/arch/zaurus/include/bus_funcs.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/zaurus/zaurus/machdep.c

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/zaurus/dev/scoop.c
diff -u src/sys/arch/zaurus/dev/scoop.c:1.8 src/sys/arch/zaurus/dev/scoop.c:1.9
--- src/sys/arch/zaurus/dev/scoop.c:1.8	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/scoop.c	Tue Jul 19 15:11:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: scoop.c,v 1.8 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: scoop.c,v 1.9 2011/07/19 15:11:49 dyoung Exp $	*/
 /*	$OpenBSD: zaurus_scoop.c,v 1.12 2005/11/17 05:26:31 uwe Exp $	*/
 
 /*
@@ -18,15 +18,14 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scoop.c,v 1.8 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: scoop.c,v 1.9 2011/07/19 15:11:49 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
 #include sys/device.h
 #include sys/conf.h
 #include sys/gpio.h
-
-#include machine/bus.h
+#include sys/bus.h
 
 #include arm/xscale/pxa2x0var.h
 

Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.14 src/sys/arch/zaurus/dev/zlcd.c:1.15
--- src/sys/arch/zaurus/dev/zlcd.c:1.14	Tue Jun 21 18:13:19 2011
+++ src/sys/arch/zaurus/dev/zlcd.c	Tue Jul 19 15:11:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $	*/
+/*	$NetBSD: zlcd.c,v 1.15 2011/07/19 15:11:49 dyoung Exp $	*/
 /*	$OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $	*/
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 
@@ -43,13 +43,14 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.15 2011/07/19 15:11:49 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
 #include sys/conf.h
 #include sys/uio.h
 #include sys/malloc.h
+#include sys/bus.h
 
 #include dev/cons.h
 #include dev/wscons/wsconsio.h
@@ -58,7 +59,6 @@
 
 #include dev/hpc/hpcfbio.h
 
-#include machine/bus.h
 #include arm/xscale/pxa2x0var.h
 #include arm/xscale/pxa2x0reg.h
 #include arm/xscale/pxa2x0_lcd.h

Index: src/sys/arch/zaurus/dev/zssp.c
diff -u src/sys/arch/zaurus/dev/zssp.c:1.10 src/sys/arch/zaurus/dev/zssp.c:1.11
--- src/sys/arch/zaurus/dev/zssp.c:1.10	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zssp.c	Tue Jul 19 15:11:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zssp.c,v 1.10 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zssp.c,v 1.11 2011/07/19 15:11:49 dyoung Exp $	*/
 /*	$OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $	*/
 
 /*
@@ -18,13 +18,12 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zssp.c,v 1.10 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zssp.c,v 1.11 2011/07/19 15:11:49 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
 #include sys/device.h
-
-#include machine/bus.h
+#include sys/bus.h
 
 #include arm/xscale/pxa2x0reg.h
 #include arm/xscale/pxa2x0var.h

Index: src/sys/arch/zaurus/dev/zusb.c
diff -u src/sys/arch/zaurus/dev/zusb.c:1.5 src/sys/arch/zaurus/dev/zusb.c:1.6
--- src/sys/arch/zaurus/dev/zusb.c:1.5	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zusb.c	Tue Jul 19 15:11:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zusb.c,v 1.5 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zusb.c,v 1.6 2011/07/19 15:11:49 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2008 Christopher Gilbert
@@ -27,18 +27,18 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zusb.c,v 1.5 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zusb.c,v 1.6 2011/07/19 15:11:49 dyoung Exp $);
 
 #include sys/param.h
 #include sys/device.h
 #include sys/kernel.h
+#include sys/bus.h
 
 #include arm/xscale/pxa2x0reg.h
 #include arm/xscale/pxa2x0var.h
 #include arm/xscale/pxa2x0_gpio.h
 
 #include machine/intr.h
-#include machine/bus.h
 
 #include zaurus/zaurus/zaurus_reg.h
 #include zaurus/zaurus/zaurus_var.h

Index: src/sys/arch/zaurus/include/Makefile
diff -u

CVS commit: src/sys/arch/zaurus/conf

2011-07-15 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Fri Jul 15 13:47:12 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
cinclude GENERIC.local


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.44 src/sys/arch/zaurus/conf/GENERIC:1.45
--- src/sys/arch/zaurus/conf/GENERIC:1.44	Thu Jun 30 20:09:38 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Fri Jul 15 13:47:12 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.44 2011/06/30 20:09:38 wiz Exp $
+#	$NetBSD: GENERIC,v 1.45 2011/07/15 13:47:12 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -362,6 +362,9 @@
 
 ld* at sdmmc?# MMC/SD/SDHC card
 
+# Pull in optional local configuration
+cinclude arch/zaurus/conf/GENERIC.local
+
 
 # Pseudo-Devices

CVS commit: src/sys/arch/zaurus/dev

2011-06-23 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu Jun 23 10:56:03 UTC 2011

Modified Files:
src/sys/arch/zaurus/dev: zaudio.c ziic.c

Log Message:
set PXA2X0_I2C_BASE to sc-sc_addr in the correct position.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/zaurus/dev/zaudio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/ziic.c

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/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.14 src/sys/arch/zaurus/dev/zaudio.c:1.15
--- src/sys/arch/zaurus/dev/zaudio.c:1.14	Wed Jun 22 16:18:54 2011
+++ src/sys/arch/zaurus/dev/zaudio.c	Thu Jun 23 10:56:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $	*/
+/*	$NetBSD: zaudio.c,v 1.15 2011/06/23 10:56:03 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $	*/
 
 /*
@@ -51,7 +51,7 @@
 #include opt_zaudio.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: zaudio.c,v 1.15 2011/06/23 10:56:03 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -344,7 +344,6 @@
 
 	sc-sc_i2s.sc_iot = pxa2x0_bs_tag;
 	sc-sc_i2s.sc_dmat = pxa2x0_bus_dma_tag;
-	sc-sc_i2c.sc_addr = PXA2X0_I2C_BASE;
 	sc-sc_i2s.sc_size = PXA2X0_I2S_SIZE;
 	if (pxa2x0_i2s_attach_sub(sc-sc_i2s)) {
 		aprint_error_dev(self, unable to attach I2S\n);

Index: src/sys/arch/zaurus/dev/ziic.c
diff -u src/sys/arch/zaurus/dev/ziic.c:1.1 src/sys/arch/zaurus/dev/ziic.c:1.2
--- src/sys/arch/zaurus/dev/ziic.c:1.1	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/ziic.c	Thu Jun 23 10:56:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ziic.c,v 1.1 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: ziic.c,v 1.2 2011/06/23 10:56:03 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ziic.c,v 1.1 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ziic.c,v 1.2 2011/06/23 10:56:03 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -80,6 +80,7 @@
 	if (strcmp(cf-cf_name, pxa-pxa_name))
 		return 0;
 
+	pxa-pxa_addr = PXA2X0_I2C_BASE;
 	pxa-pxa_size = PXA2X0_I2C_SIZE;
 	return 1;
 }
@@ -97,6 +98,7 @@
 
 	psc-sc_dev = self;
 	psc-sc_iot = pxa-pxa_iot;
+	psc-sc_addr = pxa-pxa_addr;
 	psc-sc_size = pxa-pxa_size;
 	psc-sc_flags = 0;
 	if (pxa2x0_i2c_attach_sub(psc)) {

CVS commit: src/sys/arch/zaurus/zaurus

2011-06-23 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu Jun 23 11:28:53 UTC 2011

Modified Files:
src/sys/arch/zaurus/zaurus: machdep.c

Log Message:
Reduced the use of the magic number.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/zaurus/zaurus/machdep.c

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/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.23 src/sys/arch/zaurus/zaurus/machdep.c:1.24
--- src/sys/arch/zaurus/zaurus/machdep.c:1.23	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/zaurus/machdep.c	Thu Jun 23 11:28:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.23 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: machdep.c,v 1.24 2011/06/23 11:28:53 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.23 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.24 2011/06/23 11:28:53 nonaka Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -179,8 +179,11 @@
 #endif
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
-#define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x0020)
-#define	KERNEL_VM_BASE		(KERNEL_BASE + 0x0400)
+#define	KERNEL_TEXT_OFFSET	0x0020
+#define	KERNEL_TEXT_BASE	(KERNEL_BASE + KERNEL_TEXT_OFFSET)
+#ifndef	KERNEL_VM_BASE
+#define	KERNEL_VM_BASE		(KERNEL_BASE + 0x0100)
+#endif
 
 /*
  * The range 0xc400 - 0xcfff is available for kernel VM space
@@ -235,10 +238,10 @@
 
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
-#define	KERNEL_PT_KERNEL_NUM	32
+#define	KERNEL_PT_KERNEL_NUM	((KERNEL_VM_BASE - KERNEL_BASE)  22)
 #define KERNEL_PT_VMDATA	(KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
 /* Page tables for mapping kernel VM */
-#define	KERNEL_PT_VMDATA_NUM	8	/* start with 32MB of KVM */
+#define	KERNEL_PT_VMDATA_NUM	4	/* start with 16MB of KVM */
 #define NUM_KERNEL_PTS		(KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
 
 pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
@@ -262,7 +265,8 @@
 struct bootinfo *bootinfo;
 struct btinfo_howto *bi_howto;
 
-#define	BOOTINFO_PAGE	(0xa020UL - PAGE_SIZE)
+#define	KERNEL_BASE_PHYS	(PXA2X0_SDRAM0_START + KERNEL_TEXT_OFFSET)
+#define	BOOTINFO_PAGE		(KERNEL_BASE_PHYS - PAGE_SIZE)
 
 /* Prototypes */
 void	consinit(void);
@@ -576,8 +580,8 @@
 
 	if (virt) {
 		/* XXX scoop1 registers are not page-aligned! */
-		int ofs = C3000_SCOOP1_BASE - trunc_page(C3000_SCOOP1_BASE);
-		p = (volatile uint16_t *)(ZAURUS_SCOOP1_VBASE + ofs + SCOOP_GPWR);
+		int o = C3000_SCOOP1_BASE - trunc_page(C3000_SCOOP1_BASE);
+		p = (volatile uint16_t *)(ZAURUS_SCOOP1_VBASE + o + SCOOP_GPWR);
 	} else {
 		p = (volatile uint16_t *)(C3000_SCOOP1_BASE + SCOOP_GPWR);
 	}
@@ -585,33 +589,27 @@
 	*p = ~(1  SCOOP1_IR_ON);
 }
 
-int hw_isc1000(int virt);
-int hw_isc1000(int virt)
+static int
+hw_isc1000(void)
 {
-	u_long baseaddr;
+	/* XXX scoop1 registers are not page-aligned! */
+	const u_long baseaddr = ZAURUS_SCOOP1_VBASE +
+	(C3000_SCOOP1_BASE - trunc_page(C3000_SCOOP1_BASE));
 	uint16_t mcr, cdr, csr, cpr, ccr, irr, irm, imr, isr;
 	uint16_t gpcr, gpwr, gprr;
 
-	if (virt) {
-		/* XXX scoop1 registers are not page-aligned! */
-		int ofs = C3000_SCOOP1_BASE - trunc_page(C3000_SCOOP1_BASE);
-		baseaddr = ZAURUS_SCOOP1_VBASE + ofs;
-	} else {
-		baseaddr = C3000_SCOOP1_BASE;
-	}
-
-	mcr = *(volatile uint16_t *)(baseaddr + SCOOP_MCR);
-	cdr = *(volatile uint16_t *)(baseaddr + SCOOP_CDR);
-	csr = *(volatile uint16_t *)(baseaddr + SCOOP_CSR);
-	cpr = *(volatile uint16_t *)(baseaddr + SCOOP_CPR);
-	ccr = *(volatile uint16_t *)(baseaddr + SCOOP_CCR);
-	irr = *(volatile uint16_t *)(baseaddr + SCOOP_IRR);
-	irm = *(volatile uint16_t *)(baseaddr + SCOOP_IRM);
-	imr = *(volatile uint16_t *)(baseaddr + SCOOP_IMR);
-	isr = *(volatile uint16_t *)(baseaddr + SCOOP_ISR);
-	gpcr = *(volatile uint16_t *)(baseaddr + SCOOP_GPCR);
-	gpwr = *(volatile uint16_t *)(baseaddr + SCOOP_GPWR);
-	gprr = *(volatile uint16_t *)(baseaddr + SCOOP_GPRR);
+	mcr = ioreg16_read(baseaddr + SCOOP_MCR);
+	cdr = ioreg16_read(baseaddr + SCOOP_CDR);
+	csr = ioreg16_read(baseaddr + SCOOP_CSR);
+	cpr = ioreg16_read(baseaddr + SCOOP_CPR);
+	ccr = ioreg16_read(baseaddr + SCOOP_CCR);
+	irr = ioreg16_read(baseaddr + SCOOP_IRR);
+	irm = ioreg16_read(baseaddr + SCOOP_IRM);
+	imr = ioreg16_read(baseaddr + SCOOP_IMR);
+	isr = ioreg16_read(baseaddr + SCOOP_ISR);
+	gpcr = ioreg16_read(baseaddr + SCOOP_GPCR);
+	gpwr = ioreg16_read(baseaddr + SCOOP_GPWR);
+	gprr = ioreg16_read(baseaddr + SCOOP_GPRR);
 
 	if (mcr == 0  cdr == 0  csr == 0  cpr == 0  ccr == 0 
 	irr == 0  irm == 0  imr == 0  isr == 0 
@@ -677,15 +675,15 @@
 	 * Examine the boot args string for options we need to

CVS commit: src/sys/arch/zaurus/dev

2011-06-21 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Tue Jun 21 17:17:27 UTC 2011

Modified Files:
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h

Log Message:
use pmf_event_inject() instead of call lcd_blank() directly.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/zlcdvar.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/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.12 src/sys/arch/zaurus/dev/zkbd.c:1.13
--- src/sys/arch/zaurus/dev/zkbd.c:1.12	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zkbd.c	Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $);
 
 #include opt_wsdisplay_compat.h
 #if 0	/* XXX */
@@ -44,7 +44,6 @@
 
 #include zaurus/zaurus/zaurus_var.h
 #include zaurus/dev/zkbdmap.h
-#include zaurus/dev/zlcdvar.h
 
 static const int gpio_sense_pins_c3000[] = {
 	12,
@@ -299,11 +298,10 @@
 {
 	struct zkbd_softc *sc = (struct zkbd_softc *)v;
 	int i, j, col, pin, type, keysdown = 0;
-	int stuck;
 	int keystate;
 	int s;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-	int npress = 0, ncbuf = 0, c;
+	int npress = 0, ncbuf = 0;
 	char cbuf[MAXKEYS * 2];
 #endif
 
@@ -374,7 +372,7 @@
 		(sc-sc_keystate[14] ? (1  2) : 0)); /* 'alt' */
 
 	for (i = 0; i  sc-sc_nsense * sc-sc_nstrobe; i++) {
-		stuck = 0;
+		int stuck = 0;
 		/* extend  xt_keymap to do this faster. */
 		/* ignore 'stuck' keys' */
 		for (j = 0; j  __arraycount(stuck_keys); j++) {
@@ -390,9 +388,9 @@
 		keysdown |= keystate; /* if any keys held */
 
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-		if (sc-sc_polling == 0  sc-sc_rawkbd) {
-			if ((keystate) || (sc-sc_okeystate[i] != keystate)) {
-c = sc-sc_xt_keymap[i];
+		if (!sc-sc_polling  sc-sc_rawkbd) {
+			if (keystate || sc-sc_okeystate[i] != keystate) {
+int c = sc-sc_xt_keymap[i];
 if (c  0x80) {
 	cbuf[ncbuf++] = 0xe0;
 }
@@ -412,7 +410,7 @@
 		}
 #endif
 
-		if ((!sc-sc_rawkbd)  (sc-sc_okeystate[i] != keystate)) {
+		if (!sc-sc_rawkbd  (sc-sc_okeystate[i] != keystate)) {
 			type = keystate ? WSCONS_EVENT_KEY_DOWN :
 			WSCONS_EVENT_KEY_UP;
 
@@ -428,7 +426,7 @@
 	}
 
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-	if (sc-sc_polling == 0  sc-sc_rawkbd) {
+	if (!sc-sc_polling  sc-sc_rawkbd) {
 		wskbd_rawinput(sc-sc_wskbddev, cbuf, ncbuf);
 		sc-sc_nrep = npress;
 		if (npress != 0)
@@ -513,9 +511,9 @@
 		if (lid_suspend)
 			apm_suspends++;
 #endif
-		lcd_blank(1);
+		pmf_event_inject(NULL, PMFE_DISPLAY_OFF);
 	} else {
-		lcd_blank(0);
+		pmf_event_inject(NULL, PMFE_DISPLAY_ON);
 	}
 
 	return 1;
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.12 src/sys/arch/zaurus/dev/zlcd.c:1.13
--- src/sys/arch/zaurus/dev/zlcd.c:1.12	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zlcd.c	Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $	*/
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 
@@ -43,7 +43,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.12 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -169,6 +169,7 @@
 static void	lcd_set_brightness_internal(int);
 static int	lcd_get_backlight(void);
 static void	lcd_set_backlight(int);
+static void	lcd_blank(int);
 
 static int
 lcd_match(device_t parent, cfdata_t cf, void *aux)
@@ -266,14 +267,12 @@
 {
 
 	lcd_blank(0);
-	lcd_set_backlight(1);
 }
 
 static void
 lcd_display_off(device_t dv)
 {
 
-	lcd_set_backlight(0);
 	lcd_blank(1);
 }
 
@@ -501,7 +500,7 @@
 	else if (newval  maxval)
 		newval = maxval;
 
-	if (lcd_get_backlight()  !lcdisblank)
+	if (lcdislit  !lcdisblank)
 		lcd_set_brightness_internal(newval);
 
 	if (newval  0)
@@ -565,7 +564,7 @@
 	}
 }
 
-void
+static void
 lcd_blank(int blank)
 {
 

Index: src/sys/arch/zaurus/dev/zlcdvar.h
diff -u src/sys/arch/zaurus/dev/zlcdvar.h:1.1 src/sys/arch/zaurus/dev/zlcdvar.h:1.2
--- src/sys/arch/zaurus/dev/zlcdvar.h:1.1	Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zlcdvar.h	Tue Jun 21 17:17:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcdvar.h,v 1.1 2011/06/19 16:20:09 nonaka Exp $	*/
+/*	$NetBSD: zlcdvar.h,v 1.2 2011/06/21 17:17:27 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD

CVS commit: src/sys/arch/zaurus/dev

2011-06-21 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Tue Jun 21 18:13:20 UTC 2011

Modified Files:
src/sys/arch/zaurus/dev: zkbd.c zlcd.c zlcdvar.h

Log Message:
backout previous.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/dev/zlcdvar.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/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.13 src/sys/arch/zaurus/dev/zkbd.c:1.14
--- src/sys/arch/zaurus/dev/zkbd.c:1.13	Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zkbd.c	Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $);
 
 #include opt_wsdisplay_compat.h
 #if 0	/* XXX */
@@ -44,6 +44,7 @@
 
 #include zaurus/zaurus/zaurus_var.h
 #include zaurus/dev/zkbdmap.h
+#include zaurus/dev/zlcdvar.h
 
 static const int gpio_sense_pins_c3000[] = {
 	12,
@@ -298,10 +299,11 @@
 {
 	struct zkbd_softc *sc = (struct zkbd_softc *)v;
 	int i, j, col, pin, type, keysdown = 0;
+	int stuck;
 	int keystate;
 	int s;
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-	int npress = 0, ncbuf = 0;
+	int npress = 0, ncbuf = 0, c;
 	char cbuf[MAXKEYS * 2];
 #endif
 
@@ -372,7 +374,7 @@
 		(sc-sc_keystate[14] ? (1  2) : 0)); /* 'alt' */
 
 	for (i = 0; i  sc-sc_nsense * sc-sc_nstrobe; i++) {
-		int stuck = 0;
+		stuck = 0;
 		/* extend  xt_keymap to do this faster. */
 		/* ignore 'stuck' keys' */
 		for (j = 0; j  __arraycount(stuck_keys); j++) {
@@ -388,9 +390,9 @@
 		keysdown |= keystate; /* if any keys held */
 
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-		if (!sc-sc_polling  sc-sc_rawkbd) {
-			if (keystate || sc-sc_okeystate[i] != keystate) {
-int c = sc-sc_xt_keymap[i];
+		if (sc-sc_polling == 0  sc-sc_rawkbd) {
+			if ((keystate) || (sc-sc_okeystate[i] != keystate)) {
+c = sc-sc_xt_keymap[i];
 if (c  0x80) {
 	cbuf[ncbuf++] = 0xe0;
 }
@@ -410,7 +412,7 @@
 		}
 #endif
 
-		if (!sc-sc_rawkbd  (sc-sc_okeystate[i] != keystate)) {
+		if ((!sc-sc_rawkbd)  (sc-sc_okeystate[i] != keystate)) {
 			type = keystate ? WSCONS_EVENT_KEY_DOWN :
 			WSCONS_EVENT_KEY_UP;
 
@@ -426,7 +428,7 @@
 	}
 
 #ifdef WSDISPLAY_COMPAT_RAWKBD
-	if (!sc-sc_polling  sc-sc_rawkbd) {
+	if (sc-sc_polling == 0  sc-sc_rawkbd) {
 		wskbd_rawinput(sc-sc_wskbddev, cbuf, ncbuf);
 		sc-sc_nrep = npress;
 		if (npress != 0)
@@ -511,9 +513,9 @@
 		if (lid_suspend)
 			apm_suspends++;
 #endif
-		pmf_event_inject(NULL, PMFE_DISPLAY_OFF);
+		lcd_blank(1);
 	} else {
-		pmf_event_inject(NULL, PMFE_DISPLAY_ON);
+		lcd_blank(0);
 	}
 
 	return 1;
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.13 src/sys/arch/zaurus/dev/zlcd.c:1.14
--- src/sys/arch/zaurus/dev/zlcd.c:1.13	Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zlcd.c	Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $	*/
+/*	$NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $	*/
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 
@@ -43,7 +43,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.13 2011/06/21 17:17:27 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -169,7 +169,6 @@
 static void	lcd_set_brightness_internal(int);
 static int	lcd_get_backlight(void);
 static void	lcd_set_backlight(int);
-static void	lcd_blank(int);
 
 static int
 lcd_match(device_t parent, cfdata_t cf, void *aux)
@@ -267,12 +266,14 @@
 {
 
 	lcd_blank(0);
+	lcd_set_backlight(1);
 }
 
 static void
 lcd_display_off(device_t dv)
 {
 
+	lcd_set_backlight(0);
 	lcd_blank(1);
 }
 
@@ -500,7 +501,7 @@
 	else if (newval  maxval)
 		newval = maxval;
 
-	if (lcdislit  !lcdisblank)
+	if (lcd_get_backlight()  !lcdisblank)
 		lcd_set_brightness_internal(newval);
 
 	if (newval  0)
@@ -564,7 +565,7 @@
 	}
 }
 
-static void
+void
 lcd_blank(int blank)
 {
 

Index: src/sys/arch/zaurus/dev/zlcdvar.h
diff -u src/sys/arch/zaurus/dev/zlcdvar.h:1.2 src/sys/arch/zaurus/dev/zlcdvar.h:1.3
--- src/sys/arch/zaurus/dev/zlcdvar.h:1.2	Tue Jun 21 17:17:27 2011
+++ src/sys/arch/zaurus/dev/zlcdvar.h	Tue Jun 21 18:13:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcdvar.h,v 1.2 2011/06/21 17:17:27 nonaka Exp $	*/
+/*	$NetBSD: zlcdvar.h,v 1.3 2011/06/21 18:13:19 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,6 +32,13 @@
 #ifndef

CVS commit: src/sys/arch/zaurus/stand/zboot

2011-06-20 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Mon Jun 20 12:39:21 UTC 2011

Modified Files:
src/sys/arch/zaurus/stand/zboot: boot.c compat_linux.h diskprobe.c
pathnames.h unixdev.h unixsys.S version

Log Message:
support SL-C1000.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/stand/zboot/boot.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/stand/zboot/compat_linux.h \
src/sys/arch/zaurus/stand/zboot/diskprobe.c \
src/sys/arch/zaurus/stand/zboot/pathnames.h \
src/sys/arch/zaurus/stand/zboot/unixdev.h \
src/sys/arch/zaurus/stand/zboot/unixsys.S \
src/sys/arch/zaurus/stand/zboot/version

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/zaurus/stand/zboot/boot.c
diff -u src/sys/arch/zaurus/stand/zboot/boot.c:1.2 src/sys/arch/zaurus/stand/zboot/boot.c:1.3
--- src/sys/arch/zaurus/stand/zboot/boot.c:1.2	Sat Jan 22 19:19:25 2011
+++ src/sys/arch/zaurus/stand/zboot/boot.c	Mon Jun 20 12:39:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.2 2011/01/22 19:19:25 joerg Exp $	*/
+/*	$NetBSD: boot.c,v 1.3 2011/06/20 12:39:21 nonaka Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
@@ -128,7 +128,7 @@
 			} while (isnum(fname[i]));
 		}
 
-#define isvalidpart(c) ((c) = 'a'  (c) = 'a' + MAXPARTITIONS)
+#define isvalidpart(c) ((c) = 'a'  (c)  'a' + MAXPARTITIONS)
 		if (i  devlen) {
 			if (!isvalidpart(fname[i]))
 return (EPART);

Index: src/sys/arch/zaurus/stand/zboot/compat_linux.h
diff -u src/sys/arch/zaurus/stand/zboot/compat_linux.h:1.1 src/sys/arch/zaurus/stand/zboot/compat_linux.h:1.2
--- src/sys/arch/zaurus/stand/zboot/compat_linux.h:1.1	Mon Mar  2 09:33:02 2009
+++ src/sys/arch/zaurus/stand/zboot/compat_linux.h	Mon Jun 20 12:39:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_linux.h,v 1.1 2009/03/02 09:33:02 nonaka Exp $	*/
+/*	$NetBSD: compat_linux.h,v 1.2 2011/06/20 12:39:21 nonaka Exp $	*/
 /*	$OpenBSD: compat_linux.h,v 1.8 2007/06/16 00:26:33 deraadt Exp $	*/
 
 /*
@@ -60,6 +60,7 @@
 #define __NR_ioctl		(__NR_SYSCALL_BASE + LINUX_SYS_ioctl)
 #define __NR_select		(__NR_SYSCALL_BASE + LINUX_SYS_select)
 #define __NR_stat		(__NR_SYSCALL_BASE + LINUX_SYS_stat)
+#define __NR_fstat		(__NR_SYSCALL_BASE + LINUX_SYS_fstat)
 #define __NR_syscall		(__NR_SYSCALL_BASE + 113)
 
 #undef	SYS_select
Index: src/sys/arch/zaurus/stand/zboot/diskprobe.c
diff -u src/sys/arch/zaurus/stand/zboot/diskprobe.c:1.1 src/sys/arch/zaurus/stand/zboot/diskprobe.c:1.2
--- src/sys/arch/zaurus/stand/zboot/diskprobe.c:1.1	Mon Mar  2 09:33:02 2009
+++ src/sys/arch/zaurus/stand/zboot/diskprobe.c	Mon Jun 20 12:39:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: diskprobe.c,v 1.1 2009/03/02 09:33:02 nonaka Exp $	*/
+/*	$NetBSD: diskprobe.c,v 1.2 2011/06/20 12:39:21 nonaka Exp $	*/
 /*	$OpenBSD: diskprobe.c,v 1.3 2006/10/13 00:00:55 krw Exp $	*/
 
 /*
@@ -40,14 +40,20 @@
 #include boot.h
 #include disk.h
 #include unixdev.h
+#include pathnames.h
 #include compat_linux.h
 
+/* All the info on /proc/partitions */
+struct partinfo {
+	char devname[MAXDEVNAME];
+	TAILQ_ENTRY(partinfo) list;
+};
+TAILQ_HEAD(partlist_lh, partinfo);
+struct partlist_lh partlist;
+
 /* Disk spin-up wait timeout. */
 static u_int timeout = 10;
 
-/* Local Prototypes */
-static void hardprobe(char *buf, size_t bufsiz);
-
 /* List of disk devices we found/probed */
 struct disklist_lh disklist;
 
@@ -129,11 +135,130 @@
 		strlcat(buf, none..., bufsiz);
 }
 
+static void
+getpartitions(void)
+{
+	struct linux_stat sb;
+	struct partinfo *pip;
+	char *bc, *top, *next, *p, *q;
+	int fd, off, len;
+
+	fd = uopen(_PATH_PARTITIONS, LINUX_O_RDONLY);
+	if (fd == -1)
+		return;
+
+	if (ufstat(fd, sb)  0) {
+		uclose(fd);
+		return;
+	}
+
+	bc = alloc(sb.lst_size + 1);
+	if (bc == NULL) {
+		printf(Could not allocate memory for %s\n, _PATH_PARTITIONS);
+		uclose(fd);
+		return;
+	}
+
+	off = 0;
+	do {
+		len = uread(fd, bc + off, 1024);
+		if (len = 0)
+			break;
+		off += len;
+	} while (len  0);
+	bc[off] = '\0';
+
+	uclose(fd);
+
+	/* bc now contains the whole /proc/partitions */
+	for (p = bc; *p != '\0'; p = next) {
+		top = p;
+
+		/* readline */
+		for (; *p != '\0'  *p != '\r'  *p != '\n'; p++)
+			continue;
+		if (*p == '\r') {
+			*p++ = '\0';
+			if (*p == '\n')
+*p++ = '\0';
+		} else if (*p == '\n')
+			*p++ = '\0';
+		next = p;
+
+		/*
+		 * /proc/partitions format:
+		 * major minor  #blocks  name
+		 *
+		 *   %d%d %d %s
+		 *
+		 * e.g.:
+		 * major minor  #blocks  name
+		 *
+		 *   22 07962192 hdc
+		 *   22 1  10079 hdc1
+		 *   60 0 965120 mmcda
+		 *   60 1  43312 mmcda1
+		 */
+
+		/* trailing space */
+		for (p = top; *p == ' ' || *p == '\t'; p++)
+			continue;
+
+		/* major */
+		for (; isdigit(*p); p++)
+			continue;
+		if (*p != ' '  *p != '\t')
+			continue;	/* next line */
+		for (; *p == ' ' || *p == '\t'; p++)
+

CVS commit: src/sys/arch/zaurus/dev

2011-06-19 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sun Jun 19 09:26:29 UTC 2011

Removed Files:
src/sys/arch/zaurus/dev: zapm.h

Log Message:
Delete unused file.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 src/sys/arch/zaurus/dev/zapm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/zaurus/conf

2011-05-20 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri May 20 06:26:58 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Comment out options COMPAT_09, COMAPT_10, COMPAT_11, and COMPAT_12.
(no NetBSD/arm32 binary release before 1.3)


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.36 src/sys/arch/zaurus/conf/GENERIC:1.37
--- src/sys/arch/zaurus/conf/GENERIC:1.36	Sat May 14 15:02:29 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Fri May 20 06:26:58 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.36 2011/05/14 15:02:29 nonaka Exp $
+#	$NetBSD: GENERIC,v 1.37 2011/05/20 06:26:58 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -85,10 +85,10 @@
 options 	INET6		# IPv6
 
 # Compatibility options
-options 	COMPAT_09	# NetBSD 0.9,
-options 	COMPAT_10	# NetBSD 1.0,
-options 	COMPAT_11	# NetBSD 1.1,
-options 	COMPAT_12	# NetBSD 1.2,
+#options 	COMPAT_09	# NetBSD 0.9,
+#options 	COMPAT_10	# NetBSD 1.0,
+#options 	COMPAT_11	# NetBSD 1.1,
+#options 	COMPAT_12	# NetBSD 1.2,
 options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_15	# NetBSD 1.5,

CVS commit: src/sys/arch/zaurus/conf

2011-05-20 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri May 20 07:47:53 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: INSTALL

Log Message:
Shrink INSTALL kerenl more:
 - disable KERNFS (install ramdisk uses /sbin/dmesg directly)
 - disable mice, audio, uk(4), and wsfont(4)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/conf/INSTALL

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/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.7 src/sys/arch/zaurus/conf/INSTALL:1.8
--- src/sys/arch/zaurus/conf/INSTALL:1.7	Thu May  5 09:07:59 2011
+++ src/sys/arch/zaurus/conf/INSTALL	Fri May 20 07:47:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.7 2011/05/05 09:07:59 nonaka Exp $
+# $NetBSD: INSTALL,v 1.8 2011/05/20 07:47:53 tsutsui Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -20,6 +20,7 @@
 
 no options 		INSECURE
 
+no file-system		KERNFS
 no file-system		NULLFS
 no file-system		PROCFS
 no file-system		PTYFS
@@ -43,8 +44,20 @@
 no options 		DDB_HISTORY_SIZE
 no options 		SYMTAB_SPACE
 
+no ztp0 at pxaip?
+no wsmouse* at ztp?
+
+no zaudio0 at pxaip?
+no audio* at zaudio?
+
+no ums* at uhidev?
+no wsmouse* at ums?
+
+no uk* at scsibus?
+
 no pseudo-device	vnd
 no options 		VND_COMPRESSION
 no pseudo-device	accf_data
 no pseudo-device	accf_http
 no pseudo-device	ksyms
+no pseudo-device	wsfont

CVS commit: src/sys/arch/zaurus/conf

2011-05-20 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri May 20 07:49:31 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Enable cd* at atapibus? for some USB CD/DVD drives.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.37 src/sys/arch/zaurus/conf/GENERIC:1.38
--- src/sys/arch/zaurus/conf/GENERIC:1.37	Fri May 20 06:26:58 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Fri May 20 07:49:31 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.37 2011/05/20 06:26:58 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.38 2011/05/20 07:49:31 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -289,6 +289,15 @@
 cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
 uk*	at scsibus? target ? lun ?	# SCSI unknown
 
+# ATAPI bus support
+atapibus* at atapi?
+
+# ATAPI devices
+cd*	at atapibus? drive ?		# ATAPI CD-ROM drives
+#sd*	at atapibus? drive ?		# ATAPI disk drives
+#st*	at atapibus? drive ?		# ATAPI tape drives
+#uk*	at atapibus? drive ?		# ATAPI unknown
+
 # USB audio
 #uaudio* at uhub? port ? configuration ?

CVS commit: src/sys/arch/zaurus/conf

2011-05-20 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri May 20 09:01:39 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Move pseudo-device bpfilter to proper place.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.38 src/sys/arch/zaurus/conf/GENERIC:1.39
--- src/sys/arch/zaurus/conf/GENERIC:1.38	Fri May 20 07:49:31 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Fri May 20 09:01:39 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.38 2011/05/20 07:49:31 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.39 2011/05/20 09:01:39 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -360,6 +360,7 @@
 options 	VND_COMPRESSION		# compressed vnd(4)
 
 # network pseudo-devices
+pseudo-device   bpfilter# Berkeley packet filter
 pseudo-device	loop			# network loopback
 
 #
@@ -386,4 +387,3 @@
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse  keyboard multiplexor
 pseudo-device	wsfont
-pseudo-device   bpfilter# Berkeley packet filter

CVS commit: src/sys/arch/zaurus/conf

2011-05-20 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri May 20 09:06:02 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Remove unnecessary count arguments from some pseudo-devices.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.39 src/sys/arch/zaurus/conf/GENERIC:1.40
--- src/sys/arch/zaurus/conf/GENERIC:1.39	Fri May 20 09:01:39 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Fri May 20 09:06:02 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.39 2011/05/20 09:01:39 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.40 2011/05/20 09:06:02 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -356,7 +356,7 @@
 
 # disk/mass storage pseudo-devices
 pseudo-device	md			# memory disk device (ramdisk)
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 options 	VND_COMPRESSION		# compressed vnd(4)
 
 # network pseudo-devices
@@ -382,7 +382,7 @@
 #pseudo-device	nsmb			# experimental - SMB requester
 
 # a pseudo device needed for verified exec
-#pseudo-device  veriexec1
+#pseudo-device  veriexec
 
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse  keyboard multiplexor

CVS commit: src/sys/arch/zaurus/conf

2011-05-20 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri May 20 09:25:15 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Add (commented out) options MODULAR.  Just works fine as other arm ports.

This will be mandatory because zbsdmod.o loader has size (5MB) restriction.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.40 src/sys/arch/zaurus/conf/GENERIC:1.41
--- src/sys/arch/zaurus/conf/GENERIC:1.40	Fri May 20 09:06:02 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Fri May 20 09:25:15 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.40 2011/05/20 09:06:02 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.41 2011/05/20 09:25:15 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -117,6 +117,9 @@
 options 	SYSVSHM		# System V-like memory sharing
 options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
 
+# Loadable kernel module support
+#options 	MODULAR		# new style module(7) framework
+
 # Device options
 
 # Miscellaneous kernel options

CVS commit: src/sys/arch/zaurus/conf

2011-05-20 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Fri May 20 21:56:46 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Uncommented out file-system CD9660.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.41 src/sys/arch/zaurus/conf/GENERIC:1.42
--- src/sys/arch/zaurus/conf/GENERIC:1.41	Fri May 20 09:25:15 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Fri May 20 21:56:46 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.41 2011/05/20 09:25:15 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.42 2011/05/20 21:56:46 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -54,7 +54,7 @@
 file-system	MFS		# memory file system
 file-system	NFS		# Network File System client
 #file-system	NTFS		# Windows/NT file system (experimental)
-#file-system	CD9660		# ISO 9660 + Rock Ridge file system
+file-system	CD9660		# ISO 9660 + Rock Ridge file system
 file-system	MSDOSFS		# MS-DOS file system
 #file-system	FDESC		# /dev/fd
 file-system	KERNFS		# /kern

CVS commit: src/sys/arch/zaurus/conf

2011-05-14 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat May 14 15:02:29 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Use PXA250 compat. rtc.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.35 src/sys/arch/zaurus/conf/GENERIC:1.36
--- src/sys/arch/zaurus/conf/GENERIC:1.35	Thu May  5 09:07:59 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Sat May 14 15:02:29 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.35 2011/05/05 09:07:59 nonaka Exp $
+#	$NetBSD: GENERIC,v 1.36 2011/05/14 15:02:29 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -178,9 +178,9 @@
 # integrated peripherals
 pxaip0 at mainbus?
 
-pxaintc0 at pxaip?			# interrupt controller
-pxagpio0 at pxaip?			# GPIO
-pxartc0 at pxaip? addr 0x4090	# RTC
+pxaintc0 at pxaip?# interrupt controller
+pxagpio0 at pxaip?# GPIO
+pxartc0 at pxaip? addr 0x4090 size 0x10	# RTC
 
 # DMAC support
 pxadmac0 at pxaip? addr 0x4000 intr 25

CVS commit: src/sys/arch/zaurus/zaurus

2011-05-05 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Thu May  5 08:46:12 UTC 2011

Modified Files:
src/sys/arch/zaurus/zaurus: autoconf.c

Log Message:
Don't check device numbers.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/zaurus/autoconf.c

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/zaurus/zaurus/autoconf.c
diff -u src/sys/arch/zaurus/zaurus/autoconf.c:1.9 src/sys/arch/zaurus/zaurus/autoconf.c:1.10
--- src/sys/arch/zaurus/zaurus/autoconf.c:1.9	Thu Nov  5 18:17:34 2009
+++ src/sys/arch/zaurus/zaurus/autoconf.c	Thu May  5 08:46:12 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.9 2009/11/05 18:17:34 dyoung Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.10 2011/05/05 08:46:12 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.9 2009/11/05 18:17:34 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.10 2011/05/05 08:46:12 nonaka Exp $);
 
 #include opt_md.h
 
@@ -192,15 +192,8 @@
 continue;
 
 			if (is_valid_disk(dv)) {
-/*
- * Don't trust BIOS device numbers, try
- * to match the information passed by the
- * boot loader instead.
- */
-if ((bid-biosdev  0x80) == 0 ||
-match_bootdisk(dv, bid) == 0)
-	continue;
-goto bootdisk_found;
+if (match_bootdisk(dv, bid))
+	goto bootdisk_found;
 			}
 			continue;

CVS commit: src/sys/arch/zaurus/conf

2011-02-13 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sun Feb 13 14:28:29 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC

Log Message:
Add options PXA2X0_LCD_WRITETHROUGH that improves console speed.
Tested on SL-C1000.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/zaurus/conf/GENERIC

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.32 src/sys/arch/zaurus/conf/GENERIC:1.33
--- src/sys/arch/zaurus/conf/GENERIC:1.32	Sun Feb 13 05:36:34 2011
+++ src/sys/arch/zaurus/conf/GENERIC	Sun Feb 13 14:28:29 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.32 2011/02/13 05:36:34 nonaka Exp $
+#	$NetBSD: GENERIC,v 1.33 2011/02/13 14:28:29 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -204,6 +204,7 @@
 
 # LCD
 lcd0 at pxaip?
+options 	PXA2X0_LCD_WRITETHROUGH
 wsdisplay* at lcd? console ?
 
 # Audio

CVS commit: src/sys/arch/zaurus

2011-02-12 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sun Feb 13 05:36:34 UTC 2011

Modified Files:
src/sys/arch/zaurus/conf: GENERIC
src/sys/arch/zaurus/zaurus: machdep.c

Log Message:
support FFUARTCONSOLE.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/zaurus/zaurus/machdep.c

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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.31 src/sys/arch/zaurus/conf/GENERIC:1.32
--- src/sys/arch/zaurus/conf/GENERIC:1.31	Tue Nov 23 11:14:07 2010
+++ src/sys/arch/zaurus/conf/GENERIC	Sun Feb 13 05:36:34 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.31 2010/11/23 11:14:07 hannken Exp $
+#	$NetBSD: GENERIC,v 1.32 2011/02/13 05:36:34 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -215,6 +215,7 @@
 
 # integrated 16550 UARTs
 options 	COM_PXA2X0
+#options 	FFUARTCONSOLE
 com0 at pxaip?  addr 0x4010 intr 22	# Full Function UART
 com1 at pxaip?  addr 0x4020 intr 21	# Bluetooth UART
 com2 at pxaip?  addr 0x4070 intr 20	# Standard UART (for IrDA)

Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.21 src/sys/arch/zaurus/zaurus/machdep.c:1.22
--- src/sys/arch/zaurus/zaurus/machdep.c:1.21	Sun Nov 28 08:23:25 2010
+++ src/sys/arch/zaurus/zaurus/machdep.c	Sun Feb 13 05:36:34 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.21 2010/11/28 08:23:25 hannken Exp $	*/
+/*	$NetBSD: machdep.c,v 1.22 2011/02/13 05:36:34 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.21 2010/11/28 08:23:25 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.22 2011/02/13 05:36:34 nonaka Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -242,7 +242,12 @@
 
 pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
 
-const char *console = glass;
+const char *console =
+#ifdef FFUARTCONSOLE
+	ffuart;
+#else
+	glass;
+#endif
 int glass_console = 0;
 
 #ifdef KLOADER

CVS commit: src/sys/arch/zaurus/stand/zboot

2011-01-23 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sun Jan 23 13:17:02 UTC 2011

Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile

Log Message:
Defer bsd.own.mk include after NOMAN.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/stand/zboot/Makefile

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/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.5 src/sys/arch/zaurus/stand/zboot/Makefile:1.6
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.5	Sat Jan 22 19:19:25 2011
+++ src/sys/arch/zaurus/stand/zboot/Makefile	Sun Jan 23 13:17:02 2011
@@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2011/01/22 19:19:25 joerg Exp $
-
-.include bsd.own.mk
+#	$NetBSD: Makefile,v 1.6 2011/01/23 13:17:02 joerg Exp $
 
 PROG=		zboot
 
@@ -13,6 +11,8 @@
 
 NOMAN=		# defined
 
+.include bsd.own.mk
+
 CFLAGS+=	-Wall -Wno-main
 CFLAGS+=	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 CFLAGS+=	-fno-stack-protector -fno-builtin -ffreestanding

CVS commit: src/sys/arch/zaurus/stand/zbsdmod

2010-12-26 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sun Dec 26 09:03:56 UTC 2010

Modified Files:
src/sys/arch/zaurus/stand/zbsdmod: zbsdmod.c

Log Message:
Add missing argument to printk(). (from OpenBSD)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c

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/zaurus/stand/zbsdmod/zbsdmod.c
diff -u src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.4 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.5
--- src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.4	Mon Mar  2 09:33:02 2009
+++ src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c	Sun Dec 26 09:03:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: zbsdmod.c,v 1.4 2009/03/02 09:33:02 nonaka Exp $	*/
+/*	$NetBSD: zbsdmod.c,v 1.5 2010/12/26 09:03:56 nonaka Exp $	*/
 /*	$OpenBSD: zbsdmod.c,v 1.7 2005/05/02 02:45:29 uwe Exp $	*/
 
 /*
@@ -273,7 +273,7 @@
 	rc = register_chrdev(ZBOOTDEV_MAJOR, ZBOOTDEV_NAME, fops);
 	if (rc != 0) {
 		printk(%s: register_chrdev(%d, ...): error %d\n,
-		ZBOOTMOD_NAME, -rc);
+		ZBOOTMOD_NAME, ZBOOTDEV_MAJOR, -rc);
 		return 1;
 	}
 
@@ -346,7 +346,7 @@
 		return -EBUSY;
 
 	if (position  0) {
-		printk(%s: loaded %d bytes\n, ZBOOTDEV_NAME,
+		printk(%s: loaded %ld bytes\n, ZBOOTDEV_NAME,
 		position);
 
 		if (position  BOOTINFO_MAXSIZE) {

CVS commit: src/sys/arch/zaurus/dev

2010-04-06 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Tue Apr  6 15:56:14 UTC 2010

Modified Files:
src/sys/arch/zaurus/dev: zmci.c

Log Message:
Enable SD 4bit bus width mode.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/zmci.c

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/zaurus/dev/zmci.c
diff -u src/sys/arch/zaurus/dev/zmci.c:1.1 src/sys/arch/zaurus/dev/zmci.c:1.2
--- src/sys/arch/zaurus/dev/zmci.c:1.1	Tue Apr 21 03:00:30 2009
+++ src/sys/arch/zaurus/dev/zmci.c	Tue Apr  6 15:56:14 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: zmci.c,v 1.1 2009/04/21 03:00:30 nonaka Exp $	*/
+/*	$NetBSD: zmci.c,v 1.2 2010/04/06 15:56:14 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2006-2008 NONAKA Kimihiro non...@netbsd.org
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zmci.c,v 1.1 2009/04/21 03:00:30 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zmci.c,v 1.2 2010/04/06 15:56:14 nonaka Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -119,7 +119,7 @@
 	sc-sc.sc_tag.set_power = zmci_set_power;
 	sc-sc.sc_tag.card_detect = zmci_card_detect;
 	sc-sc.sc_tag.write_protect = zmci_write_protect;
-	sc-sc.sc_caps = 0;
+	sc-sc.sc_caps = PMC_CAPS_4BIT;
 
 	if (pxamci_attach_sub(self, pxa)) {
 		aprint_error_dev(self, unable to attach MMC controller\n);

CVS commit: src/sys/arch/zaurus/dev

2010-01-08 Thread David Young 
Module Name:src
Committed By:   dyoung
Date:   Fri Jan  8 19:42:11 UTC 2010

Modified Files:
src/sys/arch/zaurus/dev: zaudio.c zkbd.c zlcd.c zssp.c ztp.c

Log Message:
Expand PMF_FN_* macros.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/dev/zaudio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/dev/ztp.c

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/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.10 src/sys/arch/zaurus/dev/zaudio.c:1.11
--- src/sys/arch/zaurus/dev/zaudio.c:1.10	Sat Apr 18 05:20:21 2009
+++ src/sys/arch/zaurus/dev/zaudio.c	Fri Jan  8 19:42:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $	*/
+/*	$NetBSD: zaudio.c,v 1.11 2010/01/08 19:42:11 dyoung Exp $	*/
 /*	$OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $	*/
 
 /*
@@ -49,7 +49,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zaudio.c,v 1.11 2010/01/08 19:42:11 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -84,8 +84,8 @@
 
 static int	zaudio_match(device_t, cfdata_t, void *);
 static void	zaudio_attach(device_t, device_t, void *);
-static bool	zaudio_suspend(device_t dv PMF_FN_ARGS);
-static bool	zaudio_resume(device_t dv PMF_FN_ARGS);
+static bool	zaudio_suspend(device_t dv, pmf_qual_t);
+static bool	zaudio_resume(device_t dv, pmf_qual_t);
 
 #define ZAUDIO_OP_SPKR	0
 #define ZAUDIO_OP_HP	1
@@ -369,7 +369,7 @@
 }
 
 static bool
-zaudio_suspend(device_t dv PMF_FN_ARGS)
+zaudio_suspend(device_t dv, pmf_qual_t qual)
 {
 	struct zaudio_softc *sc = device_private(dv);
 
@@ -380,7 +380,7 @@
 }
 
 static bool
-zaudio_resume(device_t dv PMF_FN_ARGS)
+zaudio_resume(device_t dv, pmf_qual_t qual)
 {
 	struct zaudio_softc *sc = device_private(dv);
 

Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.9 src/sys/arch/zaurus/dev/zkbd.c:1.10
--- src/sys/arch/zaurus/dev/zkbd.c:1.9	Thu Jan 29 16:00:33 2009
+++ src/sys/arch/zaurus/dev/zkbd.c	Fri Jan  8 19:42:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: zkbd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $	*/
+/*	$NetBSD: zkbd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $	*/
 /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zkbd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $);
 
 #include opt_wsdisplay_compat.h
 #include lcd.h
@@ -131,7 +131,7 @@
 static int	zkbd_on(void *v);
 static int	zkbd_sync(void *v);
 static int	zkbd_hinge(void *v);
-static bool	zkbd_resume(device_t dv PMF_FN_ARGS);
+static bool	zkbd_resume(device_t dv, pmf_qual_t);
 
 int zkbd_modstate;
 
@@ -594,7 +594,7 @@
 }
 
 static bool
-zkbd_resume(device_t dv PMF_FN_ARGS)
+zkbd_resume(device_t dv, pmf_qual_t qual)
 {
 	struct zkbd_softc *sc = device_private(dv);
 
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.9 src/sys/arch/zaurus/dev/zlcd.c:1.10
--- src/sys/arch/zaurus/dev/zlcd.c:1.9	Thu Jan 29 16:00:33 2009
+++ src/sys/arch/zaurus/dev/zlcd.c	Fri Jan  8 19:42:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: zlcd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $	*/
+/*	$NetBSD: zlcd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $	*/
 /*	$OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $	*/
 /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
 
@@ -43,7 +43,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -154,8 +154,8 @@
 CFATTACH_DECL_NEW(zlcd, sizeof(struct pxa2x0_lcd_softc),
 	lcd_match, lcd_attach, NULL, NULL);
 
-static bool	lcd_suspend(device_t dv PMF_FN_ARGS);
-static bool	lcd_resume(device_t dv PMF_FN_ARGS);
+static bool	lcd_suspend(device_t dv, pmf_qual_t);
+static bool	lcd_resume(device_t dv, pmf_qual_t);
 
 void	lcd_cnattach(void);
 int	lcd_max_brightness(void);
@@ -208,7 +208,7 @@
  * power management
  */
 static bool
-lcd_suspend(device_t dv PMF_FN_ARGS)
+lcd_suspend(device_t dv, pmf_qual_t qual)
 {
 	struct pxa2x0_lcd_softc *sc = device_private(dv);
 
@@ -219,7 +219,7 @@
 }
 
 static bool
-lcd_resume(device_t dv PMF_FN_ARGS)
+lcd_resume(device_t dv, pmf_qual_t qual)
 {
 	struct pxa2x0_lcd_softc *sc = device_private(dv);
 

Index: src/sys/arch/zaurus/dev/zssp.c
diff -u src/sys/arch/zaurus/dev/zssp.c:1.7 src/sys/arch/zaurus/dev/zssp.c:1.8
--- src/sys/arch/zaurus/dev/zssp.c:1.7	Wed Mar 11 09:10:39 2009
+++ src/sys/arch/zaurus/dev/zssp.c	Fri Jan  8 19:42:11 2010
@@

CVS commit: src/sys/arch/zaurus/dev

2009-12-12 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat Dec 12 11:38:45 UTC 2009

Modified Files:
src/sys/arch/zaurus/dev: zapm.c

Log Message:
use APM_BATT_FLAG_CHARGING.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/dev/zapm.c

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/zaurus/dev/zapm.c
diff -u src/sys/arch/zaurus/dev/zapm.c:1.6 src/sys/arch/zaurus/dev/zapm.c:1.7
--- src/sys/arch/zaurus/dev/zapm.c:1.6	Fri Apr  3 04:13:17 2009
+++ src/sys/arch/zaurus/dev/zapm.c	Sat Dec 12 11:38:45 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: zapm.c,v 1.6 2009/04/03 04:13:17 uwe Exp $	*/
+/*	$NetBSD: zapm.c,v 1.7 2009/12/12 11:38:45 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_apm.c,v 1.13 2006/12/12 23:14:28 dim Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zapm.c,v 1.6 2009/04/03 04:13:17 uwe Exp $);
+__KERNEL_RCSID(0, $NetBSD: zapm.c,v 1.7 2009/12/12 11:38:45 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -809,7 +809,7 @@
 zapm_set_charging(sc, 0);
 			}
 		} else if (!charge_completed) {
-			charging = 1;
+			charging = APM_BATT_FLAG_CHARGING;
 			volt = zapm_get_battery_volt();
 			zapm_set_charging(sc, 1);
 			DPRINTF((zapm_poll: start charging volt %d\n, volt));

CVS commit: src/sys/arch/zaurus/dev

2009-12-12 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat Dec 12 14:29:34 UTC 2009

Modified Files:
src/sys/arch/zaurus/dev: zapm.c

Log Message:
report collect charge state.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/dev/zapm.c

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/zaurus/dev/zapm.c
diff -u src/sys/arch/zaurus/dev/zapm.c:1.8 src/sys/arch/zaurus/dev/zapm.c:1.9
--- src/sys/arch/zaurus/dev/zapm.c:1.8	Sat Dec 12 13:12:49 2009
+++ src/sys/arch/zaurus/dev/zapm.c	Sat Dec 12 14:29:34 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: zapm.c,v 1.8 2009/12/12 13:12:49 nonaka Exp $	*/
+/*	$NetBSD: zapm.c,v 1.9 2009/12/12 14:29:34 nonaka Exp $	*/
 /*	$OpenBSD: zaurus_apm.c,v 1.13 2006/12/12 23:14:28 dim Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zapm.c,v 1.8 2009/12/12 13:12:49 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zapm.c,v 1.9 2009/12/12 14:29:34 nonaka Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -402,16 +402,32 @@
 		pinfo-ac_state = val;
 	else
 		pinfo-ac_state = sc-ac_state;
+	DPRINTF((zapm: pinfo-ac_state: %d\n, pinfo-ac_state));
+
 	if (config_hook_call(CONFIG_HOOK_GET,
 			 CONFIG_HOOK_CHARGE, val) != -1)
 		pinfo-battery_state = val;
-	else
-		pinfo-battery_state = sc-battery_state;
+	else {
+		DPRINTF((zapm: sc-battery_state: %#x\n, sc-battery_state));
+		if (sc-battery_state  APM_BATT_FLAG_CHARGING)
+			pinfo-battery_flags = APM_BATT_FLAG_CHARGING;
+		else if (sc-battery_state  APM_BATT_FLAG_CRITICAL)
+			pinfo-battery_flags = APM_BATT_FLAG_CRITICAL;
+		else if (sc-battery_state  APM_BATT_FLAG_LOW)
+			pinfo-battery_flags = APM_BATT_FLAG_LOW;
+		else if (sc-battery_state  APM_BATT_FLAG_HIGH)
+			pinfo-battery_flags = APM_BATT_FLAG_HIGH;
+		else
+			pinfo-battery_flags = APM_BATT_FLAG_UNKNOWN;
+	}
+	DPRINTF((zapm: pinfo-battery_flags: %#x\n, pinfo-battery_flags));
+
 	if (config_hook_call(CONFIG_HOOK_GET,
 			 CONFIG_HOOK_BATTERYVAL, val) != -1)
 		pinfo-battery_life = val;
 	else
 		pinfo-battery_life = sc-battery_life;
+	DPRINTF((zapm: pinfo-battery_life: %d\n, pinfo-battery_life));
 
 	return 0;
 }

CVS commit: src/sys/arch/zaurus/dev

2009-12-11 Thread NONAKA Kimihiro 
Module Name:src
Committed By:   nonaka
Date:   Sat Dec 12 07:49:31 UTC 2009

Modified Files:
src/sys/arch/zaurus/dev: ztp.c

Log Message:
Use tpcalib_ioctl() instead of hpc_tpanel_ioctl().


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/dev/ztp.c

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/zaurus/dev/ztp.c
diff -u src/sys/arch/zaurus/dev/ztp.c:1.7 src/sys/arch/zaurus/dev/ztp.c:1.8
--- src/sys/arch/zaurus/dev/ztp.c:1.7	Tue Mar  3 18:42:19 2009
+++ src/sys/arch/zaurus/dev/ztp.c	Sat Dec 12 07:49:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ztp.c,v 1.7 2009/03/03 18:42:19 nonaka Exp $	*/
+/*	$NetBSD: ztp.c,v 1.8 2009/12/12 07:49:31 nonaka Exp $	*/
 /* $OpenBSD: zts.c,v 1.9 2005/04/24 18:55:49 uwe Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ztp.c,v 1.7 2009/03/03 18:42:19 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ztp.c,v 1.8 2009/12/12 07:49:31 nonaka Exp $);
 
 #include lcd.h
 
@@ -535,7 +535,7 @@
 
 	case WSMOUSEIO_SCALIBCOORDS:
 	case WSMOUSEIO_GCALIBCOORDS:
-		return hpc_tpanel_ioctl(sc-sc_tpcalib, cmd, data, flag, l);
+		return tpcalib_ioctl(sc-sc_tpcalib, cmd, data, flag, l);
 	}
 
 	return EPASSTHROUGH;

  1   2   >