Sat Jan 21 19:44:31 2012 UTC ()
fix my license notice.


(nonaka)
diff -r1.9 -r1.10 src/sys/arch/arm/xscale/pxa2x0_mci.c
diff -r1.1 -r1.2 src/sys/arch/arm/xscale/pxa2x0_mci.h
diff -r1.2 -r1.3 src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c
diff -r1.3 -r1.4 src/sys/arch/evbarm/gumstix/gxmci.c
diff -r1.2 -r1.3 src/sys/arch/evbarm/hdl_g/btn_obio.c
diff -r1.2 -r1.3 src/sys/arch/evbarm/hdl_g/hdlgreg.h
diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4.c
diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4_intr.c
diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4reg.h
diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4var.h
diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/rs5c316_mainbus.c
diff -r1.2 -r1.3 src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c
diff -r1.2 -r1.3 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c
diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/scimci.c
diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c
diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c
diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lanreg.h
diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lanvar.h
diff -r1.1 -r1.2 src/sys/arch/hpcarm/dev/nbpmci.c
diff -r1.6 -r1.7 src/sys/arch/hpcarm/dev/wzero3_kbd.c
diff -r1.6 -r1.7 src/sys/arch/hpcarm/dev/wzero3_reg.h
diff -r1.6 -r1.7 src/sys/arch/hpcarm/dev/wzero3_tp.c
diff -r1.2 -r1.3 src/sys/arch/hpcarm/dev/wzero3_keypad.c
diff -r1.3 -r1.4 src/sys/arch/hpcarm/dev/wzero3_lcd.c
diff -r1.3 -r1.4 src/sys/arch/hpcarm/dev/wzero3_mci.c
diff -r1.4 -r1.5 src/sys/arch/hpcarm/dev/wzero3_ssp.c
diff -r1.4 -r1.5 src/sys/arch/hpcarm/dev/wzero3_sspvar.h
diff -r1.5 -r1.6 src/sys/arch/landisk/dev/btn_obio.c
diff -r1.2 -r1.3 src/sys/arch/landisk/dev/pwrsw_obio.c
diff -r1.4 -r1.5 src/sys/arch/landisk/landisk/intr.c
diff -r1.1 -r1.2 src/sys/arch/landisk/landisk/landiskreg.h
diff -r1.1 -r1.2 src/sys/arch/landisk/stand/bootxx/bios.S
diff -r1.1 -r1.2 src/sys/arch/landisk/stand/bootxx/bootxx.S
diff -r1.1 -r1.2 src/sys/arch/landisk/stand/bootxx/pbr.S
diff -r1.1 -r1.2 src/sys/arch/landisk/stand/mbr/mbr.S
diff -r1.15 -r1.16 src/sys/arch/sh3/dev/shpcic.c
diff -r1.8 -r1.9 src/sys/arch/sh3/dev/shpcicvar.h
diff -r1.2 -r1.3 src/sys/arch/sh3/include/pcicreg.h
diff -r1.4 -r1.5 src/sys/arch/zaurus/include/bootinfo.h
diff -r1.11 -r1.12 src/sys/dev/i2c/rs5c372.c
diff -r1.2 -r1.3 src/sys/dev/i2c/rs5c372reg.h
diff -r1.9 -r1.10 src/sys/dev/sdmmc/sdmmc.c
diff -r1.17 -r1.18 src/sys/dev/sdmmc/sdmmc_mem.c
cvs diff -r1.9 -r1.10 src/sys/arch/arm/xscale/pxa2x0_mci.c (expand / switch to unified diff)

--- src/sys/arch/arm/xscale/pxa2x0_mci.c 2011/11/23 23:07:29 1.9
+++ src/sys/arch/arm/xscale/pxa2x0_mci.c 2012/01/21 19:44:28 1.10
@@ -1,70 +1,69 @@ @@ -1,70 +1,69 @@
1/* $NetBSD: pxa2x0_mci.c,v 1.9 2011/11/23 23:07:29 jmcneill Exp $ */ 1/* $NetBSD: pxa2x0_mci.c,v 1.10 2012/01/21 19:44:28 nonaka Exp $ */
2/* $OpenBSD: pxa2x0_mmc.c,v 1.5 2009/02/23 18:09:55 miod Exp $ */ 2/* $OpenBSD: pxa2x0_mmc.c,v 1.5 2009/02/23 18:09:55 miod Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2007 Uwe Stuehler <uwe@openbsd.org> 5 * Copyright (c) 2007 Uwe Stuehler <uwe@openbsd.org>
6 * 6 *
7 * Permission to use, copy, modify, and distribute this software for any 7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above 8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies. 9 * copyright notice and this permission notice appear in all copies.
10 * 10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */ 18 */
19 19
20/*- 20/*-
21 * Copyright (c) 2007-2010 NONAKA Kimihiro <nonaka@netbsd.org> 21 * Copyright (C) 2007-2010 NONAKA Kimihiro <nonaka@netbsd.org>
22 * All rights reserved. 22 * All rights reserved.
23 * 23 *
24 * Redistribution and use in source and binary forms, with or without 24 * Redistribution and use in source and binary forms, with or without
25 * modification, are permitted provided that the following conditions 25 * modification, are permitted provided that the following conditions
26 * are met: 26 * are met:
27 * 1. Redistributions of source code must retain the above copyright 27 * 1. Redistributions of source code must retain the above copyright
28 * notice, this list of conditions and the following disclaimer. 28 * notice, this list of conditions and the following disclaimer.
29 * 2. Redistributions in binary form must reproduce the above copyright 29 * 2. Redistributions in binary form must reproduce the above copyright
30 * notice, this list of conditions and the following disclaimer in the 30 * notice, this list of conditions and the following disclaimer in the
31 * documentation and/or other materials provided with the distribution. 31 * documentation and/or other materials provided with the distribution.
32 * 32 *
33 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 33 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
34 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 34 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
35 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 35 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
36 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 36 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
37 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 37 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
38 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 38 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
39 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 39 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
40 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 40 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
41 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 41 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
42 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 42 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43 * SUCH DAMAGE. 
44 */ 43 */
45 44
46/* 45/*
47 * MMC/SD/SDIO controller driver for Intel PXA2xx processors 46 * MMC/SD/SDIO controller driver for Intel PXA2xx processors
48 * 47 *
49 * Power management is beyond control of the processor's SD/SDIO/MMC 48 * Power management is beyond control of the processor's SD/SDIO/MMC
50 * block, so this driver depends on the attachment driver to provide 49 * block, so this driver depends on the attachment driver to provide
51 * us with some callback functions via the "tag" member in our softc. 50 * us with some callback functions via the "tag" member in our softc.
52 * Bus power management calls are then dispatched to the attachment 51 * Bus power management calls are then dispatched to the attachment
53 * driver. 52 * driver.
54 */ 53 */
55 54
56#include <sys/cdefs.h> 55#include <sys/cdefs.h>
57__KERNEL_RCSID(0, "$NetBSD: pxa2x0_mci.c,v 1.9 2011/11/23 23:07:29 jmcneill Exp $"); 56__KERNEL_RCSID(0, "$NetBSD: pxa2x0_mci.c,v 1.10 2012/01/21 19:44:28 nonaka Exp $");
58 57
59#include <sys/param.h> 58#include <sys/param.h>
60#include <sys/device.h> 59#include <sys/device.h>
61#include <sys/systm.h> 60#include <sys/systm.h>
62#include <sys/malloc.h> 61#include <sys/malloc.h>
63#include <sys/kernel.h> 62#include <sys/kernel.h>
64#include <sys/proc.h> 63#include <sys/proc.h>
65#include <sys/bus.h> 64#include <sys/bus.h>
66#include <sys/mutex.h> 65#include <sys/mutex.h>
67#include <sys/condvar.h> 66#include <sys/condvar.h>
68 67
69#include <machine/intr.h> 68#include <machine/intr.h>
70 69
cvs diff -r1.1 -r1.2 src/sys/arch/arm/xscale/pxa2x0_mci.h (expand / switch to unified diff)

