CVS commit: src/sys/dev/pci
Module Name:src Committed By: tsutsui Date: Mon Sep 17 11:35:31 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Broadcom BCM57762 Gigabit Ethernet, per PR kern/46961. To generate a diff of this commit: cvs rdiff -u -r1.1133 -r1.1134 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1133 src/sys/dev/pci/pcidevs:1.1134 --- src/sys/dev/pci/pcidevs:1.1133 Thu Sep 13 12:11:06 2012 +++ src/sys/dev/pci/pcidevs Mon Sep 17 11:35:30 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1133 2012/09/13 12:11:06 nonaka Exp $ +$NetBSD: pcidevs,v 1.1134 2012/09/17 11:35:30 tsutsui Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1592,6 +1592,7 @@ product BROADCOM BCM5751F 0x167e BCM5751 product BROADCOM BCM5787F 0x167f BCM5787F 10/100 Ethernet product BROADCOM BCM5761E 0x1680 BCM5761E 10/100/1000 Ethernet product BROADCOM BCM5761 0x1681 BCM5761 10/100/1000 Ethernet +product BROADCOM BCM57762 0x1682 BCM57762 Gigabit Ethernet product BROADCOM BCM5764 0x1684 BCM5764 NetXtreme 1000baseT Ethernet product BROADCOM BCM5761S 0x1688 BCM5761S 10/100/1000 Ethernet product BROADCOM BCM5761SE 0x1689 BCM5761SE 10/100/1000 Ethernet
CVS commit: src/sys/dev/mii
Module Name:src Committed By: tsutsui Date: Mon Sep 17 11:42:38 UTC 2012 Modified Files: src/sys/dev/mii: miidevs Log Message: Add another Broadcom OUI and BCM57765 1000BASE-T media interface. Per PR kern/46961. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.108 src/sys/dev/mii/miidevs:1.109 --- src/sys/dev/mii/miidevs:1.108 Sun Jul 15 07:30:57 2012 +++ src/sys/dev/mii/miidevs Mon Sep 17 11:42:38 2012 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.108 2012/07/15 07:30:57 matt Exp $ +$NetBSD: miidevs,v 1.109 2012/09/17 11:42:38 tsutsui Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -56,6 +56,7 @@ oui ATHEROS 0x001374 Atheros oui ATTANSIC 0x00c82e Attansic Technology oui BROADCOM 0x001018 Broadcom Corporation oui BROADCOM2 0x000af7 Broadcom Corporation +oui BROADCOM3 0x001be9 Broadcom Corporation oui CICADA 0x0003F1 Cicada Semiconductor oui DAVICOM 0x00606e Davicom Semiconductor oui ENABLESEMI 0x0010dd Enable Semiconductor @@ -179,6 +180,7 @@ model BROADCOM2 BCM5784 0x003a BCM5784 model BROADCOM2 BCM5709C 0x003c BCM5709 10/100/1000baseT PHY model BROADCOM2 BCM5761 0x003d BCM5761 10/100/1000baseT PHY model BROADCOM2 BCM5709S 0x003f BCM5709S 1000/2500baseSX PHY +model BROADCOM3 BCM57765 0x0024 BCM57765 1000BASE-T media interface model xxBROADCOM_ALT1 BCM5906 0x0004 BCM5906 10/100baseTX media interface /* Cicada Semiconductor PHYs (now owned by Vitesse?) */
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: tsutsui
Date: Mon Sep 17 11:43:50 UTC 2012
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen from miidevs rev 1.109:
Add another Broadcom OUI and BCM57765 1000BASE-T media interface.
Per PR kern/46961.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/mii/miidevs_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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.111 src/sys/dev/mii/miidevs.h:1.112
--- src/sys/dev/mii/miidevs.h:1.111 Sun Jul 15 07:31:18 2012
+++ src/sys/dev/mii/miidevs.h Mon Sep 17 11:43:50 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.111 2012/07/15 07:31:18 matt Exp $ */
+/* $NetBSD: miidevs.h,v 1.112 2012/09/17 11:43:50 tsutsui Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.108 2012/07/15 07:30:57 matt Exp
+ * NetBSD: miidevs,v 1.109 2012/09/17 11:42:38 tsutsui Exp
*/
/*-
@@ -63,6 +63,7 @@
#define MII_OUI_ATTANSIC 0x00c82e /* Attansic Technology */
#define MII_OUI_BROADCOM 0x001018 /* Broadcom Corporation */
#define MII_OUI_BROADCOM2 0x000af7 /* Broadcom Corporation */
+#define MII_OUI_BROADCOM3 0x001be9 /* Broadcom Corporation */
#define MII_OUI_CICADA 0x0003F1 /* Cicada Semiconductor */
#define MII_OUI_DAVICOM 0x00606e /* Davicom Semiconductor */
#define MII_OUI_ENABLESEMI 0x0010dd /* Enable Semiconductor */
@@ -240,6 +241,8 @@
#define MII_STR_BROADCOM2_BCM5761 BCM5761 10/100/1000baseT PHY
#define MII_MODEL_BROADCOM2_BCM5709S 0x003f
#define MII_STR_BROADCOM2_BCM5709S BCM5709S 1000/2500baseSX PHY
+#define MII_MODEL_BROADCOM3_BCM57765 0x0024
+#define MII_STR_BROADCOM3_BCM57765 BCM57765 1000BASE-T media interface
#define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004
#define MII_STR_xxBROADCOM_ALT1_BCM5906 BCM5906 10/100baseTX media interface
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.99 src/sys/dev/mii/miidevs_data.h:1.100
--- src/sys/dev/mii/miidevs_data.h:1.99 Sun Jul 15 07:31:19 2012
+++ src/sys/dev/mii/miidevs_data.h Mon Sep 17 11:43:50 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.99 2012/07/15 07:31:19 matt Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.100 2012/09/17 11:43:50 tsutsui Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.108 2012/07/15 07:30:57 matt Exp
+ * NetBSD: miidevs,v 1.109 2012/09/17 11:42:38 tsutsui Exp
*/
/*-
@@ -91,6 +91,7 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709C, MII_STR_BROADCOM2_BCM5709C },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5761, MII_STR_BROADCOM2_BCM5761 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709S, MII_STR_BROADCOM2_BCM5709S },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM57765, MII_STR_BROADCOM3_BCM57765 },
{ MII_OUI_xxBROADCOM_ALT1, MII_MODEL_xxBROADCOM_ALT1_BCM5906, MII_STR_xxBROADCOM_ALT1_BCM5906 },
{ MII_OUI_CICADA, MII_MODEL_CICADA_CS8201, MII_STR_CICADA_CS8201 },
{ MII_OUI_CICADA, MII_MODEL_CICADA_CS8204, MII_STR_CICADA_CS8204 },
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: tsutsui
Date: Mon Sep 17 11:45:56 UTC 2012
Modified Files:
src/sys/dev/mii: brgphy.c
Log Message:
Add support for BCM57765. PR kern/46961
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/mii/brgphy.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/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.59 src/sys/dev/mii/brgphy.c:1.60
--- src/sys/dev/mii/brgphy.c:1.59 Tue Jun 7 10:10:44 2011
+++ src/sys/dev/mii/brgphy.c Mon Sep 17 11:45:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.59 2011/06/07 10:10:44 cegger Exp $ */
+/* $NetBSD: brgphy.c,v 1.60 2012/09/17 11:45:56 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.59 2011/06/07 10:10:44 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.60 2012/09/17 11:45:56 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -205,6 +205,9 @@ static const struct mii_phydesc brgphys[
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5785,
MII_STR_BROADCOM2_BCM5785 },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM57765,
+ MII_STR_BROADCOM3_BCM57765 },
+
{ MII_OUI_xxBROADCOM_ALT1, MII_MODEL_xxBROADCOM_ALT1_BCM5906,
MII_STR_xxBROADCOM_ALT1_BCM5906 },
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: tsutsui
Date: Mon Sep 17 11:54:36 UTC 2012
Modified Files:
src/sys/dev/pci: if_bge.c if_bgereg.h
Log Message:
Add support for BCM57762, found in Apple's Thunderbolt to Gigabit Ethernet
Adapter. PR kern/46961 from Ryo ONODERA.
Also revert weird BGE_MAX_FRAMELEN macro definition to sync its usage
with the original FreeBSD's bge.
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/if_bgereg.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/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.201 src/sys/dev/pci/if_bge.c:1.202
--- src/sys/dev/pci/if_bge.c:1.201 Sun Jul 22 14:33:01 2012
+++ src/sys/dev/pci/if_bge.c Mon Sep 17 11:54:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.201 2012/07/22 14:33:01 matt Exp $ */
+/* $NetBSD: if_bge.c,v 1.202 2012/09/17 11:54:36 tsutsui Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.201 2012/07/22 14:33:01 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.202 2012/09/17 11:54:36 tsutsui Exp $);
#include vlan.h
@@ -564,6 +564,10 @@ static const struct bge_product {
Broadcom BCM57761 Fast Ethernet,
},
{ PCI_VENDOR_BROADCOM,
+ PCI_PRODUCT_BROADCOM_BCM57762,
+ Broadcom BCM57762 Gigabit Ethernet,
+ },
+ { PCI_VENDOR_BROADCOM,
PCI_PRODUCT_BROADCOM_BCM57765,
Broadcom BCM57765 Fast Ethernet,
},
@@ -728,6 +732,7 @@ static const struct bge_revision bge_maj
{ BGE_ASICREV_BCM57780, unknown BCM57780 },
{ BGE_ASICREV_BCM5717, unknown BCM5717 },
{ BGE_ASICREV_BCM57765, unknown BCM57765 },
+ { BGE_ASICREV_BCM57766, unknown BCM57766 },
{ 0, NULL }
};
@@ -1969,7 +1974,23 @@ bge_blockinit(struct bge_softc *sc)
#else
/* new broadcom docs strongly recommend these: */
- if (!BGE_IS_5705_PLUS(sc)) {
+ if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5717 ||
+ BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM57765 ||
+ BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM57766) {
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x2a);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0xa0);
+ } else if (BGE_IS_5705_PLUS(sc)) {
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0);
+
+ if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5906) {
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x04);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x10);
+ } else {
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10);
+ CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x60);
+ }
+ } else if (!BGE_IS_5705_PLUS(sc)) {
if (ifp-if_mtu ETHER_MAX_LEN) {
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x50);
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x20);
@@ -1979,10 +2000,6 @@ bge_blockinit(struct bge_softc *sc)
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 152);
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 380);
}
- } else if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5906) {
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0);
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x04);
- CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0x10);
} else {
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0);
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x10);
@@ -2031,7 +2048,12 @@ bge_blockinit(struct bge_softc *sc)
/* Step 41: Initialize the standard RX ring control block */
rcb = sc-bge_rdata-bge_info.bge_std_rx_rcb;
BGE_HOSTADDR(rcb-bge_hostaddr, BGE_RING_DMA_ADDR(sc, bge_rx_std_ring));
- if (BGE_IS_5705_PLUS(sc))
+ if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5717 ||
+ BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM57765 ||
+ BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM57766)
+ rcb-bge_maxlen_flags =
+ BGE_RCB_MAXLEN_FLAGS(512, BGE_MAX_FRAMELEN 2);
+ else if (BGE_IS_5705_PLUS(sc))
rcb-bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(512, 0);
else
rcb-bge_maxlen_flags =
@@ -2097,7 +2119,8 @@ bge_blockinit(struct bge_softc *sc)
CSR_WRITE_4(sc, BGE_RBDI_JUMBO_REPL_THRESH, BGE_JUMBO_RX_RING_CNT / 8);
if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5717 ||
- BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM57765) {
+ BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM57765 ||
+ BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM57766) {
CSR_WRITE_4(sc, BGE_STD_REPL_LWM, 4);
CSR_WRITE_4(sc, BGE_JUMBO_REPL_LWM, 4);
}
@@ -2603,6 +2626,7 @@ bge_attach(device_t parent, device_t sel
sc-bge_chipid = pci_conf_read(pc, pa-pa_tag,
BGE_PCI_GEN2_PRODID_ASICREV);
else if (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_BROADCOM_BCM57761 ||
+ PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_BROADCOM_BCM57762 ||
PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_BROADCOM_BCM57765 ||
PCI_PRODUCT(pa-pa_id) ==
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: msaitoh Date: Mon Sep 17 15:34:58 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: BEAGLEBOARD Log Message: Comment out pseudo-device md as other config files. It fixes BEAGLEBOARD_INSTALL's compile error. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/BEAGLEBOARD 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/evbarm/conf/BEAGLEBOARD diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.29 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.30 --- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.29 Tue Sep 11 19:43:09 2012 +++ src/sys/arch/evbarm/conf/BEAGLEBOARD Mon Sep 17 15:34:57 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: BEAGLEBOARD,v 1.29 2012/09/11 19:43:09 msaitoh Exp $ +# $NetBSD: BEAGLEBOARD,v 1.30 2012/09/17 15:34:57 msaitoh Exp $ # # BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel # @@ -296,7 +296,7 @@ options OMAP_CK_REF_SPEED=1200 # Pseudo-Devices # disk/mass storage pseudo-devices -pseudo-device md # memory disk device (ramdisk) +#pseudo-device md # memory disk device (ramdisk) #pseudo-device vnd # disk-like interface to files #pseudo-device fss # file system snapshot device #pseudo-device putter # for puffs and pud
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: msaitoh
Date: Mon Sep 17 15:37:33 UTC 2012
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
- Add OPENRD.
- Compile BEAGLEBOARD_INSTALL.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.31 src/etc/etc.evbarm/Makefile.inc:1.32
--- src/etc/etc.evbarm/Makefile.inc:1.31 Sat Sep 1 02:03:35 2012
+++ src/etc/etc.evbarm/Makefile.inc Mon Sep 17 15:37:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.31 2012/09/01 02:03:35 matt Exp $
+# $NetBSD: Makefile.inc,v 1.32 2012/09/17 15:37:33 msaitoh Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -16,7 +16,7 @@ EVBARM_BOARDS+= ADI_BRH BCM5301X CP3100
.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == earm
# Little endian platforms (armv5t+)
-EVBARM_BOARDS+= SHEEVAPLUG TISDP2420
+EVBARM_BOARDS+= BEAGLEBOARD OPENRD SHEEVAPLUG TISDP2420
.endif
.if ${MACHINE_ARCH} == armeb
@@ -35,7 +35,7 @@ KERNEL_SETS+= IXM1200 HDL_G
.endif
.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == earm
-KERNEL_SETS+= BEAGLEBOARD RPI
+KERNEL_SETS+= RPI
.endif
.if ${MACHINE_ARCH} == armeb
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Mon Sep 17 15:47:47 UTC 2012 Modified Files: src/sys/arch/evbmips/conf: MALTA Log Message: Bump SYMTAB_SPACE by 30K To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbmips/conf/MALTA 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/evbmips/conf/MALTA diff -u src/sys/arch/evbmips/conf/MALTA:1.67 src/sys/arch/evbmips/conf/MALTA:1.68 --- src/sys/arch/evbmips/conf/MALTA:1.67 Mon Jul 30 19:31:06 2012 +++ src/sys/arch/evbmips/conf/MALTA Mon Sep 17 15:47:47 2012 @@ -1,10 +1,10 @@ -# $NetBSD: MALTA,v 1.67 2012/07/30 19:31:06 pgoyette Exp $ +# $NetBSD: MALTA,v 1.68 2012/09/17 15:47:47 matt Exp $ include arch/evbmips/conf/std.malta #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MALTA-$Revision: 1.67 $ +#ident MALTA-$Revision: 1.68 $ maxusers 32 @@ -37,7 +37,7 @@ options USERCONF # userconf(4) support options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=445000 # size for embedded symbol table +options SYMTAB_SPACE=475000 # size for embedded symbol table # Compatibility options #options COMPAT_43 # compatibility with 4.3BSD binaries
CVS commit: [netbsd-6] src/sys/arch/evbmips/conf
Module Name:src Committed By: riz Date: Mon Sep 17 18:40:12 UTC 2012 Modified Files: src/sys/arch/evbmips/conf [netbsd-6]: MALTA Log Message: Pull up following revision(s) (requested by cyber in ticket #564): sys/arch/evbmips/conf/MALTA: revision 1.68 Bump SYMTAB_SPACE by 30K To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.65.2.1 src/sys/arch/evbmips/conf/MALTA 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/evbmips/conf/MALTA diff -u src/sys/arch/evbmips/conf/MALTA:1.65 src/sys/arch/evbmips/conf/MALTA:1.65.2.1 --- src/sys/arch/evbmips/conf/MALTA:1.65 Thu Feb 9 18:58:14 2012 +++ src/sys/arch/evbmips/conf/MALTA Mon Sep 17 18:40:12 2012 @@ -1,10 +1,10 @@ -# $NetBSD: MALTA,v 1.65 2012/02/09 18:58:14 matt Exp $ +# $NetBSD: MALTA,v 1.65.2.1 2012/09/17 18:40:12 riz Exp $ include arch/evbmips/conf/std.malta #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MALTA-$Revision: 1.65 $ +#ident MALTA-$Revision: 1.65.2.1 $ maxusers 32 @@ -37,7 +37,7 @@ options USERCONF # userconf(4) support options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=445000 # size for embedded symbol table +options SYMTAB_SPACE=475000 # size for embedded symbol table # Compatibility options #options COMPAT_43 # compatibility with 4.3BSD binaries
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Sep 17 18:43:25 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket #564. To generate a diff of this commit: cvs rdiff -u -r1.1.2.206 -r1.1.2.207 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.206 src/doc/CHANGES-6.0:1.1.2.207 --- src/doc/CHANGES-6.0:1.1.2.206 Fri Sep 14 01:58:42 2012 +++ src/doc/CHANGES-6.0 Mon Sep 17 18:43:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.206 2012/09/14 01:58:42 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.207 2012/09/17 18:43:25 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -8605,6 +8605,11 @@ sys/ufs/ufs/ufs_extattr.c 1.40 Fix unmount in the case where an attribute was autocreated. [manu, ticket #556] +sys/arch/evbmips/conf/MALTA 1.68 + + Bump SYMTAB_SPACE by 30k. + [cyber, ticket #564] + sys/sys/param.h patched by hand Welcome to NetBSD 6.0_RC2!
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Mon Sep 17 19:00:35 UTC 2012
Modified Files:
src/distrib/sets [netbsd-6]: sets.subr
src/distrib/sets/lists/base [netbsd-6]: ad.mips64eb ad.mips64el
md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/comp [netbsd-6]: ad.mips64eb ad.mips64el
md.amd64 md.sparc64 mi shl.mi
src/distrib/sets/lists/tests [netbsd-6]: mi
src/etc [netbsd-6]: Makefile
src/share/man/man5 [netbsd-6]: mk.conf.5
src/share/mk [netbsd-6]: bsd.README bsd.own.mk
src/tests/crypto/libcrypto [netbsd-6]: t_ciphers.sh t_hashes.sh
src/usr.sbin/racoon [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by spz in ticket #557):
distrib/sets/lists/base/ad.mips64eb 1.94-1.95 via patch
distrib/sets/lists/base/ad.mips64el 1.93-1.94 via patch
distrib/sets/lists/base/md.amd641.169-1.170 via patch
distrib/sets/lists/base/md.sparc64 1.159-1.160 via patch
distrib/sets/lists/base/shl.mi 1.629,1.630,1.632 via patch
distrib/sets/lists/comp/ad.mips64eb 1.81-1.82 via patch
distrib/sets/lists/comp/ad.mips64el 1.821.83 via patch
distrib/sets/lists/comp/md.amd641.168-1.169 via patch
distrib/sets/lists/comp/md.sparc64 1.150-1.151 via patch
distrib/sets/lists/comp/mi 1.1769 via patch
distrib/sets/lists/comp/shl.mi 1.226-1.227 via patch
distrib/sets/lists/tests/mi 1.477 via patch
distrib/sets/sets.subr 1.137 via patch
etc/Makefile1.397 via patch
share/man/man5/mk.conf.51.60 via patch
share/mk/bsd.README 1.297 via patch
share/mk/bsd.own.mk 1.700 via patch
tests/crypto/libcrypto/Makefile patch
tests/crypto/libcrypto/t_ciphers.sh 1.4 via patch
tests/crypto/libcrypto/t_hashes.sh 1.2 via patch
tests/crypto/libcrypto/idea/Makefilepatch
tests/crypto/libcrypto/mdc2/Makefilepatch
usr.sbin/racoon/Makefile1.25 via patch
Clean up MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal, so that
a tree with MKCRYPTO_RC5=yes actually builds.
[spz, ticket #557]
The iso directory never made it into this file, but now
that iso is images, document it here for the edification of
folks browsing the download directories.
add crypto shared libraries
mark idea and mdc2 libraries obsolete.
remove mdc2 and idea handling
MKCRYPTO_{IDEA,MDC2} is no more
MKCRYPTO_IDEA is no more
no more CRYPTO_{IDEA,MDC2}
more MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal (resp, adjustment to IDEA and
MBC2 now always being included)
MKCRYPTO_RC5 now builds shared libs, add the missing files to sets
To generate a diff of this commit:
cvs rdiff -u -r1.135.2.1 -r1.135.2.2 src/distrib/sets/sets.subr
cvs rdiff -u -r1.82.2.4 -r1.82.2.5 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.81.2.4 -r1.81.2.5 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.156.2.4 -r1.156.2.5 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.147.2.4 -r1.147.2.5 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.616.2.4 -r1.616.2.5 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.69.2.4 -r1.69.2.5 src/distrib/sets/lists/comp/ad.mips64eb
cvs rdiff -u -r1.69.2.5 -r1.69.2.6 src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.155.2.4 -r1.155.2.5 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.138.2.4 -r1.138.2.5 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1738.2.6 -r1.1738.2.7 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.209.2.4 -r1.209.2.5 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.439.2.2 -r1.439.2.3 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.396.2.1 -r1.396.2.2 src/etc/Makefile
cvs rdiff -u -r1.58 -r1.58.2.1 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.292.2.2 -r1.292.2.3 src/share/mk/bsd.README
cvs rdiff -u -r1.696.2.2 -r1.696.2.3 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.3 -r1.3.4.1 src/tests/crypto/libcrypto/t_ciphers.sh
cvs rdiff -u -r1.1 -r1.1.8.1 src/tests/crypto/libcrypto/t_hashes.sh
cvs rdiff -u -r1.24 -r1.24.2.1 src/usr.sbin/racoon/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/sets.subr
diff -u src/distrib/sets/sets.subr:1.135.2.1 src/distrib/sets/sets.subr:1.135.2.2
--- src/distrib/sets/sets.subr:1.135.2.1 Fri Feb 17 00:08:37 2012
+++ src/distrib/sets/sets.subr Mon Sep 17 19:00:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.135.2.1 2012/02/17 00:08:37 riz Exp $
+# $NetBSD: sets.subr,v 1.135.2.2 2012/09/17 19:00:32 riz Exp $
#
#
@@ -172,7 +172,7 @@ SUBST=${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
#
CVS commit: [netbsd-6] src/tests/crypto/libcrypto
Module Name:src
Committed By: riz
Date: Mon Sep 17 19:03:12 UTC 2012
Modified Files:
src/tests/crypto/libcrypto [netbsd-6]: Makefile
src/tests/crypto/libcrypto/idea [netbsd-6]: Makefile
src/tests/crypto/libcrypto/mdc2 [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by spz in ticket #557):
distrib/sets/lists/base/ad.mips64eb 1.94-1.95 via patch
distrib/sets/lists/base/ad.mips64el 1.93-1.94 via patch
distrib/sets/lists/base/md.amd641.169-1.170 via patch
distrib/sets/lists/base/md.sparc64 1.159-1.160 via patch
distrib/sets/lists/base/shl.mi 1.629,1.630,1.632 via patch
distrib/sets/lists/comp/ad.mips64eb 1.81-1.82 via patch
distrib/sets/lists/comp/ad.mips64el 1.821.83 via patch
distrib/sets/lists/comp/md.amd641.168-1.169 via patch
distrib/sets/lists/comp/md.sparc64 1.150-1.151 via patch
distrib/sets/lists/comp/mi 1.1769 via patch
distrib/sets/lists/comp/shl.mi 1.226-1.227 via patch
distrib/sets/lists/tests/mi 1.477 via patch
distrib/sets/sets.subr 1.137 via patch
etc/Makefile1.397 via patch
share/man/man5/mk.conf.51.60 via patch
share/mk/bsd.README 1.297 via patch
share/mk/bsd.own.mk 1.700 via patch
tests/crypto/libcrypto/Makefile patch
tests/crypto/libcrypto/t_ciphers.sh 1.4 via patch
tests/crypto/libcrypto/t_hashes.sh 1.2 via patch
tests/crypto/libcrypto/idea/Makefilepatch
tests/crypto/libcrypto/mdc2/Makefilepatch
usr.sbin/racoon/Makefile1.25 via patch
Clean up MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal, so that
a tree with MKCRYPTO_RC5=yes actually builds.
[spz, ticket #557]
The iso directory never made it into this file, but now
that iso is images, document it here for the edification of
folks browsing the download directories.
add crypto shared libraries
mark idea and mdc2 libraries obsolete.
remove mdc2 and idea handling
MKCRYPTO_{IDEA,MDC2} is no more
MKCRYPTO_IDEA is no more
no more CRYPTO_{IDEA,MDC2}
more MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal (resp, adjustment to IDEA and
MBC2 now always being included)
MKCRYPTO_RC5 now builds shared libs, add the missing files to sets
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.4.1 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.3 -r1.3.4.1 src/tests/crypto/libcrypto/idea/Makefile
cvs rdiff -u -r1.3 -r1.3.4.1 src/tests/crypto/libcrypto/mdc2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.8 src/tests/crypto/libcrypto/Makefile:1.8.4.1
--- src/tests/crypto/libcrypto/Makefile:1.8 Sat Oct 22 21:13:25 2011
+++ src/tests/crypto/libcrypto/Makefile Mon Sep 17 19:03:11 2012
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2011/10/22 21:13:25 mrg Exp $
+# $NetBSD: Makefile,v 1.8.4.1 2012/09/17 19:03:11 riz Exp $
.include bsd.own.mk
.if ${MKCRYPTO} != no
SUBDIR+=bf bn cast conf des dh dsa ec ecdh ecdsa engine evp hmac lhash \
- md2 md4 md5 rand rc2 rc4 ripemd rsa sha sha1 srp threads x509v3
+ md2 md4 md5 rand rc2 rc4 ripemd rsa sha sha1 srp threads x509v3 \
+ idea mdc2
-.if ${MKCRYPTO_IDEA} != no
-SUBDIR+=idea
-.endif
.if ${MKCRYPTO_RC5} != no
SUBDIR+=rc5
.endif
-.if ${MKCRYPTO_MDC2} != no
-SUBDIR+=mdc2
-.endif
TESTSDIR= ${TESTSBASE}/crypto/libcrypto
Index: src/tests/crypto/libcrypto/idea/Makefile
diff -u src/tests/crypto/libcrypto/idea/Makefile:1.3 src/tests/crypto/libcrypto/idea/Makefile:1.3.4.1
--- src/tests/crypto/libcrypto/idea/Makefile:1.3 Tue Jul 5 10:03:09 2011
+++ src/tests/crypto/libcrypto/idea/Makefile Mon Sep 17 19:03:11 2012
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:09 spz Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2012/09/17 19:03:11 riz Exp $
HELPER_NAME= ideatest
HELPER_DIR= idea
.include bsd.init.mk
-.if ${MKCRYPTO_IDEA} != no
-LDADD= -lcrypto_idea -lcrypto
-.else
-CPPFLAGS+= -DOPENSSL_NO_IDEA
-.endif
+LDADD= -lcrypto
LDADD+= -Wl,--no-fatal-warnings
Index: src/tests/crypto/libcrypto/mdc2/Makefile
diff -u src/tests/crypto/libcrypto/mdc2/Makefile:1.3 src/tests/crypto/libcrypto/mdc2/Makefile:1.3.4.1
--- src/tests/crypto/libcrypto/mdc2/Makefile:1.3 Tue Jul 5 10:03:10 2011
+++ src/tests/crypto/libcrypto/mdc2/Makefile Mon Sep 17 19:03:11 2012
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:10 spz Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2012/09/17 19:03:11 riz Exp $
HELPER_NAME= mdc2test
HELPER_DIR= mdc2
.include bsd.init.mk
-.if ${MKCRYPTO_MDC2} != no
-LDADD= -lcrypto_mdc2 -lcrypto
-.else
-CPPFLAGS+=
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Sep 17 19:06:25 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket 557. To generate a diff of this commit: cvs rdiff -u -r1.1.2.207 -r1.1.2.208 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.207 src/doc/CHANGES-6.0:1.1.2.208 --- src/doc/CHANGES-6.0:1.1.2.207 Mon Sep 17 18:43:25 2012 +++ src/doc/CHANGES-6.0 Mon Sep 17 19:06:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.207 2012/09/17 18:43:25 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.208 2012/09/17 19:06:24 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -8610,6 +8610,34 @@ sys/arch/evbmips/conf/MALTA 1.68 Bump SYMTAB_SPACE by 30k. [cyber, ticket #564] +distrib/sets/lists/base/ad.mips64eb 1.94-1.95 via patch +distrib/sets/lists/base/ad.mips64el 1.93-1.94 via patch +distrib/sets/lists/base/md.amd64 1.169-1.170 via patch +distrib/sets/lists/base/md.sparc64 1.159-1.160 via patch +distrib/sets/lists/base/shl.mi 1.629,1.630,1.632 via patch +distrib/sets/lists/comp/ad.mips64eb 1.81-1.82 via patch +distrib/sets/lists/comp/ad.mips64el 1.821.83 via patch +distrib/sets/lists/comp/md.amd64 1.168-1.169 via patch +distrib/sets/lists/comp/md.sparc64 1.150-1.151 via patch +distrib/sets/lists/comp/mi 1.1769 via patch +distrib/sets/lists/comp/shl.mi 1.226-1.227 via patch +distrib/sets/lists/tests/mi 1.477 via patch +distrib/sets/sets.subr1.137 via patch +etc/Makefile 1.397 via patch +share/man/man5/mk.conf.5 1.60 via patch +share/mk/bsd.README1.297 via patch +share/mk/bsd.own.mk1.700 via patch +tests/crypto/libcrypto/Makefile patch +tests/crypto/libcrypto/t_ciphers.sh 1.4 via patch +tests/crypto/libcrypto/t_hashes.sh 1.2 via patch +tests/crypto/libcrypto/idea/Makefile patch +tests/crypto/libcrypto/mdc2/Makefile patch +usr.sbin/racoon/Makefile 1.25 via patch + + Clean up MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal, so that + a tree with MKCRYPTO_RC5=yes actually builds. + [spz, ticket #557] + sys/sys/param.h patched by hand Welcome to NetBSD 6.0_RC2!
CVS commit: src/sys/dev/pci
Module Name:src Committed By: matt Date: Mon Sep 17 22:03:21 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add ASMEDIA ASM1061 To generate a diff of this commit: cvs rdiff -u -r1.1134 -r1.1135 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1134 src/sys/dev/pci/pcidevs:1.1135 --- src/sys/dev/pci/pcidevs:1.1134 Mon Sep 17 11:35:30 2012 +++ src/sys/dev/pci/pcidevs Mon Sep 17 22:03:20 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1134 2012/09/17 11:35:30 tsutsui Exp $ +$NetBSD: pcidevs,v 1.1135 2012/09/17 22:03:20 matt Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -626,6 +626,7 @@ vendor ATTANSIC 0x1969 Attansic Technol vendor JMICRON 0x197b JMicron Technology vendor EVE 0x1adb EVE vendor QUMRANET 0x1af4 Qumranet +vendor ASMEDIA 0x1b21 ASMedia vendor FRESCO 0x1b73 Fresco Logic vendor SYMPHONY2 0x1c1c Symphony Labs (2nd PCI Vendor ID) vendor TEKRAM2 0x1de1 Tekram Technology (2nd PCI Vendor ID) @@ -1133,6 +1134,9 @@ product ARECA ARC1681 0x1681 ARC-1681 /* ASIX Electronics products */ product ASIX AX88140A 0x1400 AX88140A 10/100 Ethernet +/* ASMedia products */ +product ASMEDIA ASM1061 0x0621 ASM1061 AHCI SATA III Controller + /* Asustek products */ product ASUSTEK HFCPCI 0x0675 ISDN
CVS commit: src/sbin/ping
Module Name:src Committed By: msaitoh Date: Tue Sep 18 04:07:44 UTC 2012 Modified Files: src/sbin/ping: ping.c Log Message: Fix a bug that misunderstand F_TIMING64, F_POLICY and F_AUTHHDR. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sbin/ping/ping.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/ping/ping.c diff -u src/sbin/ping/ping.c:1.102 src/sbin/ping/ping.c:1.103 --- src/sbin/ping/ping.c:1.102 Wed Jan 4 16:09:42 2012 +++ src/sbin/ping/ping.c Tue Sep 18 04:07:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $ */ +/* $NetBSD: ping.c,v 1.103 2012/09/18 04:07:44 msaitoh Exp $ */ /* * Copyright (c) 1989, 1993 @@ -58,7 +58,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $); +__RCSID($NetBSD: ping.c,v 1.103 2012/09/18 04:07:44 msaitoh Exp $); #endif #include stdio.h @@ -116,10 +116,10 @@ __RCSID($NetBSD: ping.c,v 1.102 2012/01 #define F_TIMING64 0x1 /* 64 bit time, nanoseconds */ #ifdef IPSEC #ifdef IPSEC_POLICY_IPSEC -#define F_POLICY 0x1 +#define F_POLICY 0x2 #else -#define F_AUTHHDR 0x1 -#define F_ENCRYPT 0x2 +#define F_AUTHHDR 0x2 +#define F_ENCRYPT 0x4 #endif /*IPSEC_POLICY_IPSEC*/ #endif /*IPSEC*/
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: macallan
Date: Tue Sep 18 04:36:25 UTC 2012
Modified Files:
src/sys/arch/macppc/dev: smartbat.c
Log Message:
fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/macppc/dev/smartbat.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/macppc/dev/smartbat.c
diff -u src/sys/arch/macppc/dev/smartbat.c:1.11 src/sys/arch/macppc/dev/smartbat.c:1.12
--- src/sys/arch/macppc/dev/smartbat.c:1.11 Thu Sep 6 13:05:53 2012
+++ src/sys/arch/macppc/dev/smartbat.c Tue Sep 18 04:36:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smartbat.c,v 1.11 2012/09/06 13:05:53 macallan Exp $ */
+/* $NetBSD: smartbat.c,v 1.12 2012/09/18 04:36:25 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smartbat.c,v 1.11 2012/09/06 13:05:53 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: smartbat.c,v 1.12 2012/09/18 04:36:25 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -268,8 +268,8 @@ smartbat_refresh(struct sysmon_envsys *s
break;
case BAT_CHARGE_STATE:
{
-int ch = sc-sc_max_charge * 100 /
-sc-sc_charge;
+int ch = sc-sc_charge * 100 /
+sc-sc_max_charge;
if (ch 6) {
edata-value_cur =
ENVSYS_BATTERY_CAPACITY_CRITICAL;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: matt Date: Tue Sep 18 05:08:10 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs Log Message: Fix tpyo. To generate a diff of this commit: cvs rdiff -u -r1.1135 -r1.1136 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1135 src/sys/dev/pci/pcidevs:1.1136 --- src/sys/dev/pci/pcidevs:1.1135 Mon Sep 17 22:03:20 2012 +++ src/sys/dev/pci/pcidevs Tue Sep 18 05:08:10 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1135 2012/09/17 22:03:20 matt Exp $ +$NetBSD: pcidevs,v 1.1136 2012/09/18 05:08:10 matt Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1135,7 +1135,7 @@ product ARECA ARC1681 0x1681 ARC-1681 product ASIX AX88140A 0x1400 AX88140A 10/100 Ethernet /* ASMedia products */ -product ASMEDIA ASM1061 0x0621 ASM1061 AHCI SATA III Controller +product ASMEDIA ASM1061 0x0612 ASM1061 AHCI SATA III Controller /* Asustek products */ product ASUSTEK HFCPCI 0x0675 ISDN
CVS commit: src/sys/dev/pci
Module Name:src Committed By: matt Date: Tue Sep 18 05:08:41 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1128 -r1.1129 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1127 -r1.1128 src/sys/dev/pci/pcidevs_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/pci/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.1128 src/sys/dev/pci/pcidevs.h:1.1129 --- src/sys/dev/pci/pcidevs.h:1.1128 Mon Sep 17 22:03:44 2012 +++ src/sys/dev/pci/pcidevs.h Tue Sep 18 05:08:38 2012 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.1128 2012/09/17 22:03:44 matt Exp $ */ +/* $NetBSD: pcidevs.h,v 1.1129 2012/09/18 05:08:38 matt Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1135 2012/09/17 22:03:20 matt Exp + * NetBSD: pcidevs,v 1.1136 2012/09/18 05:08:10 matt Exp */ /* @@ -1142,7 +1142,7 @@ #define PCI_PRODUCT_ASIX_AX88140A 0x1400 /* AX88140A 10/100 Ethernet */ /* ASMedia products */ -#define PCI_PRODUCT_ASMEDIA_ASM1061 0x0621 /* ASM1061 AHCI SATA III Controller */ +#define PCI_PRODUCT_ASMEDIA_ASM1061 0x0612 /* ASM1061 AHCI SATA III Controller */ /* Asustek products */ #define PCI_PRODUCT_ASUSTEK_HFCPCI 0x0675 /* ISDN */ Index: src/sys/dev/pci/pcidevs_data.h diff -u src/sys/dev/pci/pcidevs_data.h:1.1127 src/sys/dev/pci/pcidevs_data.h:1.1128 --- src/sys/dev/pci/pcidevs_data.h:1.1127 Mon Sep 17 22:03:44 2012 +++ src/sys/dev/pci/pcidevs_data.h Tue Sep 18 05:08:38 2012 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs_data.h,v 1.1127 2012/09/17 22:03:44 matt Exp $ */ +/* $NetBSD: pcidevs_data.h,v 1.1128 2012/09/18 05:08:38 matt Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1135 2012/09/17 22:03:20 matt Exp + * NetBSD: pcidevs,v 1.1136 2012/09/18 05:08:10 matt Exp */ /*
CVS commit: src/sys/arch/arm/conf
Module Name:src Committed By: matt Date: Tue Sep 18 05:09:47 UTC 2012 Modified Files: src/sys/arch/arm/conf: files.arm Log Message: add _ARM32_NEED_BUS_DMA_BOUNCE to opt_arm_bus_space.h (It's not really a bus_space option but it's close enough). To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/arch/arm/conf/files.arm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/conf/files.arm diff -u src/sys/arch/arm/conf/files.arm:1.110 src/sys/arch/arm/conf/files.arm:1.111 --- src/sys/arch/arm/conf/files.arm:1.110 Wed Aug 29 23:16:35 2012 +++ src/sys/arch/arm/conf/files.arm Tue Sep 18 05:09:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files.arm,v 1.110 2012/08/29 23:16:35 matt Exp $ +# $NetBSD: files.arm,v 1.111 2012/09/18 05:09:47 matt Exp $ # temporary define to allow easy moving to ../arch/arm/arm32 defflagARM32 @@ -44,8 +44,8 @@ defparam opt_arm_intr_impl.h ARM_INTR_IM # ARM-specific debug options defflag opt_arm_debug.h ARM_LOCK_CAS_DEBUG -# Board-specific bus_space(9) definitions -defflag opt_arm_bus_space.h __BUS_SPACE_HAS_STREAM_METHODS +# Board-specific bus_space(9)/bus_dma(9) definitions +defflag opt_arm_bus_space.h __BUS_SPACE_HAS_STREAM_METHODS _ARM32_NEED_BUS_DMA_BOUNCE # Floating point emulator defflagARMFPE
CVS commit: src/sys/arch/arm
Module Name:src Committed By: matt Date: Tue Sep 18 05:47:28 UTC 2012 Modified Files: src/sys/arch/arm/arm32: bus_dma.c src/sys/arch/arm/at91: at91_bus_dma.c src/sys/arch/arm/broadcom: bcm2835_dma.c bcm53xx_board.c src/sys/arch/arm/ep93xx: ep93xx_busdma.c src/sys/arch/arm/footbridge: footbridge_pci.c src/sys/arch/arm/gemini: gemini_dma.c src/sys/arch/arm/imx: imx_dma.c src/sys/arch/arm/include: bus_defs.h bus_funcs.h src/sys/arch/arm/ixp12x0: ixp12x0_pci_dma.c src/sys/arch/arm/marvell: mvsoc_dma.c src/sys/arch/arm/omap: omap_dma.c src/sys/arch/arm/s3c2xx0: s3c2xx0_busdma.c src/sys/arch/arm/xscale: becc.c i80312.c i80321.c ixp425_ixme.c ixp425_pci_dma.c pxa2x0_dma.c Log Message: Add bounce buffer support for ARM bus_dma(9). Add macros to help initialize bus_dma_tag structures. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/arm/arm32/bus_dma.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/at91/at91_bus_dma.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_dma.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm53xx_board.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ep93xx/ep93xx_busdma.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/footbridge/footbridge_pci.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/gemini/gemini_dma.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx_dma.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/include/bus_defs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/include/bus_funcs.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/marvell/mvsoc_dma.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/omap_dma.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/xscale/becc.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/xscale/i80312.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/xscale/i80321.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xscale/ixp425_ixme.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/xscale/ixp425_pci_dma.c \ src/sys/arch/arm/xscale/pxa2x0_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/arm/arm32/bus_dma.c diff -u src/sys/arch/arm/arm32/bus_dma.c:1.57 src/sys/arch/arm/arm32/bus_dma.c:1.58 --- src/sys/arch/arm/arm32/bus_dma.c:1.57 Tue Sep 11 17:54:12 2012 +++ src/sys/arch/arm/arm32/bus_dma.c Tue Sep 18 05:47:26 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.57 2012/09/11 17:54:12 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.58 2012/09/18 05:47:26 matt Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #define _ARM32_BUS_DMA_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.57 2012/09/11 17:54:12 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.58 2012/09/18 05:47:26 matt Exp $); #include sys/param.h #include sys/systm.h @@ -55,10 +55,44 @@ __KERNEL_RCSID(0, $NetBSD: bus_dma.c,v #include arm/cpufunc.h +static struct evcnt bus_dma_creates = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, creates); +static struct evcnt bus_dma_bounced_creates = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, bounced creates); +static struct evcnt bus_dma_loads = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, loads); +static struct evcnt bus_dma_bounced_loads = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, bounced loads); +static struct evcnt bus_dma_read_bounces = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, read bounces); +static struct evcnt bus_dma_write_bounces = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, write bounces); +static struct evcnt bus_dma_bounced_unloads = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, bounced unloads); +static struct evcnt bus_dma_unloads = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, unloads); +static struct evcnt bus_dma_bounced_destroys = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, bounced destroys); +static struct evcnt bus_dma_destroys = + EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, destroys); + +EVCNT_ATTACH_STATIC(bus_dma_creates); +EVCNT_ATTACH_STATIC(bus_dma_bounced_creates); +EVCNT_ATTACH_STATIC(bus_dma_loads); +EVCNT_ATTACH_STATIC(bus_dma_bounced_loads); +EVCNT_ATTACH_STATIC(bus_dma_read_bounces); +EVCNT_ATTACH_STATIC(bus_dma_write_bounces); +EVCNT_ATTACH_STATIC(bus_dma_unloads); +EVCNT_ATTACH_STATIC(bus_dma_bounced_unloads); +EVCNT_ATTACH_STATIC(bus_dma_destroys); +EVCNT_ATTACH_STATIC(bus_dma_bounced_destroys); + +#define STAT_INCR(x) (bus_dma_ ## x.ev_count++) + int _bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, struct vmspace *, int); -struct arm32_dma_range *_bus_dma_inrange(struct arm32_dma_range *, - int, bus_addr_t); +static struct arm32_dma_range * + _bus_dma_inrange(struct
