CVS commit: src/sys/dev/usb
Module Name:src Committed By: jruoho Date: Tue Jul 19 06:52:34 UTC 2011 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add E3C EC168 DVB-T adapter. To generate a diff of this commit: cvs rdiff -u -r1.584 -r1.585 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.584 src/sys/dev/usb/usbdevs:1.585 --- src/sys/dev/usb/usbdevs:1.584 Mon Jul 18 20:23:32 2011 +++ src/sys/dev/usb/usbdevs Tue Jul 19 06:52:33 2011 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.584 2011/07/18 20:23:32 jmcneill Exp $ +$NetBSD: usbdevs,v 1.585 2011/07/19 06:52:33 jruoho Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -504,6 +504,7 @@ vendor SWEEX2 0x177f Sweex vendor METAGEEK 0x1781 MetaGeek vendor DISPLAYLINK 0x17e9 DisplayLink +vendor E3C 0x18b4 E3C Technologies vendor AMIT 0x18c5 AMIT vendor QCOM 0x18e8 Qcom vendor LINKSYS3 0x1915 Linksys @@ -1195,6 +1196,9 @@ /* Dynastream Innovations */ product DYNASTREAM ANTDEVBOARD 0x1003 ANT dev board +/* E3C products */ +product E3C EC168 0x1001 EC168 DVB-T Adapter + /* Edimax products */ product EDIMAX RT2870_1 0x7711 RT2870 product EDIMAX EW7717 0x7717 EW-7717
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jruoho
Date: Tue Jul 19 06:53:50 UTC 2011
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.577 -r1.578 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.578 -r1.579 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.577 src/sys/dev/usb/usbdevs.h:1.578
--- src/sys/dev/usb/usbdevs.h:1.577 Mon Jul 18 20:24:18 2011
+++ src/sys/dev/usb/usbdevs.h Tue Jul 19 06:53:50 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.577 2011/07/18 20:24:18 jmcneill Exp $ */
+/* $NetBSD: usbdevs.h,v 1.578 2011/07/19 06:53:50 jruoho Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.584 2011/07/18 20:23:32 jmcneill Exp
+ * NetBSD: usbdevs,v 1.585 2011/07/19 06:52:33 jruoho Exp
*/
/*
@@ -511,6 +511,7 @@
#define USB_VENDOR_SWEEX2 0x177f /* Sweex */
#define USB_VENDOR_METAGEEK 0x1781 /* MetaGeek */
#define USB_VENDOR_DISPLAYLINK 0x17e9 /* DisplayLink */
+#define USB_VENDOR_E3C 0x18b4 /* E3C Technologies */
#define USB_VENDOR_AMIT 0x18c5 /* AMIT */
#define USB_VENDOR_QCOM 0x18e8 /* Qcom */
#define USB_VENDOR_LINKSYS3 0x1915 /* Linksys */
@@ -1202,6 +1203,9 @@
/* Dynastream Innovations */
#define USB_PRODUCT_DYNASTREAM_ANTDEVBOARD 0x1003 /* ANT dev board */
+/* E3C products */
+#define USB_PRODUCT_E3C_EC168 0x1001 /* EC168 DVB-T Adapter */
+
/* Edimax products */
#define USB_PRODUCT_EDIMAX_RT2870_1 0x7711 /* RT2870 */
#define USB_PRODUCT_EDIMAX_EW7717 0x7717 /* EW-7717 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.578 src/sys/dev/usb/usbdevs_data.h:1.579
--- src/sys/dev/usb/usbdevs_data.h:1.578 Mon Jul 18 20:24:18 2011
+++ src/sys/dev/usb/usbdevs_data.h Tue Jul 19 06:53:50 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.578 2011/07/18 20:24:18 jmcneill Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.579 2011/07/19 06:53:50 jruoho Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.584 2011/07/18 20:23:32 jmcneill Exp
+ * NetBSD: usbdevs,v 1.585 2011/07/19 06:52:33 jruoho Exp
*/
/*
@@ -1823,6 +1823,10 @@
DisplayLink,
},
{
+ USB_VENDOR_E3C,
+ E3C Technologies,
+ },
+ {
USB_VENDOR_AMIT,
AMIT,
},
@@ -2015,7 +2019,7 @@
GNU Radio USRP,
},
};
-const int usb_nvendors = 494;
+const int usb_nvendors = 495;
const struct usb_product usb_products[] = {
{
@@ -3783,6 +3787,10 @@
ANT dev board,
},
{
+ USB_VENDOR_E3C, USB_PRODUCT_E3C_EC168,
+ EC168 DVB-T Adapter,
+ },
+ {
USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_RT2870_1,
RT2870,
},
@@ -8447,4 +8455,4 @@
Prestige,
},
};
-const int usb_nproducts = 1607;
+const int usb_nproducts = 1608;
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: manu
Date: Tue Jul 19 07:29:39 UTC 2011
Modified Files:
src/lib/libperfuse: ops.c
Log Message:
Make sure libperfuse still builds on netbsd-5.1
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libperfuse/ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.34 src/lib/libperfuse/ops.c:1.35
--- src/lib/libperfuse/ops.c:1.34 Mon Jul 18 02:14:01 2011
+++ src/lib/libperfuse/ops.c Tue Jul 19 07:29:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.34 2011/07/18 02:14:01 manu Exp $ */
+/* $NetBSD: ops.c,v 1.35 2011/07/19 07:29:39 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -3135,6 +3135,7 @@
puffs_len = foh-len - sizeof(*foh);
if (attrs != NULL) {
+#ifdef PUFFS_EXTATTR_LIST_LENPREFIX
/*
* Convert the FUSE reply to length prefixed strings
* if this is what the kernel wants.
@@ -3148,6 +3149,7 @@
*(np + i) = (uint8_t)attrlen;
}
}
+#endif /* PUFFS_EXTATTR_LIST_LENPREFIX */
(void)memcpy(attrs, np, puffs_len);
*resid -= puffs_len;
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Tue Jul 19 12:23:04 UTC 2011
Modified Files:
src/sys/dev/usb: files.usb
Added Files:
src/sys/dev/usb: irmce.c
Log Message:
add driver for SMK eHome Infrared Transceiver
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/dev/usb/files.usb
cvs rdiff -u -r0 -r1.1 src/sys/dev/usb/irmce.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.108 src/sys/dev/usb/files.usb:1.109
--- src/sys/dev/usb/files.usb:1.108 Mon Jul 11 18:02:04 2011
+++ src/sys/dev/usb/files.usb Tue Jul 19 12:23:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.108 2011/07/11 18:02:04 jmcneill Exp $
+# $NetBSD: files.usb,v 1.109 2011/07/19 12:23:04 jmcneill Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -128,6 +128,11 @@
attach ustir at usbdevif
file dev/usb/ustir.c ustir
+# Windows Media Center IR tranceivers
+device irmce: irbus
+attach irmce at usbifif
+file dev/usb/irmce.c irmce
+
# Bluetooth controllers
device ubt: btbus, bluetooth
Added files:
Index: src/sys/dev/usb/irmce.c
diff -u /dev/null src/sys/dev/usb/irmce.c:1.1
--- /dev/null Tue Jul 19 12:23:04 2011
+++ src/sys/dev/usb/irmce.c Tue Jul 19 12:23:04 2011
@@ -0,0 +1,626 @@
+/* $NetBSD: irmce.c,v 1.1 2011/07/19 12:23:04 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * IR receiver/transceiver for Windows Media Center
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: irmce.c,v 1.1 2011/07/19 12:23:04 jmcneill Exp $);
+
+#include sys/types.h
+#include sys/param.h
+#include sys/systm.h
+#include sys/device.h
+#include sys/conf.h
+#include sys/bus.h
+#include sys/select.h
+#include sys/module.h
+
+#include dev/usb/usb.h
+#include dev/usb/usbdi.h
+#include dev/usb/usbdi_util.h
+#include dev/usb/usbdevs.h
+
+#include dev/ir/ir.h
+#include dev/ir/cirio.h
+#include dev/ir/cirvar.h
+
+enum irmce_state {
+ IRMCE_STATE_HEADER,
+ IRMCE_STATE_IRDATA,
+ IRMCE_STATE_CMDHEADER,
+ IRMCE_STATE_CMDDATA,
+};
+
+struct irmce_softc {
+ device_t sc_dev;
+ device_t sc_cirdev;
+
+ usbd_device_handle sc_udev;
+ usbd_interface_handle sc_iface;
+
+ int sc_bulkin_ep;
+ uint16_t sc_bulkin_maxpktsize;
+ usbd_pipe_handle sc_bulkin_pipe;
+ usbd_xfer_handle sc_bulkin_xfer;
+ uint8_t * sc_bulkin_buffer;
+
+ int sc_bulkout_ep;
+ uint16_t sc_bulkout_maxpktsize;
+ usbd_pipe_handle sc_bulkout_pipe;
+ usbd_xfer_handle sc_bulkout_xfer;
+ uint8_t * sc_bulkout_buffer;
+
+ bool sc_raw;
+
+ uint8_t sc_ir_buf[16];
+ size_t sc_ir_bufused;
+ size_t sc_ir_resid;
+ enum irmce_state sc_ir_state;
+ uint8_t sc_ir_header;
+
+ bool sc_rc6_hb[256];
+ size_t sc_rc6_nhb;
+};
+
+static int irmce_match(device_t, cfdata_t, void *);
+static void irmce_attach(device_t, device_t, void *);
+static int irmce_detach(device_t, int);
+static void irmce_childdet(device_t, device_t);
+static int irmce_activate(device_t, enum devact);
+static int irmce_rescan(device_t, const char *, const int *);
+
+static int irmce_print(void *, const char *);
+
+static int irmce_reset(struct irmce_softc *);
+
+static int irmce_open(void *, int, int, struct proc *);
+static int irmce_close(void *, int, int, struct proc *);
+static int irmce_read(void *, struct uio *, int);
+static int irmce_write(void *, struct uio *, int);
+static int irmce_setparams(void *, struct cir_params *);
+
+static const struct cir_methods
CVS commit: src/sys/modules/irmce
Module Name:src
Committed By: jmcneill
Date: Tue Jul 19 12:23:51 UTC 2011
Added Files:
src/sys/modules/irmce: Makefile irmce.ioconf
Log Message:
irmce module glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/irmce/Makefile \
src/sys/modules/irmce/irmce.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/irmce/Makefile
diff -u /dev/null src/sys/modules/irmce/Makefile:1.1
--- /dev/null Tue Jul 19 12:23:51 2011
+++ src/sys/modules/irmce/Makefile Tue Jul 19 12:23:51 2011
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2011/07/19 12:23:51 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/dev/usb
+
+KMOD= irmce
+IOCONF= irmce.ioconf
+SRCS= irmce.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
Index: src/sys/modules/irmce/irmce.ioconf
diff -u /dev/null src/sys/modules/irmce/irmce.ioconf:1.1
--- /dev/null Tue Jul 19 12:23:51 2011
+++ src/sys/modules/irmce/irmce.ioconf Tue Jul 19 12:23:51 2011
@@ -0,0 +1,10 @@
+# $NetBSD: irmce.ioconf,v 1.1 2011/07/19 12:23:51 jmcneill Exp $
+
+ioconf irmce
+
+include conf/files
+include dev/usb/files.usb
+
+pseudo-root uhub*
+
+irmce* at uhub?
CVS commit: src/sys/arch/shark
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:07:43 UTC 2011
Modified Files:
src/sys/arch/shark/include: Makefile
src/sys/arch/shark/isa: isa_io.c isadma_machdep.c
src/sys/arch/shark/ofw: chipsfb_ofbus.c com_ofisa_machdep.c
if_cs_ofisa_machdep.c igsfb_ofbus.c lpt_ofisa_machdep.c
ofisa_machdep.c ofrom.c ofw.c wdc_ofisa_machdep.c
src/sys/arch/shark/shark: consinit.c i8042.c ns87307.c sequoia.c
Added Files:
src/sys/arch/shark/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/shark/include: bus.h
Log Message:
Change machine/bus.h to sys/bus.h throughout.
Split bus.h - bus_{defs,funcs}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/include/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/arch/shark/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/shark/include/bus_defs.h \
src/sys/arch/shark/include/bus_funcs.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/shark/isa/isa_io.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/shark/isa/isadma_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/shark/ofw/chipsfb_ofbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/shark/ofw/com_ofisa_machdep.c \
src/sys/arch/shark/ofw/wdc_ofisa_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/shark/ofw/if_cs_ofisa_machdep.c \
src/sys/arch/shark/ofw/ofisa_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/ofw/igsfb_ofbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/shark/ofw/lpt_ofisa_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/shark/ofw/ofrom.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/shark/ofw/ofw.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/shark/shark/consinit.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/shark/shark/i8042.c \
src/sys/arch/shark/shark/ns87307.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/shark/sequoia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/shark/include/Makefile
diff -u src/sys/arch/shark/include/Makefile:1.11 src/sys/arch/shark/include/Makefile:1.12
--- src/sys/arch/shark/include/Makefile:1.11 Sun Jul 17 20:54:47 2011
+++ src/sys/arch/shark/include/Makefile Tue Jul 19 15:07:42 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2011/07/17 20:54:47 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2011/07/19 15:07:42 dyoung Exp $
INCSDIR= /usr/include/shark
INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/shark/isa/isa_io.c
diff -u src/sys/arch/shark/isa/isa_io.c:1.10 src/sys/arch/shark/isa/isa_io.c:1.11
--- src/sys/arch/shark/isa/isa_io.c:1.10 Sat Mar 14 21:04:16 2009
+++ src/sys/arch/shark/isa/isa_io.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.10 2009/03/14 21:04:16 dsl Exp $ */
+/* $NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright 1997
@@ -38,11 +38,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isa_io.c,v 1.10 2009/03/14 21:04:16 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
-#include machine/bus.h
+#include sys/bus.h
#include machine/pio.h
#include machine/isa_machdep.h
#include machine/ofw.h
Index: src/sys/arch/shark/isa/isadma_machdep.c
diff -u src/sys/arch/shark/isa/isadma_machdep.c:1.14 src/sys/arch/shark/isa/isadma_machdep.c:1.15
--- src/sys/arch/shark/isa/isadma_machdep.c:1.14 Wed Mar 18 10:22:36 2009
+++ src/sys/arch/shark/isa/isadma_machdep.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.14 2009/03/18 10:22:36 cegger Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isadma_machdep.c,v 1.14 2009/03/18 10:22:36 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $);
#define ISA_DMA_STATS
@@ -44,7 +44,7 @@
#include sys/mbuf.h
#define _ARM32_BUS_DMA_PRIVATE
-#include machine/bus.h
+#include sys/bus.h
#include dev/isa/isareg.h
#include dev/isa/isavar.h
Index: src/sys/arch/shark/ofw/chipsfb_ofbus.c
diff -u src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.1 src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.2
--- src/sys/arch/shark/ofw/chipsfb_ofbus.c:1.1 Wed Mar 23 04:06:03 2011
+++ src/sys/arch/shark/ofw/chipsfb_ofbus.c Tue Jul 19 15:07:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chipsfb_ofbus.c,v 1.1 2011/03/23 04:06:03 macallan Exp $ */
+/* $NetBSD: chipsfb_ofbus.c,v 1.2 2011/07/19 15:07:43 dyoung Exp $ */
/*
* Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: chipsfb_ofbus.c,v 1.1 2011/03/23 04:06:03 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: chipsfb_ofbus.c,v 1.2 2011/07/19 15:07:43 dyoung
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: dyoung Date: Tue Jul 19 15:08:56 UTC 2011 Modified Files: src/distrib/sets/lists/comp: md.shark Log Message: Make shark/bus.h obsolete. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/comp/md.shark Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.shark diff -u src/distrib/sets/lists/comp/md.shark:1.18 src/distrib/sets/lists/comp/md.shark:1.19 --- src/distrib/sets/lists/comp/md.shark:1.18 Mon Jul 18 17:39:05 2011 +++ src/distrib/sets/lists/comp/md.shark Tue Jul 19 15:08:55 2011 @@ -1,10 +1,10 @@ -# $NetBSD: md.shark,v 1.18 2011/07/18 17:39:05 dyoung Exp $ +# $NetBSD: md.shark,v 1.19 2011/07/19 15:08:55 dyoung Exp $ ./usr/include/sharkcomp-c-include ./usr/include/shark/ansi.h comp-c-include ./usr/include/shark/aout_machdep.h comp-c-include ./usr/include/shark/asm.h comp-c-include ./usr/include/shark/bswap.h comp-c-include -./usr/include/shark/bus.h comp-c-include +./usr/include/shark/bus.h comp-obsolete obsolete ./usr/include/shark/cdefs.h comp-c-include ./usr/include/shark/cpu.h comp-c-include ./usr/include/shark/db_machdep.h comp-obsolete obsolete
CVS commit: src/sys/arch/zaurus
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:11:49 UTC 2011
Modified Files:
src/sys/arch/zaurus/dev: scoop.c zlcd.c zssp.c zusb.c
src/sys/arch/zaurus/include: Makefile
src/sys/arch/zaurus/zaurus: machdep.c
Added Files:
src/sys/arch/zaurus/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/zaurus/include: bus.h
Log Message:
Change machine/bus.h to sys/bus.h throughout.
Split bus.h - bus_{defs,funcs}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/dev/scoop.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/zaurus/dev/zusb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/zaurus/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/include/bus_defs.h \
src/sys/arch/zaurus/include/bus_funcs.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/zaurus/zaurus/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/zaurus/dev/scoop.c
diff -u src/sys/arch/zaurus/dev/scoop.c:1.8 src/sys/arch/zaurus/dev/scoop.c:1.9
--- src/sys/arch/zaurus/dev/scoop.c:1.8 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/scoop.c Tue Jul 19 15:11:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: scoop.c,v 1.8 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: scoop.c,v 1.9 2011/07/19 15:11:49 dyoung Exp $ */
/* $OpenBSD: zaurus_scoop.c,v 1.12 2005/11/17 05:26:31 uwe Exp $ */
/*
@@ -18,15 +18,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scoop.c,v 1.8 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: scoop.c,v 1.9 2011/07/19 15:11:49 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/device.h
#include sys/conf.h
#include sys/gpio.h
-
-#include machine/bus.h
+#include sys/bus.h
#include arm/xscale/pxa2x0var.h
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.14 src/sys/arch/zaurus/dev/zlcd.c:1.15
--- src/sys/arch/zaurus/dev/zlcd.c:1.14 Tue Jun 21 18:13:19 2011
+++ src/sys/arch/zaurus/dev/zlcd.c Tue Jul 19 15:11:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $ */
+/* $NetBSD: zlcd.c,v 1.15 2011/07/19 15:11:49 dyoung Exp $ */
/* $OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $ */
/* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
@@ -43,13 +43,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.14 2011/06/21 18:13:19 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zlcd.c,v 1.15 2011/07/19 15:11:49 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/conf.h
#include sys/uio.h
#include sys/malloc.h
+#include sys/bus.h
#include dev/cons.h
#include dev/wscons/wsconsio.h
@@ -58,7 +59,6 @@
#include dev/hpc/hpcfbio.h
-#include machine/bus.h
#include arm/xscale/pxa2x0var.h
#include arm/xscale/pxa2x0reg.h
#include arm/xscale/pxa2x0_lcd.h
Index: src/sys/arch/zaurus/dev/zssp.c
diff -u src/sys/arch/zaurus/dev/zssp.c:1.10 src/sys/arch/zaurus/dev/zssp.c:1.11
--- src/sys/arch/zaurus/dev/zssp.c:1.10 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zssp.c Tue Jul 19 15:11:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zssp.c,v 1.10 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: zssp.c,v 1.11 2011/07/19 15:11:49 dyoung Exp $ */
/* $OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $ */
/*
@@ -18,13 +18,12 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zssp.c,v 1.10 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zssp.c,v 1.11 2011/07/19 15:11:49 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/device.h
-
-#include machine/bus.h
+#include sys/bus.h
#include arm/xscale/pxa2x0reg.h
#include arm/xscale/pxa2x0var.h
Index: src/sys/arch/zaurus/dev/zusb.c
diff -u src/sys/arch/zaurus/dev/zusb.c:1.5 src/sys/arch/zaurus/dev/zusb.c:1.6
--- src/sys/arch/zaurus/dev/zusb.c:1.5 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zusb.c Tue Jul 19 15:11:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zusb.c,v 1.5 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: zusb.c,v 1.6 2011/07/19 15:11:49 dyoung Exp $ */
/*
* Copyright (c) 2008 Christopher Gilbert
@@ -27,18 +27,18 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zusb.c,v 1.5 2011/06/19 16:20:09 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zusb.c,v 1.6 2011/07/19 15:11:49 dyoung Exp $);
#include sys/param.h
#include sys/device.h
#include sys/kernel.h
+#include sys/bus.h
#include arm/xscale/pxa2x0reg.h
#include arm/xscale/pxa2x0var.h
#include arm/xscale/pxa2x0_gpio.h
#include machine/intr.h
-#include machine/bus.h
#include zaurus/zaurus/zaurus_reg.h
#include zaurus/zaurus/zaurus_var.h
Index: src/sys/arch/zaurus/include/Makefile
diff -u
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: dyoung Date: Tue Jul 19 15:12:26 UTC 2011 Modified Files: src/distrib/sets/lists/comp: md.zaurus Log Message: Mark zaurus/bus.h obsolete. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/comp/md.zaurus Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.zaurus diff -u src/distrib/sets/lists/comp/md.zaurus:1.8 src/distrib/sets/lists/comp/md.zaurus:1.9 --- src/distrib/sets/lists/comp/md.zaurus:1.8 Mon Jul 18 17:39:05 2011 +++ src/distrib/sets/lists/comp/md.zaurus Tue Jul 19 15:12:26 2011 @@ -1,11 +1,11 @@ -# $NetBSD: md.zaurus,v 1.8 2011/07/18 17:39:05 dyoung Exp $ +# $NetBSD: md.zaurus,v 1.9 2011/07/19 15:12:26 dyoung Exp $ ./usr/include/zauruscomp-c-include ./usr/include/zaurus/ansi.h comp-c-include ./usr/include/zaurus/aout_machdep.h comp-c-include ./usr/include/zaurus/apmvar.h comp-c-include ./usr/include/zaurus/asm.h comp-c-include ./usr/include/zaurus/bswap.h comp-c-include -./usr/include/zaurus/bus.h comp-c-include +./usr/include/zaurus/bus.h comp-obsolete obsolete ./usr/include/zaurus/cdefs.h comp-c-include ./usr/include/zaurus/cpu.h comp-c-include ./usr/include/zaurus/disklabel.h comp-c-include
CVS commit: src
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:17:20 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.mmeye
src/sys/arch/mmeye/dev: com_mainbus.c mmeyepcmcia.c
src/sys/arch/mmeye/include: Makefile autoconf.h
Added Files:
src/sys/arch/mmeye/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/mmeye/include: bus.h
Log Message:
Change machine/bus.h to sys/bus.h throughout.
Split bus.h - bus_{defs,funcs}.h.
Mark mmeye/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/comp/md.mmeye
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mmeye/dev/com_mainbus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mmeye/dev/mmeyepcmcia.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mmeye/include/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mmeye/include/autoconf.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/mmeye/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/mmeye/include/bus_defs.h \
src/sys/arch/mmeye/include/bus_funcs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.mmeye
diff -u src/distrib/sets/lists/comp/md.mmeye:1.29 src/distrib/sets/lists/comp/md.mmeye:1.30
--- src/distrib/sets/lists/comp/md.mmeye:1.29 Mon Jul 18 17:39:05 2011
+++ src/distrib/sets/lists/comp/md.mmeye Tue Jul 19 15:17:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.mmeye,v 1.29 2011/07/18 17:39:05 dyoung Exp $
+# $NetBSD: md.mmeye,v 1.30 2011/07/19 15:17:20 dyoung Exp $
./usr/include/ieeefp.hcomp-c-include
./usr/include/mmeyecomp-c-include
./usr/include/mmeye/_G_config.h comp-obsolete obsolete
@@ -7,7 +7,7 @@
./usr/include/mmeye/asm.h comp-c-include
./usr/include/mmeye/bootinfo.h comp-obsolete obsolete
./usr/include/mmeye/bswap.h comp-c-include
-./usr/include/mmeye/bus.h comp-c-include
+./usr/include/mmeye/bus.h comp-obsolete obsolete
./usr/include/mmeye/cdefs.h comp-c-include
./usr/include/mmeye/coff_machdep.h comp-c-include
./usr/include/mmeye/conf.h comp-obsolete obsolete
Index: src/sys/arch/mmeye/dev/com_mainbus.c
diff -u src/sys/arch/mmeye/dev/com_mainbus.c:1.11 src/sys/arch/mmeye/dev/com_mainbus.c:1.12
--- src/sys/arch/mmeye/dev/com_mainbus.c:1.11 Sat Feb 19 10:46:28 2011
+++ src/sys/arch/mmeye/dev/com_mainbus.c Tue Jul 19 15:17:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mainbus.c,v 1.11 2011/02/19 10:46:28 kiyohara Exp $ */
+/* $NetBSD: com_mainbus.c,v 1.12 2011/07/19 15:17:20 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.11 2011/02/19 10:46:28 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.12 2011/07/19 15:17:20 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -36,8 +36,8 @@
#include sys/termios.h
#include dev/cons.h
#include sys/conf.h
+#include sys/bus.h
-#include machine/bus.h
#include machine/intr.h
#include machine/autoconf.h
#include machine/mmeye.h
Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c
diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.19 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.20
--- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.19 Sat Feb 19 10:46:28 2011
+++ src/sys/arch/mmeye/dev/mmeyepcmcia.c Tue Jul 19 15:17:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mmeyepcmcia.c,v 1.19 2011/02/19 10:46:28 kiyohara Exp $ */
+/* $NetBSD: mmeyepcmcia.c,v 1.20 2011/07/19 15:17:20 dyoung Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mmeyepcmcia.c,v 1.19 2011/02/19 10:46:28 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: mmeyepcmcia.c,v 1.20 2011/07/19 15:17:20 dyoung Exp $);
#include sys/types.h
#include sys/param.h
@@ -48,11 +48,11 @@
#include sys/extent.h
#include sys/malloc.h
#include sys/kthread.h
+#include sys/bus.h
#include uvm/uvm_extern.h
#include machine/autoconf.h
-#include machine/bus.h
#include machine/intr.h
#include machine/mmeye.h
Index: src/sys/arch/mmeye/include/Makefile
diff -u src/sys/arch/mmeye/include/Makefile:1.24 src/sys/arch/mmeye/include/Makefile:1.25
--- src/sys/arch/mmeye/include/Makefile:1.24 Sun Jul 17 20:54:44 2011
+++ src/sys/arch/mmeye/include/Makefile Tue Jul 19 15:17:20 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2011/07/17 20:54:44 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2011/07/19 15:17:20 dyoung Exp $
INCSDIR= /usr/include/mmeye
INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h coff_machdep.h cpu.h cputypes.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/mmeye/include/autoconf.h
diff -u src/sys/arch/mmeye/include/autoconf.h:1.4 src/sys/arch/mmeye/include/autoconf.h:1.5
--- src/sys/arch/mmeye/include/autoconf.h:1.4 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mmeye/include/autoconf.h Tue Jul 19 15:17:20 2011
@@ -1,4
CVS commit: src
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:30:53 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.hpcsh
src/sys/arch/hpcsh/dev: pfckbd.c
src/sys/arch/hpcsh/dev/hd64461: hd64461.c hd64461_machdep.c
hd64461pcmcia.c hd64461uart.c hd64461video.c
src/sys/arch/hpcsh/dev/hd64465: hd64465.c hd64465pcmcia.c hd64465uart.c
src/sys/arch/hpcsh/hpcsh: autoconf.c bus_space.c
src/sys/arch/hpcsh/include: Makefile
Log Message:
Change machine/bus.h to sys/bus.h throughout.
Split bus.h - bus_{defs,funcs}.h.
Mark hpcsh/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/comp/md.hpcsh
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcsh/dev/pfckbd.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcsh/dev/hd64461/hd64461.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/hpcsh/dev/hd64461/hd64461video.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcsh/dev/hd64465/hd64465.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcsh/dev/hd64465/hd64465uart.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpcsh/hpcsh/autoconf.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcsh/hpcsh/bus_space.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcsh/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.hpcsh
diff -u src/distrib/sets/lists/comp/md.hpcsh:1.25 src/distrib/sets/lists/comp/md.hpcsh:1.26
--- src/distrib/sets/lists/comp/md.hpcsh:1.25 Mon Jul 18 17:39:05 2011
+++ src/distrib/sets/lists/comp/md.hpcsh Tue Jul 19 15:30:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcsh,v 1.25 2011/07/18 17:39:05 dyoung Exp $
+# $NetBSD: md.hpcsh,v 1.26 2011/07/19 15:30:51 dyoung Exp $
./usr/include/hpcshcomp-c-include
./usr/include/hpcsh/_G_config.h comp-obsolete obsolete
./usr/include/hpcsh/ansi.h comp-c-include
@@ -7,7 +7,7 @@
./usr/include/hpcsh/asm.h comp-c-include
./usr/include/hpcsh/bootinfo.h comp-c-include
./usr/include/hpcsh/bswap.h comp-c-include
-./usr/include/hpcsh/bus.h comp-c-include
+./usr/include/hpcsh/bus.h comp-obsolete obsolete
./usr/include/hpcsh/cdefs.h comp-c-include
./usr/include/hpcsh/coff_machdep.h comp-c-include
./usr/include/hpcsh/conf.h comp-obsolete obsolete
Index: src/sys/arch/hpcsh/dev/pfckbd.c
diff -u src/sys/arch/hpcsh/dev/pfckbd.c:1.27 src/sys/arch/hpcsh/dev/pfckbd.c:1.28
--- src/sys/arch/hpcsh/dev/pfckbd.c:1.27 Sun Apr 5 02:29:40 2009
+++ src/sys/arch/hpcsh/dev/pfckbd.c Tue Jul 19 15:30:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pfckbd.c,v 1.27 2009/04/05 02:29:40 uwe Exp $ */
+/* $NetBSD: pfckbd.c,v 1.28 2011/07/19 15:30:51 dyoung Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
* currently, HP Jornada 680/690, HITACHI PERSONA HPW-50PAD only.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pfckbd.c,v 1.27 2009/04/05 02:29:40 uwe Exp $);
+__KERNEL_RCSID(0, $NetBSD: pfckbd.c,v 1.28 2011/07/19 15:30:51 dyoung Exp $);
#include debug_hpcsh.h
@@ -42,8 +42,8 @@
#include sys/systm.h
#include sys/device.h
#include sys/callout.h
+#include sys/bus.h
-#include machine/bus.h
#include machine/platid.h
#include machine/platid_mask.h
Index: src/sys/arch/hpcsh/dev/hd64461/hd64461.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461.c:1.23 src/sys/arch/hpcsh/dev/hd64461/hd64461.c:1.24
--- src/sys/arch/hpcsh/dev/hd64461/hd64461.c:1.23 Thu May 13 18:07:40 2010
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461.c Tue Jul 19 15:30:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64461.c,v 1.23 2010/05/13 18:07:40 kiyohara Exp $ */
+/* $NetBSD: hd64461.c,v 1.24 2011/07/19 15:30:52 dyoung Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hd64461.c,v 1.23 2010/05/13 18:07:40 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: hd64461.c,v 1.24 2011/07/19 15:30:52 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/device.h
#include sys/reboot.h
+#include sys/bus.h
-#include machine/bus.h
#include machine/intr.h
#include machine/debug.h
Index: src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.5 src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.6
--- src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c:1.5 Mon Apr 28 20:23:22 2008
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c Tue Jul 19 15:30:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64461_machdep.c,v 1.5 2008/04/28 20:23:22 martin Exp $ */
+/* $NetBSD: hd64461_machdep.c,v 1.6 2011/07/19 15:30:52 dyoung Exp $ */
/*-
*
CVS commit: src/sys/arch/hpcsh/include
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:31:44 UTC 2011
Added Files:
src/sys/arch/hpcsh/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/hpcsh/include: bus.h
Log Message:
Straggler from last: bus.h - bus_{defs,funcs}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r0 src/sys/arch/hpcsh/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcsh/include/bus_defs.h \
src/sys/arch/hpcsh/include/bus_funcs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/hpcsh/include/bus_defs.h
diff -u /dev/null src/sys/arch/hpcsh/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 15:31:44 2011
+++ src/sys/arch/hpcsh/include/bus_defs.h Tue Jul 19 15:31:44 2011
@@ -0,0 +1,366 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:31:44 dyoung Exp $ */
+
+/*-
+ * Copyright (c) 1997, 1998, 2000, 2001, 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1996 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS AS IS
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ * Software Distribution Coordinator or software.distribut...@cs.cmu.edu
+ * School of Computer Science
+ * Carnegie Mellon University
+ * Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#ifndef _HPCSH_BUS_DEFS_H_
+#define _HPCSH_BUS_DEFS_H_
+
+#ifdef _KERNEL
+/*
+ * Turn on BUS_SPACE_DEBUG if the global DEBUG option is enabled.
+ */
+#if defined(DEBUG) !defined(BUS_SPACE_DEBUG)
+#define BUS_SPACE_DEBUG
+#endif
+
+#ifdef BUS_SPACE_DEBUG
+#include sys/systm.h /* for printf() prototype */
+/*
+ * Macros for checking the aligned-ness of pointers passed to bus
+ * space ops. Strict alignment is required by the Alpha architecture,
+ * and a trap will occur if unaligned access is performed. These
+ * may aid in the debugging of a broken device driver by displaying
+ * useful information about the problem.
+ */
+#define __BUS_SPACE_ALIGNED_ADDRESS(p, t)\
+ u_long)(p)) (sizeof(t)-1)) == 0)
+
+#define __BUS_SPACE_ADDRESS_SANITY(p, t, d)\
+({ \
+ if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \
+ printf(%s 0x%lx not aligned to %lu bytes %s:%d\n, \
+ d, (u_long)(p), (u_long)sizeof(t), __FILE__, __LINE__); \
+ }\
+ (void) 0; \
+})
+
+#define BUS_SPACE_ALIGNED_POINTER(p, t) __BUS_SPACE_ALIGNED_ADDRESS(p, t)
+#else
+#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) (void) 0
+#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
+#endif /* BUS_SPACE_DEBUG */
+#endif /* _KERNEL */
+
+/*
+ * Addresses (in bus space).
+ */
+typedef u_long bus_addr_t;
+typedef u_long bus_size_t;
+
+/*
+ * Access methods for bus space.
+ */
+typedef struct
CVS commit: src
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:37:40 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.hpcarm
src/sys/arch/hpcarm/dev: ipaq_atmelgpio.c ipaq_lcd.c ipaq_lcdvar.h
ipaq_pcic.c ipaq_saip.c j720pcic.c sacc_hpcarm.c sed_saip.c
uda1341.c wzero3_kbd.c wzero3_keypad.c wzero3_lcd.c wzero3_mci.c
wzero3_usb.c
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c sa11x0_hpc_machdep.c
src/sys/arch/hpcarm/include: Makefile
Added Files:
src/sys/arch/hpcarm/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/hpcarm/include: bus.h
Log Message:
Change machine/bus.h to sys/bus.h throughout.
Split bus.h - bus_{defs,funcs}.h.
Mark hpcarm/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.hpcarm
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/dev/ipaq_lcd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcarm/dev/ipaq_lcdvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/dev/ipaq_pcic.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hpcarm/dev/ipaq_saip.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcarm/dev/j720pcic.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcarm/dev/sacc_hpcarm.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpcarm/dev/sed_saip.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcarm/dev/uda1341.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcarm/dev/wzero3_kbd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/dev/wzero3_keypad.c \
src/sys/arch/hpcarm/dev/wzero3_usb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcarm/dev/wzero3_lcd.c \
src/sys/arch/hpcarm/dev/wzero3_mci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcarm/include/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/arch/hpcarm/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpcarm/include/bus_defs.h \
src/sys/arch/hpcarm/include/bus_funcs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.hpcarm
diff -u src/distrib/sets/lists/comp/md.hpcarm:1.16 src/distrib/sets/lists/comp/md.hpcarm:1.17
--- src/distrib/sets/lists/comp/md.hpcarm:1.16 Mon Jul 18 17:39:05 2011
+++ src/distrib/sets/lists/comp/md.hpcarm Tue Jul 19 15:37:38 2011
@@ -1,11 +1,11 @@
-# $NetBSD: md.hpcarm,v 1.16 2011/07/18 17:39:05 dyoung Exp $
+# $NetBSD: md.hpcarm,v 1.17 2011/07/19 15:37:38 dyoung Exp $
./usr/include/hpcarmcomp-c-include
./usr/include/hpcarm/ansi.h comp-c-include
./usr/include/hpcarm/aout_machdep.h comp-c-include
./usr/include/hpcarm/apmvar.h comp-c-include
./usr/include/hpcarm/asm.h comp-c-include
./usr/include/hpcarm/bswap.h comp-c-include
-./usr/include/hpcarm/bus.h comp-c-include
+./usr/include/hpcarm/bus.h comp-obsolete obsolete
./usr/include/hpcarm/cdefs.h comp-c-include
./usr/include/hpcarm/cpu.h comp-c-include
./usr/include/hpcarm/db_machdep.h comp-obsolete obsolete
Index: src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
diff -u src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.15 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.16
--- src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.15 Fri May 29 14:15:44 2009
+++ src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_atmelgpio.c,v 1.15 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: ipaq_atmelgpio.c,v 1.16 2011/07/19 15:37:38 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. All rights reserved.
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipaq_atmelgpio.c,v 1.15 2009/05/29 14:15:44 rjs Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipaq_atmelgpio.c,v 1.16 2011/07/19 15:37:38 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -44,8 +44,7 @@
#include sys/kernel.h
#include sys/kthread.h
#include sys/malloc.h
-
-#include machine/bus.h
+#include sys/bus.h
#include hpcarm/dev/ipaq_saipvar.h
#include hpcarm/dev/ipaq_gpioreg.h
Index: src/sys/arch/hpcarm/dev/ipaq_lcd.c
diff -u src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.18 src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.19
--- src/sys/arch/hpcarm/dev/ipaq_lcd.c:1.18 Fri May 29 14:15:44 2009
+++ src/sys/arch/hpcarm/dev/ipaq_lcd.c Tue Jul 19 15:37:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_lcd.c,v 1.18 2009/05/29 14:15:44 rjs Exp $ */
+/* $NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipaq_lcd.c,v 1.18 2009/05/29 14:15:44 rjs Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $);
#define IPAQ_LCD_DEBUG
@@ -40,13 +40,13 @@
#include sys/kernel.h
#include sys/time.h
#include sys/device.h
+#include sys/bus.h
CVS commit: src
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:44:53 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.evbsh3
src/sys/arch/evbsh3/ap_ms104_sh4: if_sm_mainbus.c
src/sys/arch/evbsh3/evbsh3: bus_dma.c machdep.c
src/sys/arch/evbsh3/include: Makefile
src/sys/arch/evbsh3/t_sh7706lan: if_ne_mainbus.c
Added Files:
src/sys/arch/evbsh3/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/evbsh3/include: bus.h
Log Message:
Change machine/bus.h to sys/bus.h throughout.
Split bus.h - bus_{defs,funcs}.h.
Mark evbsh3/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/comp/md.evbsh3
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbsh3/evbsh3/bus_dma.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbsh3/evbsh3/machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbsh3/include/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbsh3/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbsh3/include/bus_defs.h \
src/sys/arch/evbsh3/include/bus_funcs.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.evbsh3
diff -u src/distrib/sets/lists/comp/md.evbsh3:1.27 src/distrib/sets/lists/comp/md.evbsh3:1.28
--- src/distrib/sets/lists/comp/md.evbsh3:1.27 Sun Jul 17 20:54:31 2011
+++ src/distrib/sets/lists/comp/md.evbsh3 Tue Jul 19 15:44:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbsh3,v 1.27 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.evbsh3,v 1.28 2011/07/19 15:44:52 dyoung Exp $
./usr/include/evbsh3comp-c-include
./usr/include/evbsh3/_G_config.h comp-obsolete obsolete
./usr/include/evbsh3/ansi.h comp-c-include
@@ -6,7 +6,7 @@
./usr/include/evbsh3/asm.h comp-c-include
./usr/include/evbsh3/bootinfo.h comp-obsolete obsolete
./usr/include/evbsh3/bswap.h comp-c-include
-./usr/include/evbsh3/bus.h comp-c-include
+./usr/include/evbsh3/bus.h comp-obsolete obsolete
./usr/include/evbsh3/cdefs.h comp-c-include
./usr/include/evbsh3/coff_machdep.h comp-c-include
./usr/include/evbsh3/conf.h comp-obsolete obsolete
Index: src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c
diff -u src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c:1.1 src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c:1.2
--- src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c:1.1 Tue Apr 6 15:54:29 2010
+++ src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c Tue Jul 19 15:44:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_mainbus.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $ */
+/* $NetBSD: if_sm_mainbus.c,v 1.2 2011/07/19 15:44:52 dyoung Exp $ */
/*-
* Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org
@@ -27,11 +27,12 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_sm_mainbus.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_sm_mainbus.c,v 1.2 2011/07/19 15:44:52 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/device.h
+#include sys/bus.h
#include net/if.h
#include net/if_ether.h
@@ -39,7 +40,6 @@
#include machine/autoconf.h
#include machine/intr.h
-#include machine/bus.h
#include dev/mii/mii.h
#include dev/mii/miivar.h
Index: src/sys/arch/evbsh3/evbsh3/bus_dma.c
diff -u src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.2 src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.3
--- src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.2 Fri Nov 12 13:18:57 2010
+++ src/sys/arch/evbsh3/evbsh3/bus_dma.c Tue Jul 19 15:44:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.2 2010/11/12 13:18:57 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.3 2011/07/19 15:44:52 dyoung Exp $ */
/*
* Copyright (c) 2005 NONAKA Kimihiro non...@netbsd.org
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.2 2010/11/12 13:18:57 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.3 2011/07/19 15:44:52 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -34,14 +34,14 @@
#include sys/device.h
#include sys/malloc.h
#include sys/mbuf.h
+#define _EVBSH3_BUS_DMA_PRIVATE
+#include sys/bus.h
#include uvm/uvm.h
#include sh3/cache.h
#include machine/autoconf.h
-#define _EVBSH3_BUS_DMA_PRIVATE
-#include machine/bus.h
#if defined(DEBUG) defined(BUSDMA_DEBUG)
int busdma_debug = 0;
Index: src/sys/arch/evbsh3/evbsh3/machdep.c
diff -u src/sys/arch/evbsh3/evbsh3/machdep.c:1.73 src/sys/arch/evbsh3/evbsh3/machdep.c:1.74
--- src/sys/arch/evbsh3/evbsh3/machdep.c:1.73 Wed Jan 19 09:36:33 2011
+++ src/sys/arch/evbsh3/evbsh3/machdep.c Tue Jul 19 15:44:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.73 2011/01/19 09:36:33 he Exp $ */
+/* $NetBSD: machdep.c,v 1.74 2011/07/19 15:44:52 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
CVS commit: src
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:52:31 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.dreamcast
src/sys/arch/dreamcast/dev: pvr.c
src/sys/arch/dreamcast/dev/g2: aica.c g2bus_bus_mem.c g2busvar.h
g2rtc.c gapspci.c gapspci_dma.c gapspci_pci.c if_mbe_g2.c
src/sys/arch/dreamcast/dev/maple: maple.c mkbd.c
src/sys/arch/dreamcast/include: Makefile
Added Files:
src/sys/arch/dreamcast/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/dreamcast/include: bus.h
Log Message:
Change machine/bus.h to sys/bus.h throughout.
Split bus.h - bus_{defs,funcs}.h.
Mark dreamcast/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.dreamcast
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/dreamcast/dev/g2/aica.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/dreamcast/dev/g2/g2busvar.h \
src/sys/arch/dreamcast/dev/g2/g2rtc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/dreamcast/dev/g2/gapspci.c \
src/sys/arch/dreamcast/dev/g2/gapspci_dma.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/dreamcast/dev/g2/gapspci_pci.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/dreamcast/dev/maple/mkbd.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/dreamcast/include/Makefile
cvs rdiff -u -r1.15 -r0 src/sys/arch/dreamcast/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/dreamcast/include/bus_defs.h \
src/sys/arch/dreamcast/include/bus_funcs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.dreamcast
diff -u src/distrib/sets/lists/comp/md.dreamcast:1.16 src/distrib/sets/lists/comp/md.dreamcast:1.17
--- src/distrib/sets/lists/comp/md.dreamcast:1.16 Mon Jul 18 17:42:34 2011
+++ src/distrib/sets/lists/comp/md.dreamcast Tue Jul 19 15:52:29 2011
@@ -1,11 +1,11 @@
-# $NetBSD: md.dreamcast,v 1.16 2011/07/18 17:42:34 dyoung Exp $
+# $NetBSD: md.dreamcast,v 1.17 2011/07/19 15:52:29 dyoung Exp $
./usr/include/dreamcastcomp-c-include
./usr/include/dreamcast/_G_config.h comp-obsolete obsolete
./usr/include/dreamcast/ansi.h comp-c-include
./usr/include/dreamcast/aout_machdep.h comp-c-include
./usr/include/dreamcast/asm.h comp-c-include
./usr/include/dreamcast/bswap.h comp-c-include
-./usr/include/dreamcast/bus.h comp-c-include
+./usr/include/dreamcast/bus.h comp-obsolete obsolete
./usr/include/dreamcast/cdefs.h comp-c-include
./usr/include/dreamcast/coff_machdep.h comp-c-include
./usr/include/dreamcast/conf.h comp-obsolete obsolete
Index: src/sys/arch/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.32 src/sys/arch/dreamcast/dev/pvr.c:1.33
--- src/sys/arch/dreamcast/dev/pvr.c:1.32 Sat May 21 12:00:18 2011
+++ src/sys/arch/dreamcast/dev/pvr.c Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pvr.c,v 1.32 2011/05/21 12:00:18 tsutsui Exp $ */
+/* $NetBSD: pvr.c,v 1.33 2011/07/19 15:52:29 dyoung Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: pvr.c,v 1.32 2011/05/21 12:00:18 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pvr.c,v 1.33 2011/07/19 15:52:29 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -44,10 +44,10 @@
#include sys/malloc.h
#include sys/buf.h
#include sys/ioctl.h
+#include sys/bus.h
#include machine/vmparam.h
#include machine/cpu.h
-#include machine/bus.h
#include dev/cons.h
Index: src/sys/arch/dreamcast/dev/g2/aica.c
diff -u src/sys/arch/dreamcast/dev/g2/aica.c:1.20 src/sys/arch/dreamcast/dev/g2/aica.c:1.21
--- src/sys/arch/dreamcast/dev/g2/aica.c:1.20 Sun Nov 21 16:11:32 2010
+++ src/sys/arch/dreamcast/dev/g2/aica.c Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aica.c,v 1.20 2010/11/21 16:11:32 tsutsui Exp $ */
+/* $NetBSD: aica.c,v 1.21 2011/07/19 15:52:29 dyoung Exp $ */
/*
* Copyright (c) 2003 SHIMIZU Ryo r...@misakimix.org
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aica.c,v 1.20 2010/11/21 16:11:32 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: aica.c,v 1.21 2011/07/19 15:52:29 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -37,12 +37,12 @@
#include sys/kernel.h
#include sys/proc.h
#include sys/audioio.h
+#include sys/bus.h
#include dev/audio_if.h
#include dev/mulaw.h
#include dev/auconv.h
-#include machine/bus.h
#include machine/sysasicvar.h
#include dreamcast/dev/g2/g2busvar.h
Index: src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.15
CVS commit: src/sys/arch/amiga
Module Name:src Committed By: dyoung Date: Tue Jul 19 15:55:27 UTC 2011 Modified Files: src/sys/arch/amiga/amiga: busfuncs.c simple_busfuncs.c src/sys/arch/amiga/dev: aster.c com_supio.c drsupio.c gvpio.c hyper.c if_bah_zbus.c if_ne_zbus.c ioblix_zbus.c isic_supio.c lpt_supio.c melody.c repulse.c toccata.c wdc_amiga.c wdc_buddha.c Log Message: Change machine/bus.h to sys/bus.h throughout. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/amiga/busfuncs.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/amiga/simple_busfuncs.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amiga/dev/aster.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amiga/dev/com_supio.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amiga/dev/drsupio.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amiga/dev/gvpio.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amiga/dev/hyper.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amiga/dev/if_bah_zbus.c \ src/sys/arch/amiga/dev/if_ne_zbus.c src/sys/arch/amiga/dev/lpt_supio.c \ src/sys/arch/amiga/dev/toccata.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amiga/dev/ioblix_zbus.c \ src/sys/arch/amiga/dev/isic_supio.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/melody.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/repulse.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amiga/dev/wdc_amiga.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/dev/wdc_buddha.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/amiga/busfuncs.c diff -u src/sys/arch/amiga/amiga/busfuncs.c:1.11 src/sys/arch/amiga/amiga/busfuncs.c:1.12 --- src/sys/arch/amiga/amiga/busfuncs.c:1.11 Wed Feb 3 13:56:53 2010 +++ src/sys/arch/amiga/amiga/busfuncs.c Tue Jul 19 15:55:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: busfuncs.c,v 1.11 2010/02/03 13:56:53 phx Exp $ */ +/* $NetBSD: busfuncs.c,v 1.12 2011/07/19 15:55:26 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,14 +30,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: busfuncs.c,v 1.11 2010/02/03 13:56:53 phx Exp $); +__KERNEL_RCSID(0, $NetBSD: busfuncs.c,v 1.12 2011/07/19 15:55:26 dyoung Exp $); /* * Amiga bus access methods for data widths 1 * XXX currently, only 16bit methods are defined */ -#include machine/bus.h +#include sys/bus.h bsr(amiga_contiguous_read_2, u_int16_t); bsw(amiga_contiguous_write_2, u_int16_t); Index: src/sys/arch/amiga/amiga/simple_busfuncs.c diff -u src/sys/arch/amiga/amiga/simple_busfuncs.c:1.6 src/sys/arch/amiga/amiga/simple_busfuncs.c:1.7 --- src/sys/arch/amiga/amiga/simple_busfuncs.c:1.6 Wed Feb 3 13:56:53 2010 +++ src/sys/arch/amiga/amiga/simple_busfuncs.c Tue Jul 19 15:55:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: simple_busfuncs.c,v 1.6 2010/02/03 13:56:53 phx Exp $ */ +/* $NetBSD: simple_busfuncs.c,v 1.7 2011/07/19 15:55:26 dyoung Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: simple_busfuncs.c,v 1.6 2010/02/03 13:56:53 phx Exp $); +__KERNEL_RCSID(0, $NetBSD: simple_busfuncs.c,v 1.7 2011/07/19 15:55:26 dyoung Exp $); /* * Do NOT use this standalone. @@ -44,7 +44,7 @@ Error AMIGA_SIMPLE_BUS_STRIDE not defined in __FILE__, line __LINE__ . #endif -#include machine/bus.h +#include sys/bus.h #define MKN2(x,y) __CONCAT(x, y) #define MKN1(x,y) MKN2(x, y) Index: src/sys/arch/amiga/dev/aster.c diff -u src/sys/arch/amiga/dev/aster.c:1.21 src/sys/arch/amiga/dev/aster.c:1.22 --- src/sys/arch/amiga/dev/aster.c:1.21 Mon Apr 28 20:23:12 2008 +++ src/sys/arch/amiga/dev/aster.c Tue Jul 19 15:55:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: aster.c,v 1.21 2008/04/28 20:23:12 martin Exp $ */ +/* $NetBSD: aster.c,v 1.22 2011/07/19 15:55:26 dyoung Exp $ */ /*- * Copyright (c) 1998,2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: aster.c,v 1.21 2008/04/28 20:23:12 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: aster.c,v 1.22 2011/07/19 15:55:26 dyoung Exp $); /* * zbus ISDN Blaster, ISDN Master driver. @@ -42,8 +42,7 @@ #include sys/device.h #include sys/systm.h #include sys/param.h - -#include machine/bus.h +#include sys/bus.h #include amiga/include/cpu.h Index: src/sys/arch/amiga/dev/com_supio.c diff -u src/sys/arch/amiga/dev/com_supio.c:1.29 src/sys/arch/amiga/dev/com_supio.c:1.30 --- src/sys/arch/amiga/dev/com_supio.c:1.29 Sat Jan 22 17:10:20 2011 +++ src/sys/arch/amiga/dev/com_supio.c Tue Jul 19 15:55:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_supio.c,v 1.29 2011/01/22 17:10:20 tsutsui Exp $ */ +/* $NetBSD: com_supio.c,v 1.30 2011/07/19 15:55:26 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_supio.c,v 1.29 2011/01/22 17:10:20 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: com_supio.c,v 1.30
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: tron
Date: Tue Jul 19 15:59:02 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/cpp: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/gcov: Makefile
Log Message:
Fix remaining SSP build issues if GCC 4.5 is used.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/gcov/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.10 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.10 Tue Jul 19 01:37:59 2011
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Tue Jul 19 15:59:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/07/19 01:37:59 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2011/07/19 15:59:01 tron Exp $
LIBISPRIVATE= yes
@@ -309,7 +309,7 @@
.endif
insn-emit.d insn-emit.o: tm-constrs.h
-COPTS+=-Wno-stack-protector
+CFLAGS+= -Wno-stack-protector
.if ${MACHINE_ARCH} == m68000
COPTS.lambda-code.c= -O0
Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.3 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.3 Sat Jul 2 14:06:42 2011
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Tue Jul 19 15:59:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/02 14:06:42 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/19 15:59:02 tron Exp $
# For ../Makefile.inc and bsd.own.mk
.include bsd.init.mk
@@ -38,6 +38,8 @@
LDADD+= -lintl
+COPTS+= -Wno-stack-protector
+
.include bsd.info.mk
.PATH: ${DIST}/gcc ${DIST}/gcc/doc
Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.4 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.4 Sat Jul 2 14:06:42 2011
+++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Tue Jul 19 15:59:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/02 14:06:42 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/07/19 15:59:02 tron Exp $
LIBISPRIVATE= yes
@@ -34,7 +34,7 @@
.include bsd.lib.mk
-COPTS+= -Wno-stack-protector
+CFLAGS+= -Wno-stack-protector
.PATH: ${DIST}/gcc
Index: src/external/gpl3/gcc/usr.bin/gcov/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.2 src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.2 Tue Jun 28 09:31:11 2011
+++ src/external/gpl3/gcc/usr.bin/gcov/Makefile Tue Jul 19 15:59:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/28 09:31:11 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/19 15:59:02 tron Exp $
.include bsd.own.mk
@@ -15,4 +15,6 @@
LDADD= -L${LIBIBERTYOBJ} -liberty -lintl
+COPTS+= -Wno-stack-protector
+
.PATH: ${DIST}/gcc
CVS commit: src
Module Name:src
Committed By: dyoung
Date: Tue Jul 19 15:59:54 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.acorn32
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c if_cs.c rsbus.c
rsbus.h rsbus_io.c rside.c
src/sys/arch/acorn32/include: Makefile podulebus_machdep.h
src/sys/arch/acorn32/mainbus: atppc_pioc.c com_pioc.c fd.c lpt_pioc.c
pioc.c piocvar.h wdc_pioc.c
src/sys/arch/acorn32/podulebus: amps.c asc.c icside.c if_ne_pbus.c
podulebus_io.c rapide.c sbic.c simide.c
Added Files:
src/sys/arch/acorn32/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/acorn32/include: bus.h
Log Message:
Change machine/bus.h to sys/bus.h throughout.
Split bus.h - bus_{defs,funcs}.h.
Mark acorn32/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/comp/md.acorn32
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn32/eb7500atx/if_cs.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/acorn32/eb7500atx/rsbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/acorn32/eb7500atx/rsbus.h \
src/sys/arch/acorn32/eb7500atx/rsbus_io.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/acorn32/eb7500atx/rside.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn32/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn32/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/acorn32/include/bus_defs.h \
src/sys/arch/acorn32/include/bus_funcs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/acorn32/include/podulebus_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/mainbus/atppc_pioc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn32/mainbus/com_pioc.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn32/mainbus/lpt_pioc.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn32/mainbus/pioc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/acorn32/mainbus/piocvar.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/acorn32/mainbus/wdc_pioc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/acorn32/podulebus/amps.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/acorn32/podulebus/asc.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/acorn32/podulebus/icside.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn32/podulebus/if_ne_pbus.c \
src/sys/arch/acorn32/podulebus/sbic.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn32/podulebus/podulebus_io.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn32/podulebus/rapide.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/acorn32/podulebus/simide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.acorn32
diff -u src/distrib/sets/lists/comp/md.acorn32:1.25 src/distrib/sets/lists/comp/md.acorn32:1.26
--- src/distrib/sets/lists/comp/md.acorn32:1.25 Sun Jul 17 20:54:31 2011
+++ src/distrib/sets/lists/comp/md.acorn32 Tue Jul 19 15:59:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.acorn32,v 1.25 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.acorn32,v 1.26 2011/07/19 15:59:51 dyoung Exp $
#./usr/include/acorn32/devmap.h comp-c-include
./usr/include/acorn32comp-c-include
./usr/include/acorn32/ansi.h comp-c-include
@@ -6,7 +6,7 @@
./usr/include/acorn32/asm.h comp-c-include
./usr/include/acorn32/beep.h comp-obsolete obsolete
./usr/include/acorn32/bswap.h comp-c-include
-./usr/include/acorn32/bus.h comp-c-include
+./usr/include/acorn32/bus.h comp-obsolete obsolete
./usr/include/acorn32/cdefs.h comp-c-include
./usr/include/acorn32/conf.h comp-obsolete obsolete
./usr/include/acorn32/cpu.h comp-c-include
Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.81 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.82
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.81 Thu Jun 30 20:09:16 2011
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Tue Jul 19 15:59:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.81 2011/06/30 20:09:16 wiz Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.82 2011/07/19 15:59:52 dyoung Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: rpc_machdep.c,v 1.81 2011/06/30 20:09:16 wiz Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpc_machdep.c,v 1.82 2011/07/19 15:59:52 dyoung Exp $);
#include sys/systm.h
#include sys/kernel.h
@@ -65,6 +65,7 @@
#include sys/exec.h
#include sys/exec_aout.h
#include sys/ksyms.h
+#include sys/bus.h
#include dev/cons.h
@@ -85,7 +86,6 @@
#include arm/arm32/machdep.h
#include arm/undefined.h
#include machine/rtc.h
-#include machine/bus.h
#include arm/iomd/vidc.h
#include arm/iomd/iomdreg.h
Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u
CVS commit: src/sys/modules
Module Name:src
Committed By: tron
Date: Tue Jul 19 19:19:09 UTC 2011
Modified Files:
src/sys/modules: Makefile
Added Files:
src/sys/modules/v7fs: Makefile
Log Message:
Build 7th Edition(V7) File System as a kernel module.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/v7fs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.76 src/sys/modules/Makefile:1.77
--- src/sys/modules/Makefile:1.76 Fri Jul 15 21:08:48 2011
+++ src/sys/modules/Makefile Tue Jul 19 19:19:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2011/07/15 21:08:48 jmcneill Exp $
+# $NetBSD: Makefile,v 1.77 2011/07/19 19:19:09 tron Exp $
.include bsd.own.mk
@@ -154,6 +154,7 @@
SUBDIR+= viadrm
SUBDIR+= pad
SUBDIR+= padlock
+SUBDIR+= v7fs
SUBDIR+= viac7temp
SUBDIR+= wmieeepc
.endif
Added files:
Index: src/sys/modules/v7fs/Makefile
diff -u /dev/null src/sys/modules/v7fs/Makefile:1.1
--- /dev/null Tue Jul 19 19:19:09 2011
+++ src/sys/modules/v7fs/Makefile Tue Jul 19 19:19:09 2011
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2011/07/19 19:19:09 tron Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/fs/v7fs
+
+KMOD= v7fs
+CPPFLAGS+= -DV7FS_EI
+
+SRCS= v7fs_endian.c
+SRCS+= v7fs_superblock.c
+SRCS+= v7fs_inode.c
+SRCS+= v7fs_dirent.c
+SRCS+= v7fs_datablock.c
+SRCS+= v7fs_file.c
+SRCS+= v7fs_io.c
+SRCS+= v7fs_file_util.c
+SRCS+= v7fs_inode_util.c
+SRCS+= v7fs_superblock_util.c
+SRCS+= v7fs_io_kern.c
+SRCS+= v7fs_extern.c
+SRCS+= v7fs_vnops.c
+SRCS+= v7fs_vfsops.c
+
+.include bsd.kmodule.mk
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: tron Date: Tue Jul 19 19:19:40 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.evbppc mi Log Message: Add v7fs kernel module. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/modules/md.evbppc cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.evbppc diff -u src/distrib/sets/lists/modules/md.evbppc:1.2 src/distrib/sets/lists/modules/md.evbppc:1.3 --- src/distrib/sets/lists/modules/md.evbppc:1.2 Fri Jul 15 08:07:08 2011 +++ src/distrib/sets/lists/modules/md.evbppc Tue Jul 19 19:19:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.2 2011/07/15 08:07:08 he Exp $ +# $NetBSD: md.evbppc,v 1.3 2011/07/19 19:19:39 tron Exp $ ./stand/powerpc-4xx base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod @@ -138,6 +138,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/union/union.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/usbverbose base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/usbverbose/usbverbose.kmod base-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/v7fs base-kernel-modules kmod +./stand/powerpc-4xx/@OSRELEASE@/modules/v7fs/v7fs.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/vnd base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/vnd/vnd.kmod base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules/zfsbase-kernel-modules kmod,zfs Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.22 src/distrib/sets/lists/modules/mi:1.23 --- src/distrib/sets/lists/modules/mi:1.22 Sat Jul 9 14:56:43 2011 +++ src/distrib/sets/lists/modules/mi Tue Jul 19 19:19:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.22 2011/07/09 14:56:43 jmcneill Exp $ +# $NetBSD: mi,v 1.23 2011/07/19 19:19:39 tron Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -140,6 +140,8 @@ ./@MODULEDIR@/union/union.kmod base-kernel-modules kmod ./@MODULEDIR@/usbverbose base-kernel-modules kmod ./@MODULEDIR@/usbverbose/usbverbose.kmod base-kernel-modules kmod +./@MODULEDIR@/v7fsbase-kernel-modules kmod +./@MODULEDIR@/v7fs/v7fs.kmod base-kernel-modules kmod ./@MODULEDIR@/vnd base-kernel-modules kmod ./@MODULEDIR@/vnd/vnd.kmod base-kernel-modules kmod ./@MODULEDIR@/zfsbase-kernel-modules kmod,zfs
CVS commit: src/sys/net
Module Name:src
Committed By: tron
Date: Tue Jul 19 19:42:27 UTC 2011
Modified Files:
src/sys/net: if_tokensubr.c
Log Message:
Fix weird hardware address assignment that GCC 4.5 complains about.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/net/if_tokensubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.60 src/sys/net/if_tokensubr.c:1.61
--- src/sys/net/if_tokensubr.c:1.60 Mon Apr 5 07:22:24 2010
+++ src/sys/net/if_tokensubr.c Tue Jul 19 19:42:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.60 2010/04/05 07:22:24 joerg Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.61 2011/07/19 19:42:27 tron Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tokensubr.c,v 1.60 2010/04/05 07:22:24 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tokensubr.c,v 1.61 2011/07/19 19:42:27 tron Exp $);
#include opt_inet.h
#include opt_atalk.h
@@ -597,10 +597,8 @@
sa.sa_len = sizeof(sa);
eh = (struct ether_header *)sa.sa_data;
for (i = 0; i ISO88025_ADDR_LEN; i++) {
-eh-ether_shost[i] = c = trh-token_dhost[i];
-eh-ether_dhost[i] =
-eh-ether_dhost[i] = trh-token_shost[i];
-eh-ether_shost[i] = c;
+eh-ether_shost[i] = trh-token_dhost[i];
+eh-ether_dhost[i] = trh-token_shost[i];
}
eh-ether_type = 0;
m_adj(m, lan_hdr_len);
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Tue Jul 19 19:45:36 UTC 2011
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
don't produce diagnostics for GNU tags
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/exec_elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.29 src/sys/kern/exec_elf.c:1.30
--- src/sys/kern/exec_elf.c:1.29 Mon Mar 7 00:09:12 2011
+++ src/sys/kern/exec_elf.c Tue Jul 19 15:45:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.29 2011/03/07 05:09:12 joerg Exp $ */
+/* $NetBSD: exec_elf.c,v 1.30 2011/07/19 19:45:36 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.29 2011/03/07 05:09:12 joerg Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.30 2011/07/19 19:45:36 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_pax.h
@@ -885,6 +885,13 @@
memcmp(ndata, ELF_NOTE_PAX_NAME,
ELF_NOTE_PAX_NAMESZ)) {
bad:
+ /*
+ * Ignore GNU tags
+ */
+ if (np-n_namesz == ELF_NOTE_GNU_NAMESZ
+memcmp(ndata, ELF_NOTE_GNU_NAME,
+ELF_NOTE_GNU_NAMESZ) == 0)
+ break;
#ifdef DIAGNOSTIC
printf(%s: bad tag %d:
[%d %d, %d %d, %*.*s %*.*s]\n,
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Jul 19 19:46:13 UTC 2011 Modified Files: src/sys/sys: exec_elf.h Log Message: document all the notes we know about in a consistent fashion. XXX: someone please document the checksum tags. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/sys/exec_elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/exec_elf.h diff -u src/sys/sys/exec_elf.h:1.113 src/sys/sys/exec_elf.h:1.114 --- src/sys/sys/exec_elf.h:1.113 Sat Jun 25 01:45:10 2011 +++ src/sys/sys/exec_elf.h Tue Jul 19 15:46:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: exec_elf.h,v 1.113 2011/06/25 05:45:10 nonaka Exp $ */ +/* $NetBSD: exec_elf.h,v 1.114 2011/07/19 19:46:13 christos Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -169,10 +169,10 @@ /* e_ident[EI_OSABI] */ #define ELFOSABI_SYSV 0 /* UNIX System V ABI */ #define ELFOSABI_HPUX 1 /* HP-UX operating system */ -#define ELFOSABI_NETBSD 2 /* NetBSD */ +#define ELFOSABI_NETBSD 2 /* NetBSD */ #define ELFOSABI_LINUX 3 /* GNU/Linux */ -#define ELFOSABI_HURD 4 /* GNU/Hurd */ -#define ELFOSABI_86OPEN 5 /* 86Open */ +#define ELFOSABI_HURD 4 /* GNU/Hurd */ +#define ELFOSABI_86OPEN 5 /* 86Open */ #define ELFOSABI_SOLARIS 6 /* Solaris */ #define ELFOSABI_MONTEREY 7 /* Monterey */ #define ELFOSABI_IRIX 8 /* IRIX */ @@ -746,20 +746,67 @@ Elf64_Word n_type; } Elf64_Nhdr; -#define ELF_NOTE_TYPE_ABI_TAG 1 +#define ELF_NOTE_GNU_NAMESZ 4 +#define ELF_NOTE_GNU_NAME GNU\0 +/* + * GNU-specific note type: ABI tag + * name: GNU\0 + * namesz: 4 + * desc: + * word[0]: OS tag + * word[1]: major version + * word[2]: minor version + * word[3]: teeny version + * descsz: 16 + */ /* GNU-specific note name and description sizes */ -#define ELF_NOTE_ABI_NAMESZ 4 +#define ELF_NOTE_TYPE_ABI_TAG 1 +#define ELF_NOTE_ABI_NAME ELF_NOTE_GNU_NAME +#define ELF_NOTE_ABI_NAMESZ ELF_NOTE_GNU_NAMESZ #define ELF_NOTE_ABI_DESCSZ 16 -/* GNU-specific note name */ -#define ELF_NOTE_ABI_NAME GNU\0 - /* GNU-specific OS/version value stuff */ #define ELF_NOTE_ABI_OS_LINUX 0 #define ELF_NOTE_ABI_OS_HURD 1 #define ELF_NOTE_ABI_OS_SOLARIS 2 +#define ELF_NOTE_ABI_OS_KFREEBSD 3 +#define ELF_NOTE_ABI_OS_KNETBSD 4 -/* NetBSD-specific note type: Emulation name. desc is emul name string. */ +/* + * GNU-specific note type: Hardware capabilities + * name: GNU\0 + * namesz: 4 + * desc: + * word[0]: Number of entries + * word[1]: Bitmask of enabled entries + * Followed by a byte id, and a NUL terminated string per entry + * descsz: variable + */ +#define ELF_NOTE_TYPE_GNU_HWCAP 2 + +/* + * GNU-specific note type: Build ID generated by ld + * name: GNU\0 + * desc: + * word[0..4] SHA1 [default] + * or + * word[0..3] md5 or uuid + * descsz: 16 or 20 + */ +#define ELF_NOTE_TYPE_GNU_BUILD_ID 3 + +/* NetBSD-specific note type: Emulation name. + * name: NetBSD\0\0 + * namesz: 8 + * desc: + * word[0]: MMmmrrpp00 + * + * M = major version + * m = minor version + * r = release [,A-Z,Z[A-Z] but numeric] + * p = patchlevel + * descsz: 4 + */ #define ELF_NOTE_TYPE_NETBSD_TAG 1 /* NetBSD-specific note name and description sizes */ #define ELF_NOTE_NETBSD_NAMESZ 7 @@ -767,16 +814,29 @@ /* NetBSD-specific note name */ #define ELF_NOTE_NETBSD_NAME NetBSD\0\0 -/* NetBSD-specific note type: Checksum. There should be 1 NOTE per PT_LOAD - section. desc is a tuple of phnum(16),chk-type(16),chk-value. */ +/* NetBSD-specific note type: Checksum. + * There should be 1 NOTE per PT_LOAD section. + * name: ??? + * namesz: ??? + * desc: + * a tuple of phnum(16),chk-type(16),chk-value. + * descsz: ??? + */ #define ELF_NOTE_TYPE_CHECKSUM_TAG 2 #define ELF_NOTE_CHECKSUM_CRC32 1 #define ELF_NOTE_CHECKSUM_MD5 2 #define ELF_NOTE_CHECKSUM_SHA1 3 #define ELF_NOTE_CHECKSUM_SHA256 4 -/* NetBSD-specific note type: PaX. There should be 1 NOTE per executable. - section. desc is a 32 bit bitmask */ +/* + * NetBSD-specific note type: PaX. + * There should be 1 NOTE per executable. + * name: PaX\0 + * namesz: 4 + * desc: + * word[0]: capability bitmask + * descsz: 4 + */ #define ELF_NOTE_TYPE_PAX_TAG 3 #define ELF_NOTE_PAX_MPROTECT 0x01 /* Force enable Mprotect */ #define ELF_NOTE_PAX_NOMPROTECT 0x02 /* Force disable Mprotect */
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: tron Date: Tue Jul 19 19:46:38 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Build 7th Edition(V7) File System. To generate a diff of this commit: cvs rdiff -u -r1.311 -r1.312 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.311 src/sys/arch/i386/conf/ALL:1.312 --- src/sys/arch/i386/conf/ALL:1.311 Wed Jul 13 07:52:48 2011 +++ src/sys/arch/i386/conf/ALL Tue Jul 19 19:46:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.311 2011/07/13 07:52:48 jruoho Exp $ +# $NetBSD: ALL,v 1.312 2011/07/19 19:46:38 tron Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.311 $ +#ident ALL-$Revision: 1.312 $ maxusers 64 # estimated number of users @@ -188,6 +188,7 @@ file-system FILECORE # Acorn filecore file system file-system ADOSFS # AmigaDOS file system file-system NILFS # experimental - NTT's NiLFS(2) +file-system V7FS # 7th Edition(V7) File System # File system options options QUOTA # legacy UFS quotas @@ -200,6 +201,7 @@ options FFS_NO_SNAPSHOT # No FFS snapshot support options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. +options V7FS_EI # V7FS Endian Independent support # Networking options options GATEWAY # packet forwarding
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Tue Jul 19 19:55:23 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: bus_dma.c
Log Message:
Fix missed change of BUS_DMA_NOCACHE to BUS_DMA_DONTCACHE.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/powerpc/powerpc/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/bus_dma.c
diff -u src/sys/arch/powerpc/powerpc/bus_dma.c:1.43 src/sys/arch/powerpc/powerpc/bus_dma.c:1.44
--- src/sys/arch/powerpc/powerpc/bus_dma.c:1.43 Sun Jul 17 23:23:54 2011
+++ src/sys/arch/powerpc/powerpc/bus_dma.c Tue Jul 19 19:55:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.43 2011/07/17 23:23:54 dyoung Exp $ */
+/* $NetBSD: bus_dma.c,v 1.44 2011/07/19 19:55:23 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.43 2011/07/17 23:23:54 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.44 2011/07/19 19:55:23 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -605,7 +605,7 @@
* If we are mapping a cacheable physically contiguous segment, treat
* it as if we are mapping a poolpage and avoid consuming any KVAs.
*/
- if (nsegs == 1 (flags BUS_DMA_NOCACHE) == 0) {
+ if (nsegs == 1 (flags BUS_DMA_DONTCACHE) == 0) {
KASSERT(size == segs-ds_len);
addr = BUS_MEM_TO_PHYS(t, segs-ds_addr);
*kvap = (void *)PMAP_MAP_POOLPAGE(addr);
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Tue Jul 19 19:57:03 UTC 2011 Modified Files: src/sys/arch/evbppc/conf: P2020RDB Log Message: Add nor support Add netbsd-sd0a To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/P2020RDB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/P2020RDB diff -u src/sys/arch/evbppc/conf/P2020RDB:1.6 src/sys/arch/evbppc/conf/P2020RDB:1.7 --- src/sys/arch/evbppc/conf/P2020RDB:1.6 Thu Jun 30 20:09:29 2011 +++ src/sys/arch/evbppc/conf/P2020RDB Tue Jul 19 19:57:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P2020RDB,v 1.6 2011/06/30 20:09:29 wiz Exp $ +# $NetBSD: P2020RDB,v 1.7 2011/07/19 19:57:02 matt Exp $ # # P2020RBD -- everything that's currently supported # @@ -7,7 +7,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident P2020RBD-$Revision: 1.6 $ +ident P2020RBD-$Revision: 1.7 $ maxusers 32 @@ -133,6 +133,7 @@ # Kernel root file system and dump configuration. config netbsd root on ? type ? +config netbsd-sd0a root on sd0a type ffs config nfsnetbsd root on tsec0 type nfs # @@ -151,6 +152,12 @@ #nand* at nandfcm? #flash* at nand? +# NOR Flash +#options NOR_VERBOSE +pq3cfi0 at obio0 cs 0 +nor* at pq3cfi? +flash* at nor? offset 0 size 0x800 + e500wdog* at cpunode? # Watchdog timer duart* at cpunode?
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Tue Jul 19 19:57:26 UTC 2011 Modified Files: src/sys/arch/evbppc/conf: INSTALL_P2020RDB Log Message: Add no config netbsd-sd0a To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/INSTALL_P2020RDB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/conf/INSTALL_P2020RDB diff -u src/sys/arch/evbppc/conf/INSTALL_P2020RDB:1.1 src/sys/arch/evbppc/conf/INSTALL_P2020RDB:1.2 --- src/sys/arch/evbppc/conf/INSTALL_P2020RDB:1.1 Wed Jun 8 05:03:43 2011 +++ src/sys/arch/evbppc/conf/INSTALL_P2020RDB Tue Jul 19 19:57:26 2011 @@ -1,9 +1,10 @@ -# $NetBSD: INSTALL_P2020RDB,v 1.1 2011/06/08 05:03:43 matt Exp $ +# $NetBSD: INSTALL_P2020RDB,v 1.2 2011/07/19 19:57:26 matt Exp $ include arch/evbppc/conf/P2020RDB -#ident INSTALL_P2020RDB-$Revision: 1.1 $ +#ident INSTALL_P2020RDB-$Revision: 1.2 $ include arch/evbppc/conf/INSTALL.inc +no config netbsd-sd0a no config nfsnetbsd
CVS commit: src/sbin/newfs_v7fs
Module Name:src Committed By: tron Date: Tue Jul 19 19:57:54 UTC 2011 Modified Files: src/sbin/newfs_v7fs: main.c Log Message: Use howmany() macro as it is used in a lot fo places in this tool anyway as suggested by Tsugutomo Enami. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sbin/newfs_v7fs/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/newfs_v7fs/main.c diff -u src/sbin/newfs_v7fs/main.c:1.5 src/sbin/newfs_v7fs/main.c:1.6 --- src/sbin/newfs_v7fs/main.c:1.5 Tue Jul 19 18:29:41 2011 +++ src/sbin/newfs_v7fs/main.c Tue Jul 19 19:57:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.5 2011/07/19 18:29:41 joerg Exp $ */ +/* $NetBSD: main.c,v 1.6 2011/07/19 19:57:54 tron Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: main.c,v 1.5 2011/07/19 18:29:41 joerg Exp $); +__RCSID($NetBSD: main.c,v 1.6 2011/07/19 19:57:54 tron Exp $); #endif /* not lint */ #include sys/param.h @@ -62,8 +62,7 @@ v7fs_daddr_t ilist_size; if (files) - ilist_size = (files + V7FS_INODE_PER_BLOCK - 1) / - V7FS_INODE_PER_BLOCK; + ilist_size = howmany(files, V7FS_INODE_PER_BLOCK); else ilist_size = volume_size / 25; /* 4% */ if (ilist_size (v7fs_daddr_t)V7FS_ILISTBLK_MAX)
CVS commit: src/sys
Module Name:src Committed By: cliff Date: Tue Jul 19 20:52:10 UTC 2011 Modified Files: src/sys/arch/powerpc/booke/dev: pq3cfi.c src/sys/dev/nor: cfi.c cfi_0002.c cfi_0002.h Log Message: add TNF copyright To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/dev/pq3cfi.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/nor/cfi.c src/sys/dev/nor/cfi_0002.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nor/cfi_0002.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/booke/dev/pq3cfi.c diff -u src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.2 src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.3 --- src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.2 Sun Jul 17 23:08:56 2011 +++ src/sys/arch/powerpc/booke/dev/pq3cfi.c Tue Jul 19 20:52:10 2011 @@ -1,4 +1,32 @@ -/* $NetBSD: pq3cfi.c,v 1.2 2011/07/17 23:08:56 dyoung Exp $ */ +/* $NetBSD: pq3cfi.c,v 1.3 2011/07/19 20:52:10 cliff Exp $ */ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Cliff Neighbors. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ /* * NOR CFI driver support for booke @@ -8,7 +36,7 @@ #include locators.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pq3cfi.c,v 1.2 2011/07/17 23:08:56 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: pq3cfi.c,v 1.3 2011/07/19 20:52:10 cliff Exp $); #include sys/param.h #include sys/systm.h Index: src/sys/dev/nor/cfi.c diff -u src/sys/dev/nor/cfi.c:1.2 src/sys/dev/nor/cfi.c:1.3 --- src/sys/dev/nor/cfi.c:1.2 Sun Jul 17 00:52:42 2011 +++ src/sys/dev/nor/cfi.c Tue Jul 19 20:52:10 2011 @@ -1,10 +1,38 @@ -/* $NetBSD: cfi.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $ */ +/* $NetBSD: cfi.c,v 1.3 2011/07/19 20:52:10 cliff Exp $ */ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Cliff Neighbors. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #include opt_nor.h #include opt_flash.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cfi.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: cfi.c,v 1.3 2011/07/19 20:52:10 cliff Exp $); #include sys/param.h #include sys/systm.h Index:
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Tue Jul 19 21:02:26 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL GENERIC Log Message: add irmce To generate a diff of this commit: cvs rdiff -u -r1.312 -r1.313 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1038 -r1.1039 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.312 src/sys/arch/i386/conf/ALL:1.313 --- src/sys/arch/i386/conf/ALL:1.312 Tue Jul 19 19:46:38 2011 +++ src/sys/arch/i386/conf/ALL Tue Jul 19 21:02:23 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.312 2011/07/19 19:46:38 tron Exp $ +# $NetBSD: ALL,v 1.313 2011/07/19 21:02:23 jmcneill Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.312 $ +#ident ALL-$Revision: 1.313 $ maxusers 64 # estimated number of users @@ -1254,6 +1254,10 @@ ustir* at uhub? port ? irframe* at ustir? +# Windows Media Center IR tranceiver +irmce* at uhub? port ? +cir* at irmce? + # USB Ethernet adapters aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters axe* at uhub? port ? # ASIX AX88172 based adapters Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1038 src/sys/arch/i386/conf/GENERIC:1.1039 --- src/sys/arch/i386/conf/GENERIC:1.1038 Wed Jul 13 07:52:48 2011 +++ src/sys/arch/i386/conf/GENERIC Tue Jul 19 21:02:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1038 2011/07/13 07:52:48 jruoho Exp $ +# $NetBSD: GENERIC,v 1.1039 2011/07/19 21:02:25 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1038 $ +#ident GENERIC-$Revision: 1.1039 $ maxusers 64 # estimated number of users @@ -1202,6 +1202,10 @@ ustir* at uhub? port ? irframe* at ustir? +# Windows Media Center IR tranceiver +irmce* at uhub? port ? +cir* at irmce? + # USB Ethernet adapters aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters axe* at uhub? port ? # ASIX AX88172 based adapters
CVS commit: src/sys/modules
Module Name:src Committed By: enami Date: Tue Jul 19 23:13:31 UTC 2011 Modified Files: src/sys/modules: Makefile Log Message: Build v7fs module on all architecture rather than only on i386. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.77 src/sys/modules/Makefile:1.78 --- src/sys/modules/Makefile:1.77 Tue Jul 19 19:19:09 2011 +++ src/sys/modules/Makefile Tue Jul 19 23:13:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2011/07/19 19:19:09 tron Exp $ +# $NetBSD: Makefile,v 1.78 2011/07/19 23:13:31 enami Exp $ .include bsd.own.mk @@ -63,6 +63,7 @@ SUBDIR+= umap SUBDIR+= union SUBDIR+= usbverbose +SUBDIR+= v7fs SUBDIR+= vnd SUBDIR+= tprof .if (defined(NOTYET)) @@ -154,7 +155,6 @@ SUBDIR+= viadrm SUBDIR+= pad SUBDIR+= padlock -SUBDIR+= v7fs SUBDIR+= viac7temp SUBDIR+= wmieeepc .endif
CVS commit: src/sys/dev/nor
Module Name:src
Committed By: cliff
Date: Wed Jul 20 03:42:55 UTC 2011
Modified Files:
src/sys/dev/nor: nor.c
Log Message:
replace 'nor_manufacturer_t' with 'struct nor_manufacturer'
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/nor/nor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nor/nor.c
diff -u src/sys/dev/nor/nor.c:1.2 src/sys/dev/nor/nor.c:1.3
--- src/sys/dev/nor/nor.c:1.2 Fri Jul 15 19:37:41 2011
+++ src/sys/dev/nor/nor.c Wed Jul 20 03:42:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nor.c,v 1.2 2011/07/15 19:37:41 cliff Exp $ */
+/* $NetBSD: nor.c,v 1.3 2011/07/20 03:42:55 cliff Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -34,7 +34,7 @@
/* Common driver for NOR chips implementing the ONFI CFI specification */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nor.c,v 1.2 2011/07/15 19:37:41 cliff Exp $);
+__KERNEL_RCSID(0, $NetBSD: nor.c,v 1.3 2011/07/20 03:42:55 cliff Exp $);
#include locators.h
#include opt_nor.h
@@ -98,7 +98,7 @@
};
#ifdef NOR_VERBOSE
-const nor_manufacturer_t nor_mfrs[] = {
+const struct nor_manufacturer nor_mfrs[] = {
{ NOR_MFR_AMD, AMD },
{ NOR_MFR_FUJITSU, Fujitsu },
{ NOR_MFR_RENESAS, Renesas },
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: matt Date: Wed Jul 20 04:47:30 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.evbppc Log Message: Add missing v7fs kmods for 4xx and booke To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/modules/md.evbppc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.evbppc diff -u src/distrib/sets/lists/modules/md.evbppc:1.3 src/distrib/sets/lists/modules/md.evbppc:1.4 --- src/distrib/sets/lists/modules/md.evbppc:1.3 Tue Jul 19 19:19:39 2011 +++ src/distrib/sets/lists/modules/md.evbppc Wed Jul 20 04:47:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.3 2011/07/19 19:19:39 tron Exp $ +# $NetBSD: md.evbppc,v 1.4 2011/07/20 04:47:30 matt Exp $ ./stand/powerpc-4xx base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod @@ -283,6 +283,8 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/union/union.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/usbverbose base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/usbverbose/usbverbose.kmod base-kernel-modules kmod +./stand/powerpc-booke/@OSRELEASE@/modules/v7fs base-kernel-modules kmod +./stand/powerpc-booke/@OSRELEASE@/modules/v7fs/v7fs.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/vnd base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/vnd/vnd.kmod base-kernel-modules kmod ./stand/powerpc-booke/@OSRELEASE@/modules/zfsbase-kernel-modules kmod,zfs
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Wed Jul 20 05:20:55 UTC 2011 Modified Files: src/share/man/man9: delay.9 kpause.9 Log Message: Xref delay(9) and kpause(9) with each other. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/delay.9 \ src/share/man/man9/kpause.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/delay.9 diff -u src/share/man/man9/delay.9:1.6 src/share/man/man9/delay.9:1.7 --- src/share/man/man9/delay.9:1.6 Wed Apr 30 13:10:58 2008 +++ src/share/man/man9/delay.9 Wed Jul 20 05:20:54 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: delay.9,v 1.6 2008/04/30 13:10:58 martin Exp $ +.\ $NetBSD: delay.9,v 1.7 2011/07/20 05:20:54 jruoho Exp $ .\ .\ Copyright (c) 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 23, 2002 +.Dd July 20, 2011 .Dt DELAY 9 .Os .Sh NAME @@ -56,4 +56,5 @@ and their resolution is limited by the system clock frequency. .Sh SEE ALSO .Xr condvar 9 , -.Xr hz 9 +.Xr hz 9 , +.Xr kpause 9 Index: src/share/man/man9/kpause.9 diff -u src/share/man/man9/kpause.9:1.6 src/share/man/man9/kpause.9:1.7 --- src/share/man/man9/kpause.9:1.6 Mon Apr 25 22:08:18 2011 +++ src/share/man/man9/kpause.9 Wed Jul 20 05:20:54 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: kpause.9,v 1.6 2011/04/25 22:08:18 wiz Exp $ +.\ $NetBSD: kpause.9,v 1.7 2011/07/20 05:20:54 jruoho Exp $ .\ .\ Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,7 +28,7 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd January 2, 2008 +.Dd July 20, 2011 .Dt KPAUSE 9 .Os .\ @@ -120,6 +120,7 @@ .Sh SEE ALSO .Xr sigaction 2 , .Xr condvar 9 , +.Xr delay 9 , .Xr errno 9 , .Xr hz 9 , .Xr mstohz 9