--- src/sys/arch/arm/xscale/pxa2x0_mci.h 2009/04/21 03:00:29 1.1
+++ src/sys/arch/arm/xscale/pxa2x0_mci.h 2012/01/21 19:44:28 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: pxa2x0_mci.h,v 1.1 2009/04/21 03:00:29 nonaka Exp $ */ 1/* $NetBSD: pxa2x0_mci.h,v 1.2 2012/01/21 19:44:28 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2006 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2006 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef _PXA2X0_MCI_H_ 28#ifndef _PXA2X0_MCI_H_
30#define _PXA2X0_MCI_H_ 29#define _PXA2X0_MCI_H_
31 30
32#include <sys/bus.h> 31#include <sys/bus.h>
33#include <sys/device.h> 32#include <sys/device.h>
34#include <sys/mutex.h> 33#include <sys/mutex.h>
35#include <sys/condvar.h> 34#include <sys/condvar.h>
36 35
37#include <arm/xscale/pxa2x0_dmac.h> 36#include <arm/xscale/pxa2x0_dmac.h>
38 37
39struct pxamci_tag { 38struct pxamci_tag {
cvs diff -r1.2 -r1.3 src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c (expand / switch to unified diff)

--- src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c 2010/06/26 07:51:45 1.2
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_mci.c 2012/01/21 19:44:28 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: g42xxeb_mci.c,v 1.2 2010/06/26 07:51:45 bsh Exp $ */ 1/* $NetBSD: g42xxeb_mci.c,v 1.3 2012/01/21 19:44:28 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 Genetec Corporation. All rights reserved. 4 * Copyright (c) 2009 Genetec Corporation. All rights reserved.
5 * Written by Hiroyuki Bessho for Genetec Corporation. 5 * Written by Hiroyuki Bessho for Genetec Corporation.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above 12 * 2. Redistributions in binary form must reproduce the above
13 * copyright notice, this list of conditions and the following 13 * copyright notice, this list of conditions and the following
14 * disclaimer in the documentation and/or other materials provided 14 * disclaimer in the documentation and/or other materials provided
@@ -21,54 +21,52 @@ @@ -21,54 +21,52 @@
21 * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 21 * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 22 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
24 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 24 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
27 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE. 28 * SUCH DAMAGE.
29 */ 29 */
30 30
31/* derived from zaurus/dev/zmci.c */ 31/* derived from zaurus/dev/zmci.c */
32 32
33/*- 33/*-
34 * Copyright (c) 2006-2008 NONAKA Kimihiro <nonaka@netbsd.org> 34 * Copyright (C) 2006-2008 NONAKA Kimihiro <nonaka@netbsd.org>
35 * All rights reserved. 35 * All rights reserved.
36 * 36 *
37 * Redistribution and use in source and binary forms, with or without 37 * Redistribution and use in source and binary forms, with or without
38 * modification, are permitted provided that the following conditions 38 * modification, are permitted provided that the following conditions
39 * are met: 39 * are met:
40 * 1. Redistributions of source code must retain the above copyright 40 * 1. Redistributions of source code must retain the above copyright
41 * notice, this list of conditions and the following disclaimer. 41 * notice, this list of conditions and the following disclaimer.
42 * 2. Redistributions in binary form must reproduce the above copyright 42 * 2. Redistributions in binary form must reproduce the above copyright
43 * notice, this list of conditions and the following disclaimer in the 43 * notice, this list of conditions and the following disclaimer in the
44 * documentation and/or other materials provided with the distribution. 44 * documentation and/or other materials provided with the distribution.
45 * 45 *
46 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' 46 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
47 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 47 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
48 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 48 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
49 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS 49 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
50 * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 50 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
51 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 51 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
52 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 52 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
53 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 53 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
54 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 54 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
55 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 55 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
56 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
57 * SUCH DAMAGE. 
58 */ 56 */
59 57
60#include <sys/cdefs.h> 58#include <sys/cdefs.h>
61__KERNEL_RCSID(0, "$NetBSD: g42xxeb_mci.c,v 1.2 2010/06/26 07:51:45 bsh Exp $"); 59__KERNEL_RCSID(0, "$NetBSD: g42xxeb_mci.c,v 1.3 2012/01/21 19:44:28 nonaka Exp $");
62 60
63#include <sys/param.h> 61#include <sys/param.h>
64#include <sys/device.h> 62#include <sys/device.h>
65#include <sys/systm.h> 63#include <sys/systm.h>
66#include <sys/bus.h> 64#include <sys/bus.h>
67#include <sys/pmf.h> 65#include <sys/pmf.h>
68 66
69#include <machine/intr.h> 67#include <machine/intr.h>
70 68
71#include <arm/xscale/pxa2x0cpu.h> 69#include <arm/xscale/pxa2x0cpu.h>
72#include <arm/xscale/pxa2x0reg.h> 70#include <arm/xscale/pxa2x0reg.h>
73#include <arm/xscale/pxa2x0var.h> 71#include <arm/xscale/pxa2x0var.h>
74#include <arm/xscale/pxa2x0_gpio.h> 72#include <arm/xscale/pxa2x0_gpio.h>
cvs diff -r1.3 -r1.4 src/sys/arch/evbarm/gumstix/gxmci.c (expand / switch to unified diff)

--- src/sys/arch/evbarm/gumstix/gxmci.c 2011/07/01 20:39:34 1.3
+++ src/sys/arch/evbarm/gumstix/gxmci.c 2012/01/21 19:44:28 1.4
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: gxmci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $ */ 1/* $NetBSD: gxmci.c,v 1.4 2012/01/21 19:44:28 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2007 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: gxmci.c,v 1.3 2011/07/01 20:39:34 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: gxmci.c,v 1.4 2012/01/21 19:44:28 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/device.h> 32#include <sys/device.h>
34#include <sys/systm.h> 33#include <sys/systm.h>
35 34
36#include <sys/bus.h> 35#include <sys/bus.h>
37#include <machine/intr.h> 36#include <machine/intr.h>
38 37
39#include <arm/xscale/pxa2x0cpu.h> 38#include <arm/xscale/pxa2x0cpu.h>
40#include <arm/xscale/pxa2x0reg.h> 39#include <arm/xscale/pxa2x0reg.h>
41#include <arm/xscale/pxa2x0var.h> 40#include <arm/xscale/pxa2x0var.h>
42#include <arm/xscale/pxa2x0_gpio.h> 41#include <arm/xscale/pxa2x0_gpio.h>
43#include <arm/xscale/pxa2x0_mci.h> 42#include <arm/xscale/pxa2x0_mci.h>
cvs diff -r1.2 -r1.3 src/sys/arch/evbarm/hdl_g/btn_obio.c (expand / switch to unified diff)

--- src/sys/arch/evbarm/hdl_g/btn_obio.c 2011/07/01 20:39:34 1.2
+++ src/sys/arch/evbarm/hdl_g/btn_obio.c 2012/01/21 19:44:29 1.3
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: btn_obio.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $ */ 1/* $NetBSD: btn_obio.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005, 2006 NONAKA Kimihiro 4 * Copyright (C) 2005, 2006 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.2 2011/07/01 20:39:34 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/types.h> 31#include <sys/types.h>
33#include <sys/param.h> 32#include <sys/param.h>
34#include <sys/systm.h> 33#include <sys/systm.h>
35#include <sys/device.h> 34#include <sys/device.h>
36#include <sys/malloc.h> 35#include <sys/malloc.h>
37#include <sys/kernel.h> 36#include <sys/kernel.h>
38#include <sys/conf.h> 37#include <sys/conf.h>
39#include <sys/ioctl.h> 38#include <sys/ioctl.h>
40#include <sys/callout.h> 39#include <sys/callout.h>
41 40
42#include <arm/xscale/i80321var.h> 41#include <arm/xscale/i80321var.h>
43 42
cvs diff -r1.2 -r1.3 src/sys/arch/evbarm/hdl_g/hdlgreg.h (expand / switch to unified diff)

--- src/sys/arch/evbarm/hdl_g/hdlgreg.h 2006/06/08 23:27:47 1.2
+++ src/sys/arch/evbarm/hdl_g/hdlgreg.h 2012/01/21 19:44:29 1.3
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: hdlgreg.h,v 1.2 2006/06/08 23:27:47 nonaka Exp $ */ 1/* $NetBSD: hdlgreg.h,v 1.3 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2005, 2006 Kimihiro Nonaka 4 * Copyright (C) 2005, 2006 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef _HDLGREG_H_ 28#ifndef _HDLGREG_H_
30#define _HDLGREG_H_ 29#define _HDLGREG_H_
31 30
32/* 31/*
33 * Memory map and register definitions for I-O DATA HDL-G 32 * Memory map and register definitions for I-O DATA HDL-G
34 */ 33 */
35 34
36/* 35/*
37 * The memory map of I/O-DATA HDL-G looks like so: 36 * The memory map of I/O-DATA HDL-G looks like so:
38 * 37 *
39 * ------------------------------ 38 * ------------------------------
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4.c (expand / switch to unified diff)

--- src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4.c 2010/04/06 15:54:29 1.1
+++ src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4.c 2012/01/21 19:44:29 1.2
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: ap_ms104_sh4.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $ */ 1/* $NetBSD: ap_ms104_sh4.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: ap_ms104_sh4.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: ap_ms104_sh4.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/intr.h> 33#include <sys/intr.h>
35 34
36#include <sh3/devreg.h> 35#include <sh3/devreg.h>
37#include <sh3/pfcreg.h> 36#include <sh3/pfcreg.h>
38#include <sh3/exception.h> 37#include <sh3/exception.h>
39 38
40#include <evbsh3/ap_ms104_sh4/ap_ms104_sh4reg.h> 39#include <evbsh3/ap_ms104_sh4/ap_ms104_sh4reg.h>
41#include <evbsh3/ap_ms104_sh4/ap_ms104_sh4var.h> 40#include <evbsh3/ap_ms104_sh4/ap_ms104_sh4var.h>
42 41
43static int gpio_intr(void *arg); 42static int gpio_intr(void *arg);
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4_intr.c (expand / switch to unified diff)

--- src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4_intr.c 2010/04/06 15:54:29 1.1
+++ src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4_intr.c 2012/01/21 19:44:29 1.2
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: ap_ms104_sh4_intr.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $ */ 1/* $NetBSD: ap_ms104_sh4_intr.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: ap_ms104_sh4_intr.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: ap_ms104_sh4_intr.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/kernel.h> 33#include <sys/kernel.h>
35#include <sys/malloc.h> 34#include <sys/malloc.h>
36#include <sys/device.h> 35#include <sys/device.h>
37 36
38#include <sh3/devreg.h> 37#include <sh3/devreg.h>
39#include <sh3/exception.h> 38#include <sh3/exception.h>
40 39
41#include <machine/intr.h> 40#include <machine/intr.h>
42 41
43#include <evbsh3/ap_ms104_sh4/ap_ms104_sh4reg.h> 42#include <evbsh3/ap_ms104_sh4/ap_ms104_sh4reg.h>
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4reg.h (expand / switch to unified diff)

--- src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4reg.h 2010/04/06 15:54:29 1.1
+++ src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4reg.h 2012/01/21 19:44:29 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: ap_ms104_sh4reg.h,v 1.1 2010/04/06 15:54:29 nonaka Exp $ */ 1/* $NetBSD: ap_ms104_sh4reg.h,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef AP_MS104_SH4REG_H_ 28#ifndef AP_MS104_SH4REG_H_
30#define AP_MS104_SH4REG_H_ 29#define AP_MS104_SH4REG_H_
31 30
32#define EXTINTR_MASK1 0xa4000000 /* R/W: 8bit */ 31#define EXTINTR_MASK1 0xa4000000 /* R/W: 8bit */
33#define EXTINTR_MASK2 0xa4100000 /* R/W: 8bit */ 32#define EXTINTR_MASK2 0xa4100000 /* R/W: 8bit */
34#define EXTINTR_MASK3 0xa4200000 /* R/W: 8bit */ 33#define EXTINTR_MASK3 0xa4200000 /* R/W: 8bit */
35#define EXTINTR_MASK4 0xa4300000 /* R/W: 8bit */ 34#define EXTINTR_MASK4 0xa4300000 /* R/W: 8bit */
36#define EXTINTR_STAT1 0xa4400000 /* R: 8bit */ 35#define EXTINTR_STAT1 0xa4400000 /* R: 8bit */
37#define EXTINTR_STAT2 0xa4500000 /* R: 8bit */ 36#define EXTINTR_STAT2 0xa4500000 /* R: 8bit */
38#define EXTINTR_STAT3 0xa4600000 /* R: 8bit */ 37#define EXTINTR_STAT3 0xa4600000 /* R: 8bit */
39#define EXTINTR_STAT4 0xa4700000 /* R: 8bit */ 38#define EXTINTR_STAT4 0xa4700000 /* R: 8bit */
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4var.h (expand / switch to unified diff)

--- src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4var.h 2010/04/06 15:54:29 1.1
+++ src/sys/arch/evbsh3/ap_ms104_sh4/ap_ms104_sh4var.h 2012/01/21 19:44:29 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: ap_ms104_sh4var.h,v 1.1 2010/04/06 15:54:29 nonaka Exp $ */ 1/* $NetBSD: ap_ms104_sh4var.h,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef AP_MS104_SH4VAR_H_ 28#ifndef AP_MS104_SH4VAR_H_
30#define AP_MS104_SH4VAR_H_ 29#define AP_MS104_SH4VAR_H_
31 30
32#include <sys/bus.h> 31#include <sys/bus.h>
33 32
34extern struct _bus_space ap_ms104_sh4_bus_io; 33extern struct _bus_space ap_ms104_sh4_bus_io;
35extern struct _bus_space ap_ms104_sh4_bus_mem; 34extern struct _bus_space ap_ms104_sh4_bus_mem;
36extern struct _bus_space ap_ms104_sh4_bus_att; 35extern struct _bus_space ap_ms104_sh4_bus_att;
37 36
38void machine_init(void); 37void machine_init(void);
39void extintr_init(void); 38void extintr_init(void);
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/rs5c316_mainbus.c (expand / switch to unified diff)

--- src/sys/arch/evbsh3/ap_ms104_sh4/rs5c316_mainbus.c 2010/04/06 15:54:29 1.1
+++ src/sys/arch/evbsh3/ap_ms104_sh4/rs5c316_mainbus.c 2012/01/21 19:44:29 1.2
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: rs5c316_mainbus.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $ */ 1/* $NetBSD: rs5c316_mainbus.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: rs5c316_mainbus.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: rs5c316_mainbus.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/device.h> 33#include <sys/device.h>
35#include <sys/kernel.h> 34#include <sys/kernel.h>
36 35
37#include <dev/clock_subr.h> 36#include <dev/clock_subr.h>
38#include <dev/ic/rs5c313var.h> 37#include <dev/ic/rs5c313var.h>
39 38
40#include <machine/autoconf.h> 39#include <machine/autoconf.h>
41 40
42#include <sh3/devreg.h> 41#include <sh3/devreg.h>
43#include <sh3/pfcreg.h> 42#include <sh3/pfcreg.h>
cvs diff -r1.2 -r1.3 src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c (expand / switch to unified diff)

--- src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c 2011/07/19 15:44:52 1.2
+++ src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c 2012/01/21 19:44:29 1.3
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: if_sm_mainbus.c,v 1.2 2011/07/19 15:44:52 dyoung Exp $ */ 1/* $NetBSD: if_sm_mainbus.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: if_sm_mainbus.c,v 1.2 2011/07/19 15:44:52 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: if_sm_mainbus.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/device.h> 33#include <sys/device.h>
35#include <sys/bus.h> 34#include <sys/bus.h>
36 35
37#include <net/if.h> 36#include <net/if.h>
38#include <net/if_ether.h> 37#include <net/if_ether.h>
39#include <net/if_media.h> 38#include <net/if_media.h>
40 39
41#include <machine/autoconf.h> 40#include <machine/autoconf.h>
42#include <machine/intr.h> 41#include <machine/intr.h>
43 42
cvs diff -r1.2 -r1.3 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c (expand / switch to unified diff)

--- src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c 2011/07/26 22:52:48 1.2
+++ src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c 2012/01/21 19:44:29 1.3
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: shpcmcia.c,v 1.2 2011/07/26 22:52:48 dyoung Exp $ */ 1/* $NetBSD: shpcmcia.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.2 2011/07/26 22:52:48 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/types.h> 31#include <sys/types.h>
33#include <sys/param.h> 32#include <sys/param.h>
34#include <sys/systm.h> 33#include <sys/systm.h>
35#include <sys/device.h> 34#include <sys/device.h>
36#include <sys/malloc.h> 35#include <sys/malloc.h>
37#include <sys/kthread.h> 36#include <sys/kthread.h>
38#include <sys/kernel.h> 37#include <sys/kernel.h>
39#include <sys/callout.h> 38#include <sys/callout.h>
40#include <sys/bus.h> 39#include <sys/bus.h>
41#include <sys/intr.h> 40#include <sys/intr.h>
42 41
43#include <dev/pcmcia/pcmciachip.h> 42#include <dev/pcmcia/pcmciachip.h>
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/scimci.c (expand / switch to unified diff)

--- src/sys/arch/evbsh3/t_sh7706lan/scimci.c 2010/04/06 15:54:31 1.1
+++ src/sys/arch/evbsh3/t_sh7706lan/scimci.c 2012/01/21 19:44:29 1.2
@@ -1,47 +1,46 @@ @@ -1,47 +1,46 @@
1/* $NetBSD: scimci.c,v 1.1 2010/04/06 15:54:31 nonaka Exp $ */ 1/* $NetBSD: scimci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29/* 28/*
30 * Serial Peripheral interface driver to access MMC card 29 * Serial Peripheral interface driver to access MMC card
31 */ 30 */
32 31
33#include <sys/cdefs.h> 32#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.1 2010/04/06 15:54:31 nonaka Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: scimci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
35 34
36#include <sys/param.h> 35#include <sys/param.h>
37#include <sys/device.h> 36#include <sys/device.h>
38#include <sys/systm.h> 37#include <sys/systm.h>
39#include <sys/malloc.h> 38#include <sys/malloc.h>
40#include <sys/kernel.h> 39#include <sys/kernel.h>
41#include <sys/proc.h> 40#include <sys/proc.h>
42#include <sys/bus.h> 41#include <sys/bus.h>
43#include <sys/intr.h> 42#include <sys/intr.h>
44 43
45#include <sh3/devreg.h> 44#include <sh3/devreg.h>
46#include <sh3/pfcreg.h> 45#include <sh3/pfcreg.h>
47#include <sh3/scireg.h> 46#include <sh3/scireg.h>
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c (expand / switch to unified diff)

--- src/sys/arch/evbsh3/t_sh7706lan/ssumci.c 2010/04/06 15:54:31 1.1
+++ src/sys/arch/evbsh3/t_sh7706lan/ssumci.c 2012/01/21 19:44:29 1.2
@@ -1,47 +1,46 @@ @@ -1,47 +1,46 @@
1/* $NetBSD: ssumci.c,v 1.1 2010/04/06 15:54:31 nonaka Exp $ */ 1/* $NetBSD: ssumci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29/* 28/*
30 * driver to access MMC/SD card 29 * driver to access MMC/SD card
31 */ 30 */
32 31
33#include <sys/cdefs.h> 32#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.1 2010/04/06 15:54:31 nonaka Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
35 34
36#include <sys/param.h> 35#include <sys/param.h>
37#include <sys/device.h> 36#include <sys/device.h>
38#include <sys/systm.h> 37#include <sys/systm.h>
39#include <sys/malloc.h> 38#include <sys/malloc.h>
40#include <sys/kernel.h> 39#include <sys/kernel.h>
41#include <sys/proc.h> 40#include <sys/proc.h>
42#include <sys/bus.h> 41#include <sys/bus.h>
43#include <sys/intr.h> 42#include <sys/intr.h>
44 43
45#include <sh3/devreg.h> 44#include <sh3/devreg.h>
46#include <sh3/pfcreg.h> 45#include <sh3/pfcreg.h>
47#include <sh3/scireg.h> 46#include <sh3/scireg.h>
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c (expand / switch to unified diff)

--- src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c 2010/04/06 15:54:31 1.1
+++ src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lan.c 2012/01/21 19:44:29 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: t_sh7706lan.c,v 1.1 2010/04/06 15:54:31 nonaka Exp $ */ 1/* $NetBSD: t_sh7706lan.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBS$"); 29__KERNEL_RCSID(0, "$NetBS$");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34 33
35#include <sh3/devreg.h> 34#include <sh3/devreg.h>
36#include <sh3/bscreg.h> 35#include <sh3/bscreg.h>
37#include <sh3/intcreg.h> 36#include <sh3/intcreg.h>
38#include <sh3/pfcreg.h> 37#include <sh3/pfcreg.h>
39 38
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lanreg.h (expand / switch to unified diff)

--- src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lanreg.h 2010/04/06 15:54:31 1.1
+++ src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lanreg.h 2012/01/21 19:44:29 1.2
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1/* $NetBSD: t_sh7706lanreg.h,v 1.1 2010/04/06 15:54:31 nonaka Exp $ */ 1/* $NetBSD: t_sh7706lanreg.h,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009-2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009, 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef T_SH7706LANREG_H_ 28#ifndef T_SH7706LANREG_H_
30#define T_SH7706LANREG_H_ 29#define T_SH7706LANREG_H_
31 30
32#define T_SH7706LSR_ID 0xb0008006 31#define T_SH7706LSR_ID 0xb0008006
33 32
34#endif /* T_SH7706LANREG_H_ */ 33#endif /* T_SH7706LANREG_H_ */
cvs diff -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lanvar.h (expand / switch to unified diff)

--- src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lanvar.h 2010/04/06 15:54:31 1.1
+++ src/sys/arch/evbsh3/t_sh7706lan/t_sh7706lanvar.h 2012/01/21 19:44:29 1.2
@@ -1,37 +1,36 @@ @@ -1,37 +1,36 @@
1/* $NetBSD: t_sh7706lanvar.h,v 1.1 2010/04/06 15:54:31 nonaka Exp $ */ 1/* $NetBSD: t_sh7706lanvar.h,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009-2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009, 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef T_SH7706LAN_REG_H_ 28#ifndef T_SH7706LAN_REG_H_
30#define T_SH7706LAN_REG_H_ 29#define T_SH7706LAN_REG_H_
31 30
32#include <sh3/devreg.h> 31#include <sh3/devreg.h>
33#include <evbsh3/t_sh7706lan/t_sh7706lanreg.h> 32#include <evbsh3/t_sh7706lan/t_sh7706lanreg.h>
34 33
35#define IS_SH7706LSR (_reg_read_1(T_SH7706LSR_ID) == 0xab) 34#define IS_SH7706LSR (_reg_read_1(T_SH7706LSR_ID) == 0xab)
36 35
37#endif /* T_SH7706LAN_REG_H_ */ 36#endif /* T_SH7706LAN_REG_H_ */
cvs diff -r1.1 -r1.2 src/sys/arch/hpcarm/dev/nbpmci.c (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/nbpmci.c 2011/08/06 03:53:40 1.1
+++ src/sys/arch/hpcarm/dev/nbpmci.c 2012/01/21 19:44:29 1.2
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: nbpmci.c,v 1.1 2011/08/06 03:53:40 kiyohara Exp $ */ 1/* $NetBSD: nbpmci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2007 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: nbpmci.c,v 1.1 2011/08/06 03:53:40 kiyohara Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: nbpmci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/device.h> 32#include <sys/device.h>
34 33
35#include <machine/platid.h> 34#include <machine/platid.h>
36#include <machine/platid_mask.h> 35#include <machine/platid_mask.h>
37 36
38#include <arm/xscale/pxa2x0var.h> 37#include <arm/xscale/pxa2x0var.h>
39#include <arm/xscale/pxa2x0_gpio.h> 38#include <arm/xscale/pxa2x0_gpio.h>
40#include <arm/xscale/pxa2x0_mci.h> 39#include <arm/xscale/pxa2x0_mci.h>
41 40
42#include <dev/sdmmc/sdmmcreg.h> 41#include <dev/sdmmc/sdmmcreg.h>
43 42
cvs diff -r1.6 -r1.7 src/sys/arch/hpcarm/dev/wzero3_kbd.c (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/wzero3_kbd.c 2011/07/19 15:37:38 1.6
+++ src/sys/arch/hpcarm/dev/wzero3_kbd.c 2012/01/21 19:44:29 1.7
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: wzero3_kbd.c,v 1.6 2011/07/19 15:37:38 dyoung Exp $ */ 1/* $NetBSD: wzero3_kbd.c,v 1.7 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2008, 2009, 2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2008, 2009, 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.6 2011/07/19 15:37:38 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: wzero3_kbd.c,v 1.7 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/device.h> 33#include <sys/device.h>
35#include <sys/kernel.h> 34#include <sys/kernel.h>
36#include <sys/malloc.h> 35#include <sys/malloc.h>
37#include <sys/callout.h> 36#include <sys/callout.h>
38#include <sys/bus.h> 37#include <sys/bus.h>
39 38
40#include <dev/sysmon/sysmonvar.h> 39#include <dev/sysmon/sysmonvar.h>
41#include <dev/sysmon/sysmon_taskq.h> 40#include <dev/sysmon/sysmon_taskq.h>
42 41
43#include <arm/xscale/pxa2x0cpu.h> 42#include <arm/xscale/pxa2x0cpu.h>
cvs diff -r1.6 -r1.7 src/sys/arch/hpcarm/dev/wzero3_reg.h (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/wzero3_reg.h 2010/05/30 10:00:27 1.6
+++ src/sys/arch/hpcarm/dev/wzero3_reg.h 2012/01/21 19:44:29 1.7
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: wzero3_reg.h,v 1.6 2010/05/30 10:00:27 nonaka Exp $ */ 1/* $NetBSD: wzero3_reg.h,v 1.7 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2008, 2009, 2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2008, 2009, 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef _HPCARM_DEV_WZERO3_REG_H_ 28#ifndef _HPCARM_DEV_WZERO3_REG_H_
30#define _HPCARM_DEV_WZERO3_REG_H_ 29#define _HPCARM_DEV_WZERO3_REG_H_
31 30
32/* GPIO --------------------------------------------------------------------- */ 31/* GPIO --------------------------------------------------------------------- */
33 32
34/* 33/*
35 * WS003SH/WS004SH specific parameter 34 * WS003SH/WS004SH specific parameter
36 */ 35 */
37#define GPIO_WS003SH_SD_DETECT 9 /* In */ 36#define GPIO_WS003SH_SD_DETECT 9 /* In */
38#define GPIO_WS003SH_TOUCH_PANEL 11 /* In */ 37#define GPIO_WS003SH_TOUCH_PANEL 11 /* In */
39#define GPIO_WS003SH_SLIDE 12 /* In */ 38#define GPIO_WS003SH_SLIDE 12 /* In */
cvs diff -r1.6 -r1.7 src/sys/arch/hpcarm/dev/wzero3_tp.c (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/wzero3_tp.c 2010/07/19 15:20:21 1.6
+++ src/sys/arch/hpcarm/dev/wzero3_tp.c 2012/01/21 19:44:29 1.7
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: wzero3_tp.c,v 1.6 2010/07/19 15:20:21 tsutsui Exp $ */ 1/* $NetBSD: wzero3_tp.c,v 1.7 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: wzero3_tp.c,v 1.6 2010/07/19 15:20:21 tsutsui Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: wzero3_tp.c,v 1.7 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/types.h> 31#include <sys/types.h>
33#include <sys/param.h> 32#include <sys/param.h>
34#include <sys/systm.h> 33#include <sys/systm.h>
35#include <sys/device.h> 34#include <sys/device.h>
36#include <sys/malloc.h> 35#include <sys/malloc.h>
37#include <sys/kernel.h> 36#include <sys/kernel.h>
38#include <sys/callout.h> 37#include <sys/callout.h>
39 38
40#include <machine/bootinfo.h> 39#include <machine/bootinfo.h>
41#include <machine/platid.h> 40#include <machine/platid.h>
42#include <machine/platid_mask.h> 41#include <machine/platid_mask.h>
43 42
cvs diff -r1.2 -r1.3 src/sys/arch/hpcarm/dev/wzero3_keypad.c (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/wzero3_keypad.c 2011/07/19 15:37:39 1.2
+++ src/sys/arch/hpcarm/dev/wzero3_keypad.c 2012/01/21 19:44:29 1.3
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: wzero3_keypad.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $ */ 1/* $NetBSD: wzero3_keypad.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.2 2011/07/19 15:37:39 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: wzero3_keypad.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include "wzero3lcd.h" 31#include "wzero3lcd.h"
33#include "opt_wsdisplay_compat.h" 32#include "opt_wsdisplay_compat.h"
34 33
35#include <sys/param.h> 34#include <sys/param.h>
36#include <sys/systm.h> 35#include <sys/systm.h>
37#include <sys/device.h> 36#include <sys/device.h>
38#include <sys/kernel.h> 37#include <sys/kernel.h>
39#include <sys/callout.h> 38#include <sys/callout.h>
40#include <sys/bus.h> 39#include <sys/bus.h>
41 40
42#include <arm/xscale/pxa2x0cpu.h> 41#include <arm/xscale/pxa2x0cpu.h>
43#include <arm/xscale/pxa2x0var.h> 42#include <arm/xscale/pxa2x0var.h>
cvs diff -r1.3 -r1.4 src/sys/arch/hpcarm/dev/wzero3_lcd.c (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/wzero3_lcd.c 2011/07/19 15:37:39 1.3
+++ src/sys/arch/hpcarm/dev/wzero3_lcd.c 2012/01/21 19:44:29 1.4
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: wzero3_lcd.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $ */ 1/* $NetBSD: wzero3_lcd.c,v 1.4 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2008,2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2008, 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.4 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/device.h> 33#include <sys/device.h>
35#include <sys/pmf.h> 34#include <sys/pmf.h>
36#include <sys/bus.h> 35#include <sys/bus.h>
37 36
38#include <dev/cons.h> 37#include <dev/cons.h>
39#include <dev/wscons/wsconsio.h> 38#include <dev/wscons/wsconsio.h>
40#include <dev/wscons/wsdisplayvar.h> 39#include <dev/wscons/wsdisplayvar.h>
41#include <dev/wscons/wscons_callbacks.h> 40#include <dev/wscons/wscons_callbacks.h>
42 41
43#include <dev/hpc/hpcfbio.h> 42#include <dev/hpc/hpcfbio.h>
cvs diff -r1.3 -r1.4 src/sys/arch/hpcarm/dev/wzero3_mci.c (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/wzero3_mci.c 2011/07/19 15:37:39 1.3
+++ src/sys/arch/hpcarm/dev/wzero3_mci.c 2012/01/21 19:44:29 1.4
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: wzero3_mci.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $ */ 1/* $NetBSD: wzero3_mci.c,v 1.4 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: wzero3_mci.c,v 1.3 2011/07/19 15:37:39 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: wzero3_mci.c,v 1.4 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/device.h> 32#include <sys/device.h>
34#include <sys/systm.h> 33#include <sys/systm.h>
35#include <sys/pmf.h> 34#include <sys/pmf.h>
36#include <sys/bus.h> 35#include <sys/bus.h>
37 36
38#include <machine/bootinfo.h> 37#include <machine/bootinfo.h>
39#include <machine/platid.h> 38#include <machine/platid.h>
40#include <machine/platid_mask.h> 39#include <machine/platid_mask.h>
41 40
42#include <arm/xscale/pxa2x0cpu.h> 41#include <arm/xscale/pxa2x0cpu.h>
43#include <arm/xscale/pxa2x0reg.h> 42#include <arm/xscale/pxa2x0reg.h>
cvs diff -r1.4 -r1.5 src/sys/arch/hpcarm/dev/wzero3_ssp.c (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/wzero3_ssp.c 2010/05/30 10:00:27 1.4
+++ src/sys/arch/hpcarm/dev/wzero3_ssp.c 2012/01/21 19:44:29 1.5
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: wzero3_ssp.c,v 1.4 2010/05/30 10:00:27 nonaka Exp $ */ 1/* $NetBSD: wzero3_ssp.c,v 1.5 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: wzero3_ssp.c,v 1.4 2010/05/30 10:00:27 nonaka Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: wzero3_ssp.c,v 1.5 2012/01/21 19:44:29 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/device.h> 33#include <sys/device.h>
35#include <sys/mutex.h> 34#include <sys/mutex.h>
36#include <sys/pmf.h> 35#include <sys/pmf.h>
37#include <sys/bus.h> 36#include <sys/bus.h>
38 37
39#include <machine/bootinfo.h> 38#include <machine/bootinfo.h>
40#include <machine/platid.h> 39#include <machine/platid.h>
41#include <machine/platid_mask.h> 40#include <machine/platid_mask.h>
42 41
43#include <arm/xscale/pxa2x0reg.h> 42#include <arm/xscale/pxa2x0reg.h>
cvs diff -r1.4 -r1.5 src/sys/arch/hpcarm/dev/wzero3_sspvar.h (expand / switch to unified diff)

--- src/sys/arch/hpcarm/dev/wzero3_sspvar.h 2010/05/30 10:00:27 1.4
+++ src/sys/arch/hpcarm/dev/wzero3_sspvar.h 2012/01/21 19:44:29 1.5
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: wzero3_sspvar.h,v 1.4 2010/05/30 10:00:27 nonaka Exp $ */ 1/* $NetBSD: wzero3_sspvar.h,v 1.5 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2010 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2010 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef _HPCARM_DEV_WZERO3_SSPVAR_H_ 28#ifndef _HPCARM_DEV_WZERO3_SSPVAR_H_
30#define _HPCARM_DEV_WZERO3_SSPVAR_H_ 29#define _HPCARM_DEV_WZERO3_SSPVAR_H_
31 30
32enum { 31enum {
33 WZERO3_SSP_IC_ADS7846, 32 WZERO3_SSP_IC_ADS7846,
34 WZERO3_SSP_IC_MAX1233, 33 WZERO3_SSP_IC_MAX1233,
35 WZERO3_SSP_IC_AK4184_TP, 34 WZERO3_SSP_IC_AK4184_TP,
36 WZERO3_SSP_IC_AK4184_KEYPAD, 35 WZERO3_SSP_IC_AK4184_KEYPAD,
37 WZERO3_SSP_IC_NUM 36 WZERO3_SSP_IC_NUM
38}; 37};
39 38
cvs diff -r1.5 -r1.6 src/sys/arch/landisk/dev/btn_obio.c (expand / switch to unified diff)

--- src/sys/arch/landisk/dev/btn_obio.c 2008/03/27 03:01:05 1.5
+++ src/sys/arch/landisk/dev/btn_obio.c 2012/01/21 19:44:29 1.6
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1/* $NetBSD: btn_obio.c,v 1.5 2008/03/27 03:01:05 uwe Exp $ */ 1/* $NetBSD: btn_obio.c,v 1.6 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include "pwrsw_obio.h" 28#include "pwrsw_obio.h"
30 29
31#include <sys/cdefs.h> 30#include <sys/cdefs.h>
32__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.5 2008/03/27 03:01:05 uwe Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.6 2012/01/21 19:44:29 nonaka Exp $");
33 32
34#include <sys/types.h> 33#include <sys/types.h>
35#include <sys/param.h> 34#include <sys/param.h>
36#include <sys/systm.h> 35#include <sys/systm.h>
37#include <sys/device.h> 36#include <sys/device.h>
38#include <sys/malloc.h> 37#include <sys/malloc.h>
39#include <sys/kernel.h> 38#include <sys/kernel.h>
40#include <sys/conf.h> 39#include <sys/conf.h>
41#include <sys/ioctl.h> 40#include <sys/ioctl.h>
42#include <sys/callout.h> 41#include <sys/callout.h>
43 42
44#include <dev/sysmon/sysmonvar.h> 43#include <dev/sysmon/sysmonvar.h>
45#include <dev/sysmon/sysmon_taskq.h> 44#include <dev/sysmon/sysmon_taskq.h>
cvs diff -r1.2 -r1.3 src/sys/arch/landisk/dev/pwrsw_obio.c (expand / switch to unified diff)

--- src/sys/arch/landisk/dev/pwrsw_obio.c 2008/03/27 02:52:04 1.2
+++ src/sys/arch/landisk/dev/pwrsw_obio.c 2012/01/21 19:44:29 1.3
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1/* $NetBSD: pwrsw_obio.c,v 1.2 2008/03/27 02:52:04 uwe Exp $ */ 1/* $NetBSD: pwrsw_obio.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include "btn_obio.h" 28#include "btn_obio.h"
30 29
31#include <sys/cdefs.h> 30#include <sys/cdefs.h>
32__KERNEL_RCSID(0, "$NetBSD: pwrsw_obio.c,v 1.2 2008/03/27 02:52:04 uwe Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: pwrsw_obio.c,v 1.3 2012/01/21 19:44:29 nonaka Exp $");
33 32
34#include <sys/types.h> 33#include <sys/types.h>
35#include <sys/param.h> 34#include <sys/param.h>
36#include <sys/systm.h> 35#include <sys/systm.h>
37#include <sys/device.h> 36#include <sys/device.h>
38#include <sys/malloc.h> 37#include <sys/malloc.h>
39#include <sys/conf.h> 38#include <sys/conf.h>
40#include <sys/ioctl.h> 39#include <sys/ioctl.h>
41 40
42#include <dev/sysmon/sysmonvar.h> 41#include <dev/sysmon/sysmonvar.h>
43#include <dev/sysmon/sysmon_taskq.h> 42#include <dev/sysmon/sysmon_taskq.h>
44 43
45#include <sh3/devreg.h> 44#include <sh3/devreg.h>
cvs diff -r1.4 -r1.5 src/sys/arch/landisk/landisk/intr.c (expand / switch to unified diff)

--- src/sys/arch/landisk/landisk/intr.c 2010/12/20 00:25:36 1.4
+++ src/sys/arch/landisk/landisk/intr.c 2012/01/21 19:44:30 1.5
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: intr.c,v 1.4 2010/12/20 00:25:36 matt Exp $ */ 1/* $NetBSD: intr.c,v 1.5 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.4 2010/12/20 00:25:36 matt Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.5 2012/01/21 19:44:30 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/kernel.h> 33#include <sys/kernel.h>
35#include <sys/malloc.h> 34#include <sys/malloc.h>
36#include <sys/device.h> 35#include <sys/device.h>
37 36
38#include <sh3/exception.h> 37#include <sh3/exception.h>
39 38
40#include <machine/intr.h> 39#include <machine/intr.h>
41 40
42#define _N_EXTINTR 8 41#define _N_EXTINTR 8
43 42
cvs diff -r1.1 -r1.2 src/sys/arch/landisk/landisk/landiskreg.h (expand / switch to unified diff)

--- src/sys/arch/landisk/landisk/landiskreg.h 2006/09/01 21:26:18 1.1
+++ src/sys/arch/landisk/landisk/landiskreg.h 2012/01/21 19:44:30 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: landiskreg.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ 1/* $NetBSD: landiskreg.h,v 1.2 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef LANDISKREG_H__ 28#ifndef LANDISKREG_H__
30#define LANDISKREG_H__ 29#define LANDISKREG_H__
31 30
32#define LANDISK_BTNSTAT 0xb0000002 31#define LANDISK_BTNSTAT 0xb0000002
33#define LANDISK_PWRMNG 0xb0000003 /* write-only */ 32#define LANDISK_PWRMNG 0xb0000003 /* write-only */
34#define LANDISK_INTEN 0xb0000005 33#define LANDISK_INTEN 0xb0000005
35#define LANDISK_PWRSW_INTCLR 0xb0000006 34#define LANDISK_PWRSW_INTCLR 0xb0000006
36 35
37#define BTN_SELECT_BIT (1 << 0) 36#define BTN_SELECT_BIT (1 << 0)
38#define BTN_COPY_BIT (1 << 1) 37#define BTN_COPY_BIT (1 << 1)
39#define BTN_REMOVE_BIT (1 << 2) 38#define BTN_REMOVE_BIT (1 << 2)
cvs diff -r1.1 -r1.2 src/sys/arch/landisk/stand/bootxx/bios.S (expand / switch to unified diff)

--- src/sys/arch/landisk/stand/bootxx/bios.S 2009/04/22 17:13:36 1.1
+++ src/sys/arch/landisk/stand/bootxx/bios.S 2012/01/21 19:44:30 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: bios.S,v 1.1 2009/04/22 17:13:36 tsutsui Exp $ */ 1/* $NetBSD: bios.S,v 1.2 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <machine/asm.h> 28#include <machine/asm.h>
30 29
31/* 30/*
32 * int getchar(void); 31 * int getchar(void);
33 */ 32 */
34ENTRY(getchar) 33ENTRY(getchar)
35 mov #0, r4 34 mov #0, r4
36 mov #1, r0 35 mov #1, r0
37 trapa #0x3f 36 trapa #0x3f
38 rts 37 rts
39 nop 38 nop
cvs diff -r1.1 -r1.2 src/sys/arch/landisk/stand/bootxx/bootxx.S (expand / switch to unified diff)

--- src/sys/arch/landisk/stand/bootxx/bootxx.S 2006/09/01 21:26:19 1.1
+++ src/sys/arch/landisk/stand/bootxx/bootxx.S 2012/01/21 19:44:30 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: bootxx.S,v 1.1 2006/09/01 21:26:19 uwe Exp $ */ 1/* $NetBSD: bootxx.S,v 1.2 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <machine/asm.h> 28#include <machine/asm.h>
30#include <sys/bootblock.h> 29#include <sys/bootblock.h>
31 30
32ENTRY(bootxx_start) 31ENTRY(bootxx_start)
33 bra bootxx_start1 32 bra bootxx_start1
34 nop 33 nop
35 .balign 4 34 .balign 4
36ENTRY(bootxx_magic) 35ENTRY(bootxx_magic)
37 .long LANDISK_BOOT_MAGIC_1 36 .long LANDISK_BOOT_MAGIC_1
38boot_params: 37boot_params:
39 .long 1f - boot_params 38 .long 1f - boot_params
cvs diff -r1.1 -r1.2 src/sys/arch/landisk/stand/bootxx/pbr.S (expand / switch to unified diff)

--- src/sys/arch/landisk/stand/bootxx/pbr.S 2006/09/01 21:26:19 1.1
+++ src/sys/arch/landisk/stand/bootxx/pbr.S 2012/01/21 19:44:30 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: pbr.S,v 1.1 2006/09/01 21:26:19 uwe Exp $ */ 1/* $NetBSD: pbr.S,v 1.2 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <machine/asm.h> 28#include <machine/asm.h>
30#include <sys/bootblock.h> 29#include <sys/bootblock.h>
31 30
32#ifdef BOOT_FROM_FAT 31#ifdef BOOT_FROM_FAT
33#define MBR_AFTERBPB 90 /* BPB size in FAT32 partition BR */ 32#define MBR_AFTERBPB 90 /* BPB size in FAT32 partition BR */
34#else 33#else
35#define MBR_AFTERBPB 62 /* BPB size in floppy master BR */ 34#define MBR_AFTERBPB 62 /* BPB size in floppy master BR */
36#endif 35#endif
37 36
38ENTRY(start) 37ENTRY(start)
39 bra start0 38 bra start0
cvs diff -r1.1 -r1.2 src/sys/arch/landisk/stand/mbr/mbr.S (expand / switch to unified diff)

--- src/sys/arch/landisk/stand/mbr/mbr.S 2006/09/01 21:26:19 1.1
+++ src/sys/arch/landisk/stand/mbr/mbr.S 2012/01/21 19:44:30 1.2
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: mbr.S,v 1.1 2006/09/01 21:26:19 uwe Exp $ */ 1/* $NetBSD: mbr.S,v 1.2 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <machine/asm.h> 28#include <machine/asm.h>
30#include <sys/bootblock.h> 29#include <sys/bootblock.h>
31 30
32ENTRY(start) 31ENTRY(start)
33 mova mbr_end, r0 32 mova mbr_end, r0
34 mov r0, r11 /* r11: relocate address */ 33 mov r0, r11 /* r11: relocate address */
35 34
36 mov.w mbr_size, r2 35 mov.w mbr_size, r2
37 sub r2, r0 36 sub r2, r0
38 mov r0, r10 /* r10: loaded address */ 37 mov r0, r10 /* r10: loaded address */
39 38
cvs diff -r1.15 -r1.16 src/sys/arch/sh3/dev/shpcic.c (expand / switch to unified diff)

--- src/sys/arch/sh3/dev/shpcic.c 2011/07/01 19:17:38 1.15
+++ src/sys/arch/sh3/dev/shpcic.c 2012/01/21 19:44:30 1.16
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1/* $NetBSD: shpcic.c,v 1.15 2011/07/01 19:17:38 dyoung Exp $ */ 1/* $NetBSD: shpcic.c,v 1.16 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28#include <sys/cdefs.h> 28#include <sys/cdefs.h>
29__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.15 2011/07/01 19:17:38 dyoung Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.16 2012/01/21 19:44:30 nonaka Exp $");
30 30
31#include "opt_pci.h" 31#include "opt_pci.h"
32 32
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/systm.h> 34#include <sys/systm.h>
35#include <sys/kernel.h> 35#include <sys/kernel.h>
36#include <sys/device.h> 36#include <sys/device.h>
37#include <sys/extent.h> 37#include <sys/extent.h>
38#include <sys/malloc.h> 38#include <sys/malloc.h>
39 39
40#include <dev/pci/pcireg.h> 40#include <dev/pci/pcireg.h>
41#include <dev/pci/pcivar.h> 41#include <dev/pci/pcivar.h>
42#include <dev/pci/pciconf.h> 42#include <dev/pci/pciconf.h>
cvs diff -r1.8 -r1.9 src/sys/arch/sh3/dev/shpcicvar.h (expand / switch to unified diff)

--- src/sys/arch/sh3/dev/shpcicvar.h 2011/07/01 19:17:38 1.8
+++ src/sys/arch/sh3/dev/shpcicvar.h 2012/01/21 19:44:30 1.9
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: shpcicvar.h,v 1.8 2011/07/01 19:17:38 dyoung Exp $ */ 1/* $NetBSD: shpcicvar.h,v 1.9 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef _SH3_SHPCICVAR_H_ 28#ifndef _SH3_SHPCICVAR_H_
30#define _SH3_SHPCICVAR_H_ 29#define _SH3_SHPCICVAR_H_
31 30
32#include <sys/bus.h> 31#include <sys/bus.h>
33 32
34bus_space_tag_t shpcic_get_bus_io_tag(void); 33bus_space_tag_t shpcic_get_bus_io_tag(void);
35bus_space_tag_t shpcic_get_bus_mem_tag(void); 34bus_space_tag_t shpcic_get_bus_mem_tag(void);
36bus_dma_tag_t shpcic_get_bus_dma_tag(void); 35bus_dma_tag_t shpcic_get_bus_dma_tag(void);
37 36
38int shpcic_bus_maxdevs(void *v, int busno); 37int shpcic_bus_maxdevs(void *v, int busno);
39pcitag_t shpcic_make_tag(void *v, int bus, int device, int function); 38pcitag_t shpcic_make_tag(void *v, int bus, int device, int function);
cvs diff -r1.2 -r1.3 src/sys/arch/sh3/include/pcicreg.h (expand / switch to unified diff)

--- src/sys/arch/sh3/include/pcicreg.h 2005/12/11 12:18:58 1.2
+++ src/sys/arch/sh3/include/pcicreg.h 2012/01/21 19:44:30 1.3
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: pcicreg.h,v 1.2 2005/12/11 12:18:58 christos Exp $ */ 1/* $NetBSD: pcicreg.h,v 1.3 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 NONAKA Kimihiro 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef _SH3_PCICREG_H__ 28#ifndef _SH3_PCICREG_H__
30#define _SH3_PCICREG_H__ 29#define _SH3_PCICREG_H__
31 30
32#include <sh3/devreg.h> 31#include <sh3/devreg.h>
33 32
34/* 33/*
35 * PCI Controller 34 * PCI Controller
36 */ 35 */
37 36
38#define SH4_PCIC 0xfe200000 37#define SH4_PCIC 0xfe200000
39 38
cvs diff -r1.4 -r1.5 src/sys/arch/zaurus/include/bootinfo.h (expand / switch to unified diff)

--- src/sys/arch/zaurus/include/bootinfo.h 2009/03/11 09:02:04 1.4
+++ src/sys/arch/zaurus/include/bootinfo.h 2012/01/21 19:44:30 1.5
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: bootinfo.h,v 1.4 2009/03/11 09:02:04 nonaka Exp $ */ 1/* $NetBSD: bootinfo.h,v 1.5 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org> 4 * Copyright (C) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef _ZAURUS_BOOTINFO_H_ 28#ifndef _ZAURUS_BOOTINFO_H_
30#define _ZAURUS_BOOTINFO_H_ 29#define _ZAURUS_BOOTINFO_H_
31 30
32#define BOOTARGS_BUFSIZ 256 31#define BOOTARGS_BUFSIZ 256
33#define BOOTARGS_MAGIC 0x4f425344 32#define BOOTARGS_MAGIC 0x4f425344
34 33
35#define BOOTINFO_MAXSIZE (BOOTARGS_BUFSIZ - sizeof(uint32_t)) /* uint32_t for magic */ 34#define BOOTINFO_MAXSIZE (BOOTARGS_BUFSIZ - sizeof(uint32_t)) /* uint32_t for magic */
36 35
37#define BTINFO_BOOTDISK 0 36#define BTINFO_BOOTDISK 0
38#define BTINFO_HOWTO 1 37#define BTINFO_HOWTO 1
39#define BTINFO_CONSDEV 2 38#define BTINFO_CONSDEV 2
cvs diff -r1.11 -r1.12 src/sys/dev/i2c/rs5c372.c (expand / switch to unified diff)

--- src/sys/dev/i2c/rs5c372.c 2011/05/28 13:59:31 1.11
+++ src/sys/dev/i2c/rs5c372.c 2012/01/21 19:44:30 1.12
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1/* $NetBSD: rs5c372.c,v 1.11 2011/05/28 13:59:31 phx Exp $ */ 1/* $NetBSD: rs5c372.c,v 1.12 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2005 Kimihiro Nonaka 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * POSSIBILITY OF SUCH DAMAGE. 
27 */ 26 */
28 27
29#include <sys/cdefs.h> 28#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: rs5c372.c,v 1.11 2011/05/28 13:59:31 phx Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: rs5c372.c,v 1.12 2012/01/21 19:44:30 nonaka Exp $");
31 30
32#include <sys/param.h> 31#include <sys/param.h>
33#include <sys/systm.h> 32#include <sys/systm.h>
34#include <sys/device.h> 33#include <sys/device.h>
35#include <sys/kernel.h> 34#include <sys/kernel.h>
36#include <sys/fcntl.h> 35#include <sys/fcntl.h>
37#include <sys/uio.h> 36#include <sys/uio.h>
38#include <sys/conf.h> 37#include <sys/conf.h>
39#include <sys/event.h> 38#include <sys/event.h>
40 39
41#include <dev/clock_subr.h> 40#include <dev/clock_subr.h>
42 41
43#include <dev/i2c/i2cvar.h> 42#include <dev/i2c/i2cvar.h>
cvs diff -r1.2 -r1.3 src/sys/dev/i2c/rs5c372reg.h (expand / switch to unified diff)

--- src/sys/dev/i2c/rs5c372reg.h 2005/12/11 12:21:23 1.2
+++ src/sys/dev/i2c/rs5c372reg.h 2012/01/21 19:44:30 1.3
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1/* $NetBSD: rs5c372reg.h,v 1.2 2005/12/11 12:21:23 christos Exp $ */ 1/* $NetBSD: rs5c372reg.h,v 1.3 2012/01/21 19:44:30 nonaka Exp $ */
2 2
3/* 3/*-
4 * Copyright (c) 2005 Kimihiro Nonaka 4 * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * POSSIBILITY OF SUCH DAMAGE. 
27 */ 26 */
28 27
29#ifndef _DEV_I2C_RS5C372REG_H_ 28#ifndef _DEV_I2C_RS5C372REG_H_
30#define _DEV_I2C_RS5C372REG_H_ 29#define _DEV_I2C_RS5C372REG_H_
31 30
32/* 31/*
33 * RS5C372[AB] Real-Time Clock 32 * RS5C372[AB] Real-Time Clock
34 */ 33 */
35 34
36#define RS5C372_ADDR 0x32 /* Fixed I2C Slave Address */ 35#define RS5C372_ADDR 0x32 /* Fixed I2C Slave Address */
37 36
38#define RS5C372_SECONDS 0 37#define RS5C372_SECONDS 0
39#define RS5C372_MINUTES 1 38#define RS5C372_MINUTES 1
cvs diff -r1.9 -r1.10 src/sys/dev/sdmmc/sdmmc.c (expand / switch to unified diff)

--- src/sys/dev/sdmmc/sdmmc.c 2011/03/20 03:02:48 1.9
+++ src/sys/dev/sdmmc/sdmmc.c 2012/01/21 19:44:31 1.10
@@ -1,66 +1,65 @@ @@ -1,66 +1,65 @@
1/* $NetBSD: sdmmc.c,v 1.9 2011/03/20 03:02:48 nonaka Exp $ */ 1/* $NetBSD: sdmmc.c,v 1.10 2012/01/21 19:44:31 nonaka Exp $ */
2/* $OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $ */ 2/* $OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> 5 * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
6 * 6 *
7 * Permission to use, copy, modify, and distribute this software for any 7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above 8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies. 9 * copyright notice and this permission notice appear in all copies.
10 * 10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */ 18 */
19 19
20/*- 20/*-
21 * Copyright (c) 2007-2009 NONAKA Kimihiro <nonaka@netbsd.org> 21 * Copyright (C) 2007, 2008, 2009 NONAKA Kimihiro <nonaka@netbsd.org>
22 * All rights reserved. 22 * All rights reserved.
23 * 23 *
24 * Redistribution and use in source and binary forms, with or without 24 * Redistribution and use in source and binary forms, with or without
25 * modification, are permitted provided that the following conditions 25 * modification, are permitted provided that the following conditions
26 * are met: 26 * are met:
27 * 1. Redistributions of source code must retain the above copyright 27 * 1. Redistributions of source code must retain the above copyright
28 * notice, this list of conditions and the following disclaimer. 28 * notice, this list of conditions and the following disclaimer.
29 * 2. Redistributions in binary form must reproduce the above copyright 29 * 2. Redistributions in binary form must reproduce the above copyright
30 * notice, this list of conditions and the following disclaimer in the 30 * notice, this list of conditions and the following disclaimer in the
31 * documentation and/or other materials provided with the distribution. 31 * documentation and/or other materials provided with the distribution.
32 * 32 *
33 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 33 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
34 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 34 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
35 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 35 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
36 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 36 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
37 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 37 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
38 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 38 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
39 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 39 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
40 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 40 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
41 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 41 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
42 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 42 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43 * SUCH DAMAGE. 
44 */ 43 */
45 44
46/* 45/*
47 * Host controller independent SD/MMC bus driver based on information 46 * Host controller independent SD/MMC bus driver based on information
48 * from SanDisk SD Card Product Manual Revision 2.2 (SanDisk), SDIO 47 * from SanDisk SD Card Product Manual Revision 2.2 (SanDisk), SDIO
49 * Simple Specification Version 1.0 (SDIO) and the Linux "mmc" driver. 48 * Simple Specification Version 1.0 (SDIO) and the Linux "mmc" driver.
50 */ 49 */
51 50
52#include <sys/cdefs.h> 51#include <sys/cdefs.h>
53__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.9 2011/03/20 03:02:48 nonaka Exp $"); 52__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.10 2012/01/21 19:44:31 nonaka Exp $");
54 53
55#include <sys/param.h> 54#include <sys/param.h>
56#include <sys/device.h> 55#include <sys/device.h>
57#include <sys/kernel.h> 56#include <sys/kernel.h>
58#include <sys/kthread.h> 57#include <sys/kthread.h>
59#include <sys/malloc.h> 58#include <sys/malloc.h>
60#include <sys/proc.h> 59#include <sys/proc.h>
61#include <sys/systm.h> 60#include <sys/systm.h>
62#include <sys/callout.h> 61#include <sys/callout.h>
63 62
64#include <machine/vmparam.h> 63#include <machine/vmparam.h>
65 64
66#include <dev/sdmmc/sdmmc_ioreg.h> 65#include <dev/sdmmc/sdmmc_ioreg.h>
cvs diff -r1.17 -r1.18 src/sys/dev/sdmmc/sdmmc_mem.c (expand / switch to unified diff)

--- src/sys/dev/sdmmc/sdmmc_mem.c 2011/02/13 07:25:56 1.17
+++ src/sys/dev/sdmmc/sdmmc_mem.c 2012/01/21 19:44:31 1.18
@@ -1,62 +1,61 @@ @@ -1,62 +1,61 @@
1/* $NetBSD: sdmmc_mem.c,v 1.17 2011/02/13 07:25:56 nonaka Exp $ */ 1/* $NetBSD: sdmmc_mem.c,v 1.18 2012/01/21 19:44:31 nonaka Exp $ */
2/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */ 2/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> 5 * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
6 * 6 *
7 * Permission to use, copy, modify, and distribute this software for any 7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above 8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies. 9 * copyright notice and this permission notice appear in all copies.
10 * 10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */ 18 */
19 19
20/*- 20/*-
21 * Copyright (c) 2007-2010 NONAKA Kimihiro <nonaka@netbsd.org> 21 * Copyright (C) 2007, 2008, 2009, 2010 NONAKA Kimihiro <nonaka@netbsd.org>
22 * All rights reserved. 22 * All rights reserved.
23 * 23 *
24 * Redistribution and use in source and binary forms, with or without 24 * Redistribution and use in source and binary forms, with or without
25 * modification, are permitted provided that the following conditions 25 * modification, are permitted provided that the following conditions
26 * are met: 26 * are met:
27 * 1. Redistributions of source code must retain the above copyright 27 * 1. Redistributions of source code must retain the above copyright
28 * notice, this list of conditions and the following disclaimer. 28 * notice, this list of conditions and the following disclaimer.
29 * 2. Redistributions in binary form must reproduce the above copyright 29 * 2. Redistributions in binary form must reproduce the above copyright
30 * notice, this list of conditions and the following disclaimer in the 30 * notice, this list of conditions and the following disclaimer in the
31 * documentation and/or other materials provided with the distribution. 31 * documentation and/or other materials provided with the distribution.
32 * 32 *
33 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 33 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
34 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 34 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
35 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 35 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
36 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 36 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
37 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 37 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
38 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 38 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
39 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 39 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
40 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 40 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
41 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 41 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
42 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 42 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43 * SUCH DAMAGE. 
44 */ 43 */
45 44
46/* Routines for SD/MMC memory cards. */ 45/* Routines for SD/MMC memory cards. */
47 46
48#include <sys/cdefs.h> 47#include <sys/cdefs.h>
49__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.17 2011/02/13 07:25:56 nonaka Exp $"); 48__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.18 2012/01/21 19:44:31 nonaka Exp $");
50 49
51#include <sys/param.h> 50#include <sys/param.h>
52#include <sys/kernel.h> 51#include <sys/kernel.h>
53#include <sys/malloc.h> 52#include <sys/malloc.h>
54#include <sys/systm.h> 53#include <sys/systm.h>
55#include <sys/device.h> 54#include <sys/device.h>
56 55
57#include <dev/sdmmc/sdmmcchip.h> 56#include <dev/sdmmc/sdmmcchip.h>
58#include <dev/sdmmc/sdmmcreg.h> 57#include <dev/sdmmc/sdmmcreg.h>
59#include <dev/sdmmc/sdmmcvar.h> 58#include <dev/sdmmc/sdmmcvar.h>
60 59
61#ifdef SDMMC_DEBUG 60#ifdef SDMMC_DEBUG
62#define DPRINTF(s) do { printf s; } while (/*CONSTCOND*/0) 61#define DPRINTF(s) do { printf s; } while (/*CONSTCOND*/0)