CVS commit: src/sys/dev/usb
Module Name:src Committed By: kiyohara Date: Sat May 11 07:03:52 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: Remove multiple defines for PLANEX2 {GWUS300MINIS,RT3070,GWUS54GD,GWUSMM,GWUS300MINIX,RTL8188CU_2}. To generate a diff of this commit: cvs rdiff -u -r1.648 -r1.649 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.648 src/sys/dev/usb/usbdevs:1.649 --- src/sys/dev/usb/usbdevs:1.648 Thu May 9 12:40:17 2013 +++ src/sys/dev/usb/usbdevs Sat May 11 07:03:52 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.648 2013/05/09 12:40:17 aymeric Exp $ +$NetBSD: usbdevs,v 1.649 2013/05/11 07:03:52 kiyohara Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2502,12 +2502,6 @@ product PLANEX2 GWUSH300N 0xed18 GW-USH3 product PLANEX3 GWUS54GZ 0xab10 GW-US54GZ product PLANEX3 GU1000T 0xab11 GU-1000T product PLANEX3 GWUS54MINI 0xab13 GW-US54Mini -product PLANEX2 GWUS300MINIS 0xab24 GW-US300MiniS -product PLANEX2 RT3070 0xab25 RT3070 -product PLANEX2 GWUS54GD 0xed01 GW-US54GD -product PLANEX2 GWUSMM 0xed02 GW-USMM -product PLANEX2 GWUS300MINIX 0xed06 GW-US300Mini-X/MiniW -product PLANEX2 RTL8188CU_2 0xed17 RTL8188CU /* Plantronics products */ product PLANTRONICS HEADSET 0x0ca1 Platronics DSP-400 Headset
CVS commit: src/sys/dev/usb
Module Name:src Committed By: kiyohara Date: Sat May 11 07:07:38 UTC 2013 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.640 -r1.641 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.641 -r1.642 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.640 src/sys/dev/usb/usbdevs.h:1.641 --- src/sys/dev/usb/usbdevs.h:1.640 Thu May 9 12:41:13 2013 +++ src/sys/dev/usb/usbdevs.h Sat May 11 07:07:38 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.640 2013/05/09 12:41:13 aymeric Exp $ */ +/* $NetBSD: usbdevs.h,v 1.641 2013/05/11 07:07:38 kiyohara Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.647 2013/05/02 23:13:12 rkujawa Exp + * NetBSD: usbdevs,v 1.649 2013/05/11 07:03:52 kiyohara Exp */ /* @@ -2509,12 +2509,6 @@ #define USB_PRODUCT_PLANEX3_GWUS54GZ 0xab10 /* GW-US54GZ */ #define USB_PRODUCT_PLANEX3_GU1000T 0xab11 /* GU-1000T */ #define USB_PRODUCT_PLANEX3_GWUS54MINI 0xab13 /* GW-US54Mini */ -#define USB_PRODUCT_PLANEX2_GWUS300MINIS 0xab24 /* GW-US300MiniS */ -#define USB_PRODUCT_PLANEX2_RT3070 0xab25 /* RT3070 */ -#define USB_PRODUCT_PLANEX2_GWUS54GD 0xed01 /* GW-US54GD */ -#define USB_PRODUCT_PLANEX2_GWUSMM 0xed02 /* GW-USMM */ -#define USB_PRODUCT_PLANEX2_GWUS300MINIX 0xed06 /* GW-US300Mini-X/MiniW */ -#define USB_PRODUCT_PLANEX2_RTL8188CU_2 0xed17 /* RTL8188CU */ /* Plantronics products */ #define USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1 /* Platronics DSP-400 Headset */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.641 src/sys/dev/usb/usbdevs_data.h:1.642 --- src/sys/dev/usb/usbdevs_data.h:1.641 Thu May 9 12:41:13 2013 +++ src/sys/dev/usb/usbdevs_data.h Sat May 11 07:07:38 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.641 2013/05/09 12:41:13 aymeric Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.642 2013/05/11 07:07:38 kiyohara Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.647 2013/05/02 23:13:12 rkujawa Exp + * NetBSD: usbdevs,v 1.649 2013/05/11 07:03:52 kiyohara Exp */ /* @@ -7691,30 +7691,6 @@ const struct usb_product usb_products[] GW-US54Mini, }, { - USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS300MINIS, - GW-US300MiniS, - }, - { - USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RT3070, - RT3070, - }, - { - USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GD, - GW-US54GD, - }, - { - USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMM, - GW-USMM, - }, - { - USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS300MINIX, - GW-US300Mini-X/MiniW, - }, - { - USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RTL8188CU_2, - RTL8188CU, - }, - { USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET, Platronics DSP-400 Headset, }, @@ -9995,4 +9971,4 @@ const struct usb_product usb_products[] Prestige, }, }; -const int usb_nproducts = 1965; +const int usb_nproducts = 1959;
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Sat May 11 07:35:58 UTC 2013 Modified Files: src/sys/arch/arm/arm32: vm_machdep.c Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/arm/arm32/vm_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/arm/arm32/vm_machdep.c diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.65 src/sys/arch/arm/arm32/vm_machdep.c:1.66 --- src/sys/arch/arm/arm32/vm_machdep.c:1.65 Fri Jan 25 13:17:39 2013 +++ src/sys/arch/arm/arm32/vm_machdep.c Sat May 11 07:35:58 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.65 2013/01/25 13:17:39 skrll Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.66 2013/05/11 07:35:58 skrll Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -44,7 +44,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.65 2013/01/25 13:17:39 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.66 2013/05/11 07:35:58 skrll Exp $); #include opt_armfpe.h #include opt_pmap_debug.h @@ -99,7 +99,7 @@ cpu_proc_fork(struct proc *p1, struct pr * Finish a fork operation, with LWP l2 nearly set up. * * Copy and update the pcb and trapframe, making the child ready to run. - * + * * Rig the child's kernel stack so that it will start out in * lwp_trampoline() which will call the specified func with the argument arg. * @@ -134,7 +134,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp l2-l_md.md_flags = l1-l_md.md_flags MDLWP_VFPUSED; #endif - /* + /* * Set up the kernel stack for the process. * Note: this stack is not in use if we are forking from p1 */ @@ -222,7 +222,7 @@ vmapbuf(struct buf *bp, vsize_t len) printf(vmapbuf: bp=%08x buf=%08x len=%08x\n, (u_int)bp, (u_int)bp-b_data, (u_int)len); #endif /* PMAP_DEBUG */ - + if ((bp-b_flags B_PHYS) == 0) panic(vmapbuf); @@ -276,7 +276,7 @@ vunmapbuf(struct buf *bp, vsize_t len) addr = trunc_page((vaddr_t)bp-b_data); off = (vaddr_t)bp-b_data - addr; len = round_page(off + len); - + pmap_remove(pmap_kernel(), addr, addr + len); pmap_update(pmap_kernel()); uvm_km_free(phys_map, addr, len, UVM_KMF_VAONLY);
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Sat May 11 07:38:42 UTC 2013 Modified Files: src/sys/arch/arm/arm32: arm32_reboot.c Log Message: Move pmf_system_shutdown earlier and ensure interrupts are enabled. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm32/arm32_reboot.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/arm32_reboot.c diff -u src/sys/arch/arm/arm32/arm32_reboot.c:1.4 src/sys/arch/arm/arm32/arm32_reboot.c:1.5 --- src/sys/arch/arm/arm32/arm32_reboot.c:1.4 Sun May 5 10:30:21 2013 +++ src/sys/arch/arm/arm32/arm32_reboot.c Sat May 11 07:38:42 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_reboot.c,v 1.4 2013/05/05 10:30:21 skrll Exp $ */ +/* $NetBSD: arm32_reboot.c,v 1.5 2013/05/11 07:38:42 skrll Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -122,7 +122,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arm32_reboot.c,v 1.4 2013/05/05 10:30:21 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: arm32_reboot.c,v 1.5 2013/05/11 07:38:42 skrll Exp $); #include sys/param.h #include sys/device.h @@ -166,18 +166,23 @@ cpu_reboot(int howto, char *bootstr) if (!(howto RB_NOSYNC)) bootsync(); - /* Say NO to interrupts */ - splhigh(); + /* Say NO to interrupts for the duration of the dump */ + int s = splhigh(); /* Do a dump if requested. */ if ((howto (RB_DUMP | RB_HALT)) == RB_DUMP) dumpsys(); - /* Run any shutdown hooks */ - doshutdownhooks(); + splx(s); pmf_system_shutdown(boothowto); + /* Say NO to interrupts for good */ + splhigh(); + + /* Run any shutdown hooks */ + doshutdownhooks(); + /* Make sure IRQ's are disabled */ IRQdisable;
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Sat May 11 07:42:34 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm2835_genfb.c src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Fix up the VCONS_DRAW_INTR support and DDB. From reinoud. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/broadcom/bcm2835_genfb.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/rpi/rpi_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/arm/broadcom/bcm2835_genfb.c diff -u src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.4 src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.5 --- src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.4 Thu Jan 31 11:00:44 2013 +++ src/sys/arch/arm/broadcom/bcm2835_genfb.c Sat May 11 07:42:34 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_genfb.c,v 1.4 2013/01/31 11:00:44 macallan Exp $ */ +/* $NetBSD: bcm2835_genfb.c,v 1.5 2013/05/11 07:42:34 skrll Exp $ */ /*- * Copyright (c) 2013 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bcm2835_genfb.c,v 1.4 2013/01/31 11:00:44 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: bcm2835_genfb.c,v 1.5 2013/05/11 07:42:34 skrll Exp $); #include sys/param.h #include sys/types.h @@ -58,6 +58,12 @@ static void bcmgenfb_attach(device_t, de static int bcmgenfb_ioctl(void *, void *, u_long, void *, int, lwp_t *); static paddr_t bcmgenfb_mmap(void *, void *, off_t, int); +static bool bcmgenfb_shutdown(device_t, int); + +void bcmgenfb_set_console_dev(device_t); +void bcmgenfb_ddb_trap_callback(int); + +static device_t bcmgenfb_console_dev = NULL; CFATTACH_DECL_NEW(bcmgenfb, sizeof(struct bcmgenfb_softc), bcmgenfb_match, bcmgenfb_attach, NULL, NULL); @@ -95,6 +101,8 @@ bcmgenfb_attach(device_t parent, device_ return; } + pmf_device_register1(self, NULL, NULL, bcmgenfb_shutdown); + error = bus_space_map(sc-sc_iot, sc-sc_gen.sc_fboffset, sc-sc_gen.sc_fbsize, BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE, sc-sc_ioh); @@ -159,3 +167,29 @@ bcmgenfb_mmap(void *v, void *vs, off_t o return bus_space_mmap(sc-sc_iot, sc-sc_gen.sc_fboffset, offset, prot, BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE); } + +static bool +bcmgenfb_shutdown(device_t self, int flags) +{ + genfb_enable_polling(self); + return true; +} +void +bcmgenfb_set_console_dev(device_t dev) +{ + KASSERT(bcmgenfb_console_dev == NULL); + bcmgenfb_console_dev = dev; +} + +void +bcmgenfb_ddb_trap_callback(int where) +{ + if (bcmgenfb_console_dev == NULL) + return; + + if (where) { + genfb_enable_polling(bcmgenfb_console_dev); + } else { + genfb_disable_polling(bcmgenfb_console_dev); + } +} Index: src/sys/arch/evbarm/rpi/rpi_machdep.c diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.35 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.36 --- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.35 Tue Mar 19 22:16:55 2013 +++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sat May 11 07:42:34 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_machdep.c,v 1.35 2013/03/19 22:16:55 garbled Exp $ */ +/* $NetBSD: rpi_machdep.c,v 1.36 2013/05/11 07:42:34 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.35 2013/03/19 22:16:55 garbled Exp $); +__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.36 2013/05/11 07:42:34 skrll Exp $); #include opt_evbarm_boardtype.h @@ -74,6 +74,12 @@ __KERNEL_RCSID(0, $NetBSD: rpi_machdep. #include evbarm/rpi/rpi.h +#ifdef DDB +#include machine/db_machdep.h +#include ddb/db_sym.h +#include ddb/db_extern.h +#endif + #if NPLCOM 0 #include evbarm/dev/plcomreg.h #include evbarm/dev/plcomvar.h @@ -345,6 +351,9 @@ static struct { .vpt_tag = VCPROPTAG_NULL, }, }; + +extern void bcmgenfb_set_console_dev(device_t dev); +extern void bcmgenfb_ddb_trap_callback(int where); #endif static void @@ -771,6 +780,12 @@ rpi_device_register(device_t dev, void * #if NGENFB 0 if (device_is_a(dev, genfb)) { char *ptr; + + bcmgenfb_set_console_dev(dev); +#ifdef DDB + db_trap_callback = bcmgenfb_ddb_trap_callback; +#endif + if (rpi_fb_init(dict) == false) return; if (get_bootconf_option(boot_args, console,
CVS commit: src/sys/arch/mmeye/include
Module Name:src Committed By: kiyohara Date: Sat May 11 08:31:32 UTC 2013 Modified Files: src/sys/arch/mmeye/include: mmeye.h Log Message: Add extern. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mmeye/include/mmeye.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/mmeye/include/mmeye.h diff -u src/sys/arch/mmeye/include/mmeye.h:1.5 src/sys/arch/mmeye/include/mmeye.h:1.6 --- src/sys/arch/mmeye/include/mmeye.h:1.5 Sat Feb 19 10:46:28 2011 +++ src/sys/arch/mmeye/include/mmeye.h Sat May 11 08:31:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: mmeye.h,v 1.5 2011/02/19 10:46:28 kiyohara Exp $ */ +/* $NetBSD: mmeye.h,v 1.6 2013/05/11 08:31:32 kiyohara Exp $ */ /* * Brains mmEye specific register definition @@ -29,7 +29,7 @@ void mmeye_intr_disestablish(void *); #define WDT_DISCMD 0x0f /* XXX: Oops, no effect... */ #define WDT_ENACMD 0xf0 -callout_t epc_wdtc; +extern callout_t epc_wdtc; void epc_watchdog_timer_reset(void *); #endif
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Sat May 11 10:15:10 UTC 2013 Modified Files: src/sys/arch/arm/arm32: arm32_boot.c Log Message: Include opt_{ddb,kgdb} and fix KGDB build To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/arm32/arm32_boot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/arm32_boot.c diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.2 src/sys/arch/arm/arm32/arm32_boot.c:1.3 --- src/sys/arch/arm/arm32/arm32_boot.c:1.2 Wed Oct 17 18:53:45 2012 +++ src/sys/arch/arm/arm32/arm32_boot.c Sat May 11 10:15:10 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_boot.c,v 1.2 2012/10/17 18:53:45 matt Exp $ */ +/* $NetBSD: arm32_boot.c,v 1.3 2013/05/11 10:15:10 skrll Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -123,7 +123,10 @@ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: arm32_boot.c,v 1.2 2012/10/17 18:53:45 matt Exp $); +__KERNEL_RCSID(1, $NetBSD: arm32_boot.c,v 1.3 2013/05/11 10:15:10 skrll Exp $); + +#include opt_ddb.h +#include opt_kgdb.h #include sys/param.h #include sys/reboot.h @@ -140,6 +143,10 @@ __KERNEL_RCSID(1, $NetBSD: arm32_boot.c #include machine/bootconfig.h +#ifdef KGDB +#include sys/kgdb.h +#endif + vaddr_t initarm_common(vaddr_t kvm_base, vsize_t kvm_size, const struct boot_physmem *bp, size_t nbp)
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Sat May 11 10:15:43 UTC 2013 Modified Files: src/sys/arch/arm/arm32: pmap.c Log Message: Fix !DDB build. To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/sys/arch/arm/arm32/pmap.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/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.254 src/sys/arch/arm/arm32/pmap.c:1.255 --- src/sys/arch/arm/arm32/pmap.c:1.254 Fri Mar 29 13:27:08 2013 +++ src/sys/arch/arm/arm32/pmap.c Sat May 11 10:15:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.254 2013/03/29 13:27:08 matt Exp $ */ +/* $NetBSD: pmap.c,v 1.255 2013/05/11 10:15:43 skrll Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -212,7 +212,7 @@ #include arm/cpuconf.h #include arm/arm32/katelib.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.254 2013/03/29 13:27:08 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.255 2013/05/11 10:15:43 skrll Exp $); #ifdef PMAP_DEBUG @@ -4126,7 +4126,6 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va, */ if (rv == 0 pm-pm_l1-l1_domain_use_count == 1) { extern int last_fault_code; - extern int kernel_debug; printf(fixup: pm %p, va 0x%lx, ftype %d - nothing to do!\n, pm, va, ftype); printf(fixup: l2 %p, l2b %p, ptep %p, pl1pd %p\n, @@ -4134,6 +4133,8 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va, printf(fixup: pte 0x%x, l1pd 0x%x, last code 0x%x\n, pte, l1pd, last_fault_code); #ifdef DDB + extern int kernel_debug; + if (kernel_debug 2) Debugger(); #endif
CVS commit: src/sys/arch/m68k/fpe
Module Name:src Committed By: isaki Date: Sat May 11 12:52:43 UTC 2013 Modified Files: src/sys/arch/m68k/fpe: fpu_rem.c Log Message: Revise the algorithm after Step3. almost written by Y.Sugahara and minor modify by me. This works for all input of FMOD/FREM and of course solves PR/47810. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/fpe/fpu_rem.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/m68k/fpe/fpu_rem.c diff -u src/sys/arch/m68k/fpe/fpu_rem.c:1.15 src/sys/arch/m68k/fpe/fpu_rem.c:1.16 --- src/sys/arch/m68k/fpe/fpu_rem.c:1.15 Sun May 5 13:25:20 2013 +++ src/sys/arch/m68k/fpe/fpu_rem.c Sat May 11 12:52:42 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu_rem.c,v 1.15 2013/05/05 13:25:20 isaki Exp $ */ +/* $NetBSD: fpu_rem.c,v 1.16 2013/05/11 12:52:42 isaki Exp $ */ /* * Copyright (c) 1995 Ken Nakata @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fpu_rem.c,v 1.15 2013/05/05 13:25:20 isaki Exp $); +__KERNEL_RCSID(0, $NetBSD: fpu_rem.c,v 1.16 2013/05/11 12:52:42 isaki Exp $); #include sys/types.h #include sys/signal.h @@ -56,51 +56,68 @@ __KERNEL_RCSID(0, $NetBSD: fpu_rem.c,v *endif * * Step 3. Perform MOD(X,Y) - *3.1 If R = Y, go to Step 9. + *3.1 If R = Y, then { Q := Q + 1, R := 0, go to Step 8. } *3.2 If R Y, then { R := R - Y, Q := Q + 1} *3.3 If j = 0, go to Step 4. *3.4 k := k + 1, j := j - 1, Q := 2Q, R := 2R. Go to *Step 3.1. * - * Step 4. At this point, R = X - QY = MOD(X,Y). Set - *Last_Subtract := false (used in Step 7 below). If - *MOD is requested, go to Step 6. - * - * Step 5. R = MOD(X,Y), but REM(X,Y) is requested. - *5.1 If R Y/2, then R = MOD(X,Y) = REM(X,Y). Go to - *Step 6. - *5.2 If R Y/2, then { set Last_Subtract := true, - *Q := Q + 1, Y := signY*Y }. Go to Step 6. - *5.3 This is the tricky case of R = Y/2. If Q is odd, - *then { Q := Q + 1, signX := -signX }. - * - * Step 6. R := signX*R. - * - * Step 7. If Last_Subtract = true, R := R - Y. - * - * Step 8. Return signQ, last 7 bits of Q, and R as required. - * - * Step 9. At this point, R = 2^(-j)*X - Q Y = Y. Thus, - *X = 2^(j)*(Q+1)Y. set Q := 2^(j)*(Q+1), - *R := 0. Return signQ, last 7 bits of Q, and R. + * Step 4. R := signX*R. + * + * Step 5. If MOD is requested, go to Step . + * + * Step 6. Now, R = MOD(X,Y), convert to REM(X,Y) is requested. + *Do banker's rounding. + *If abs(R) Y/2 + * || (abs(R) == Y/2 Q % 2 == 1) then + * { Q := Q + 1, R := R - signX * Y }. + * + * Step 7. Return signQ, last 7 bits of Q, and R as required. */ static struct fpn * __fpu_modrem(struct fpemu *fe, int is_mod); +static int abscmp3(const struct fpn *a, const struct fpn *b); + +/* Absolute FORTRAN Compare */ +static int +abscmp3(const struct fpn *a, const struct fpn *b) +{ + int i; + + if (a-fp_exp b-fp_exp) { + return -1; + } else if (a-fp_exp b-fp_exp) { + return 1; + } else { + for (i = 0; i 3; i++) { + if (a-fp_mant[i] b-fp_mant[i]) +return -1; + else if (a-fp_mant[i] b-fp_mant[i]) +return 1; + } + } + return 0; +} static struct fpn * __fpu_modrem(struct fpemu *fe, int is_mod) { static struct fpn X, Y; struct fpn *x, *y, *r; - struct fpn r_bkup; uint32_t signX, signY, signQ; int j, k, l, q; - int Last_Subtract; + int cmp; + + if (ISNAN(fe-fe_f1) || ISNAN(fe-fe_f2)) + return fpu_newnan(fe); + if (ISINF(fe-fe_f1) || ISZERO(fe-fe_f2)) + return fpu_newnan(fe); CPYFPN(X, fe-fe_f1); CPYFPN(Y, fe-fe_f2); x = X; y = Y; + q = 0; r = fe-fe_f2; /* @@ -111,12 +128,17 @@ __fpu_modrem(struct fpemu *fe, int is_mo signQ = (signX ^ signY); x-fp_sign = y-fp_sign = 0; + /* Special treatment that just return input value but Q is necessary */ + if (ISZERO(x) || ISINF(y)) { + r = fe-fe_f1; + goto Step7; + } + /* * Step 2 */ l = x-fp_exp - y-fp_exp; k = 0; - q = 0; CPYFPN(r, x); if (l = 0) { r-fp_exp -= l; @@ -125,21 +147,20 @@ __fpu_modrem(struct fpemu *fe, int is_mo /* * Step 3 */ - while (y-fp_exp != r-fp_exp || - y-fp_mant[0] != r-fp_mant[0] || - y-fp_mant[1] != r-fp_mant[1] || - y-fp_mant[2] != r-fp_mant[2]) { + for (;;) { + cmp = abscmp3(r, y); + + /* Step 3.1 */ + if (cmp == 0) +break; /* Step 3.2 */ - CPYFPN(r_bkup, r); - CPYFPN(fe-fe_f1, r); - CPYFPN(fe-fe_f2, y); - fe-fe_f2.fp_sign = 1; - r = fpu_add(fe); - if (r-fp_sign == 0) { + if (cmp 0) { +CPYFPN(fe-fe_f1, r); +CPYFPN(fe-fe_f2, y); +fe-fe_f2.fp_sign
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Sat May 11 14:19:44 UTC 2013 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Add attempt at KGDB support from Reiound. I couldn't get gdb to attach properly, but the kernel was definitely in kgdb_trap and would respond to $?#3f if typed via tip(1) To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/rpi/rpi_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/evbarm/rpi/rpi_machdep.c diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.36 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.37 --- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.36 Sat May 11 07:42:34 2013 +++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sat May 11 14:19:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_machdep.c,v 1.36 2013/05/11 07:42:34 skrll Exp $ */ +/* $NetBSD: rpi_machdep.c,v 1.37 2013/05/11 14:19:44 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,9 +30,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.36 2013/05/11 07:42:34 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.37 2013/05/11 14:19:44 skrll Exp $); #include opt_evbarm_boardtype.h +#include opt_ddb.h +#include opt_kgdb.h #include sdhc.h #include dotg.h @@ -146,8 +148,21 @@ int plcomcnmode = PLCONMODE; #endif #include opt_kgdb.h +#if (NPLCOM == 0) +#error Enable plcom for KGDB support +#endif #ifdef KGDB #include sys/kgdb.h +static void kgdb_port_init(void); +#endif + +#if (NPLCOM 0 (defined(PLCONSOLE) || defined(KGDB))) +static struct plcom_instance rpi_pi = { + .pi_type = PLCOM_TYPE_PL011, + .pi_flags = PLC_FLAG_32BIT_ACCESS, + .pi_iot = bcm2835_bs_tag, + .pi_size = BCM2835_UART0_SIZE +}; #endif /* Smallest amount of RAM start.elf could give us. */ @@ -534,6 +549,10 @@ initarm(void *arg) printf(done.\n); #endif +#ifdef KGDB + kgdb_port_init(); +#endif + #ifdef __HAVE_MEMORY_DISK__ md_root_setconf(memory_disk, sizeof memory_disk); #endif @@ -557,14 +576,7 @@ void consinit(void) { static int consinit_called = 0; -#if (NPLCOM 0 defined(PLCONSOLE)) - static struct plcom_instance rpi_pi = { - .pi_type = PLCOM_TYPE_PL011, - .pi_flags = PLC_FLAG_32BIT_ACCESS, - .pi_iot = bcm2835_bs_tag, - .pi_size = BCM2835_UART0_SIZE - }; -#endif + if (consinit_called != 0) return; @@ -583,6 +595,31 @@ consinit(void) #endif } +#ifdef KGDB +#if !defined(KGDB_PLCOMUNIT) || !defined(KGDB_DEVRATE) || !defined(KGDB_CONMODE) +#error Specify KGDB_PLCOMUNIT, KGDB_DEVRATE and KGDB_CONMODE for KGDB. +#endif + +void +static kgdb_port_init(void) +{ + static int kgdbsinit_called = 0; + int res; + + if (kgdbsinit_called != 0) + return; + + kgdbsinit_called = 1; + + rpi_pi.pi_iobase = consaddr; + + res = plcom_kgdb_attach(rpi_pi, KGDB_DEVRATE, BCM2835_UART0_CLK, + KGDB_CONMODE, KGDB_PLCOMUNIT); + if (res) + panic(KGDB uart can not be initialized, err=%d., res); +} +#endif + #if NGENFB 0 static bool rpi_fb_parse_mode(const char *s, uint32_t *pwidth, uint32_t *pheight)
CVS commit: src/sys/kern
Module Name:src Committed By: skrll Date: Sat May 11 15:44:46 UTC 2013 Modified Files: src/sys/kern: kgdb_stub.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/kern/kgdb_stub.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/kgdb_stub.c diff -u src/sys/kern/kgdb_stub.c:1.25 src/sys/kern/kgdb_stub.c:1.26 --- src/sys/kern/kgdb_stub.c:1.25 Sat Jul 28 00:43:24 2012 +++ src/sys/kern/kgdb_stub.c Sat May 11 15:44:46 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: kgdb_stub.c,v 1.25 2012/07/28 00:43:24 matt Exp $ */ +/* $NetBSD: kgdb_stub.c,v 1.26 2013/05/11 15:44:46 skrll Exp $ */ /* * Copyright (c) 1990, 1993 @@ -45,7 +45,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kgdb_stub.c,v 1.25 2012/07/28 00:43:24 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: kgdb_stub.c,v 1.26 2013/05/11 15:44:46 skrll Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -345,7 +345,8 @@ kgdb_trap(int type, db_regs_t *regs) db_clear_single_step(regs); - if (db_trap_callback) db_trap_callback(1); + if (db_trap_callback) + db_trap_callback(1); /* Detect and recover from unexpected traps. */ if (kgdb_recover != 0) { @@ -378,7 +379,8 @@ kgdb_trap(int type, db_regs_t *regs) if (kgdb_active == 0) { if (!IS_BREAKPOINT_TRAP(type, 0)) { /* No debugger active -- let trap handle this. */ - if (db_trap_callback) db_trap_callback(0); + if (db_trap_callback) +db_trap_callback(0); return (0); } /* Make the PC point at the breakpoint... */ @@ -540,7 +542,8 @@ kgdb_trap(int type, db_regs_t *regs) } } out: - if (db_trap_callback) db_trap_callback(0); + if (db_trap_callback) + db_trap_callback(0); kgdb_recover = 0; return (1); }
CVS commit: [khorben-n900] src/sys/arch/arm/omap
Module Name:src Committed By: khorben Date: Sat May 11 17:19:42 UTC 2013 Modified Files: src/sys/arch/arm/omap [khorben-n900]: files.omap2 Added Files: src/sys/arch/arm/omap [khorben-n900]: omap2_spi.c omap2_spireg.h Log Message: Imported omapspi(4), a driver for Multichannel SPI as found on the OMAP 2/3 from Texas Instruments. Partly tested on the Nokia N900 (OMAP 3430). To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.2.1 src/sys/arch/arm/omap/files.omap2 cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/arm/omap/omap2_spi.c \ src/sys/arch/arm/omap/omap2_spireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/omap/files.omap2 diff -u src/sys/arch/arm/omap/files.omap2:1.25 src/sys/arch/arm/omap/files.omap2:1.25.2.1 --- src/sys/arch/arm/omap/files.omap2:1.25 Wed Apr 17 14:34:02 2013 +++ src/sys/arch/arm/omap/files.omap2 Sat May 11 17:19:41 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.omap2,v 1.25 2013/04/17 14:34:02 bouyer Exp $ +# $NetBSD: files.omap2,v 1.25.2.1 2013/05/11 17:19:41 khorben Exp $ # # Configuration info for Texas Instruments OMAP2/OMAP3 CPU support # Based on xscale/files.pxa2x0 @@ -64,6 +64,11 @@ device omapiic: i2cbus, i2cexec attach omapiic at obio with omap3_i2c file arch/arm/omap/omap3_i2c.c omap3_i2c +# OMAP2 SPI controllers +device omapspi: spibus +attach omapspi at obio with omap2_spi +file arch/arm/omap/omap2_spi.c (omap2 | omap3) omapspi + # OMAP3 system control module device omapscm: sysmon_envsys attach omapscm at obio with omap3_scm Added files: Index: src/sys/arch/arm/omap/omap2_spi.c diff -u /dev/null src/sys/arch/arm/omap/omap2_spi.c:1.1.2.1 --- /dev/null Sat May 11 17:19:42 2013 +++ src/sys/arch/arm/omap/omap2_spi.c Sat May 11 17:19:41 2013 @@ -0,0 +1,538 @@ +/* $NetBSD: omap2_spi.c,v 1.1.2.1 2013/05/11 17:19:41 khorben Exp $ */ + +/* + * Texas Instruments OMAP2/3 Multichannel SPI driver. + * + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Pierre Pronchery (khor...@defora.org). + * + * 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. The name of the author may not be used to endorse or promote products + *derived from this software without specific prior written permission. + * + * 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 sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: omap2_spi.c,v 1.1.2.1 2013/05/11 17:19:41 khorben Exp $); + +#include opt_omap.h + +#include sys/param.h +#include sys/systm.h +#include sys/device.h +#include sys/bus.h + +#include dev/spi/spivar.h + +#include arm/omap/omap2_obiovar.h + +#include arm/omap/omap2_reg.h +#include arm/omap/omap2_spireg.h + +#define OMAP2_MCSPI_MAX_CHANNELS 4 + +struct omap2_spi_channel { + SIMPLEQ_HEAD(,spi_transfer) queue; + struct spi_transfer *transfer; + struct spi_chunk *wchunk; + struct spi_chunk *rchunk; + + bool running; +}; + +struct omap2_spi_softc { + device_t sc_dev; + bus_space_tag_t sc_iot; + bus_space_handle_t sc_ioh; + void*sc_intr; + + struct spi_controller sc_spi; + + struct omap2_spi_channel sc_channels[OMAP2_MCSPI_MAX_CHANNELS]; +}; + +#define SPI_READ_REG(sc, reg) \ + bus_space_read_4((sc)-sc_iot, (sc)-sc_ioh, (reg)) +#define SPI_WRITE_REG(sc, reg, val) \ + bus_space_write_4((sc)-sc_iot, (sc)-sc_ioh, (reg), (val)) + +static int omap2_spi_match(device_t, cfdata_t, void *); +static void omap2_spi_attach(device_t, device_t, void *); + +static int omap2_spi_configure(void *, int, int, int); +static int omap2_spi_transfer(void *, struct spi_transfer *); + +static void omap2_spi_start(struct omap2_spi_softc * const, int); +static void omap2_spi_stop(struct omap2_spi_softc * const, int); +static int omap2_spi_intr(void *v); + +static int omap2_spi_reset(struct omap2_spi_softc * const); +static void omap2_spi_send(struct
CVS commit: [khorben-n900] src/sys/arch/evbarm/conf
Module Name:src Committed By: khorben Date: Sat May 11 17:28:51 UTC 2013 Modified Files: src/sys/arch/evbarm/conf [khorben-n900]: N900 Log Message: Enable support for the SPI bus To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/arch/evbarm/conf/N900 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/N900 diff -u src/sys/arch/evbarm/conf/N900:1.13 src/sys/arch/evbarm/conf/N900:1.13.2.1 --- src/sys/arch/evbarm/conf/N900:1.13 Mon May 6 22:56:55 2013 +++ src/sys/arch/evbarm/conf/N900 Sat May 11 17:28:51 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: N900,v 1.13 2013/05/06 22:56:55 khorben Exp $ +# $NetBSD: N900,v 1.13.2.1 2013/05/11 17:28:51 khorben Exp $ # # N900 -- Nokia N900 Kernel # @@ -252,6 +252,14 @@ tps65950pm1 at iic0 addr 0x49 tps65950pm2 at iic0 addr 0x4a tps65950pm3 at iic0 addr 0x4b +# SPI devices +omapspi0 at obio0 addr 0x48098000 size 0x1000 intr 65 +omapspi1 at obio0 addr 0x4809a000 size 0x1000 intr 66 +omapspi2 at obio0 addr 0x480b8000 size 0x1000 intr 91 +omapspi3 at obio0 addr 0x480ba000 size 0x1000 intr 48 + +spi* at omapspi? + # On-board 16550 UARTs #com0 at obio2 addr 0x4902 intr 74 mult 4 # UART3 (console) #options CONSADDR=0x4902, CONSPEED=38400
CVS commit: [khorben-n900] src/sys/dev/i2c
Module Name:src Committed By: khorben Date: Sat May 11 17:48:22 UTC 2013 Modified Files: src/sys/dev/i2c [khorben-n900]: tps65950.c Added Files: src/sys/dev/i2c [khorben-n900]: tps65950reg.h Log Message: Moved register values to a separate file To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.10.1 src/sys/dev/i2c/tps65950.c cvs rdiff -u -r0 -r1.1.2.1 src/sys/dev/i2c/tps65950reg.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/i2c/tps65950.c diff -u src/sys/dev/i2c/tps65950.c:1.3 src/sys/dev/i2c/tps65950.c:1.3.10.1 --- src/sys/dev/i2c/tps65950.c:1.3 Mon Dec 31 21:45:36 2012 +++ src/sys/dev/i2c/tps65950.c Sat May 11 17:48:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: tps65950.c,v 1.3 2012/12/31 21:45:36 jmcneill Exp $ */ +/* $NetBSD: tps65950.c,v 1.3.10.1 2013/05/11 17:48:22 khorben Exp $ */ /*- * Copyright (c) 2012 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tps65950.c,v 1.3 2012/12/31 21:45:36 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: tps65950.c,v 1.3.10.1 2013/05/11 17:48:22 khorben Exp $); #include sys/param.h #include sys/systm.h @@ -47,49 +47,13 @@ __KERNEL_RCSID(0, $NetBSD: tps65950.c,v #include dev/clock_subr.h #include dev/sysmon/sysmonvar.h +#include dev/i2c/tps65950reg.h + /* Default watchdog period, in seconds */ #ifndef TPS65950_WDOG_DEFAULT_PERIOD #define TPS65950_WDOG_DEFAULT_PERIOD 30 #endif -/* I2C Bus Addressing */ -#define TPS65950_ADDR_ID1 0x48 /* GP */ -#define TPS65950_ADDR_ID2 0x49 /* GP */ -#define TPS65950_ADDR_ID3 0x4a /* GP */ -#define TPS65950_ADDR_ID4 0x4b /* GP */ -#define TPS65950_ADDR_ID5 0x12 /* SmartReflex */ - -/* ID2 */ -#define TPS65950_ID2_IDCODE_7_0 0x85 -#define TPS65950_ID2_IDCODE_15_8 0x86 -#define TPS65950_ID2_IDCODE_23_16 0x87 -#define TPS65950_ID2_IDCODE_31_24 0x88 -#define TPS65950_ID2_UNLOCK_TEST_REG 0x97 -#define TPS65950_ID2_UNLOCK_TEST_REG_MAGIC 0x49 - -/* ID3 */ -#define TPS65950_LED_BASE 0xee -#define TPS65950_ID3_REG_LED (TPS65950_LED_BASE + 0) -#define TPS65950_ID3_REG_LED_LEDAON __BIT(0) -#define TPS65950_ID3_REG_LED_LEDBON __BIT(1) -#define TPS65950_ID3_REG_LED_LEDAPWM __BIT(4) -#define TPS65950_ID3_REG_LED_LEDBPWM __BIT(5) - -/* ID4 */ -#define TPS65950_PM_RECEIVER_BASE 0x5b -#define TPS65950_ID4_REG_WATCHDOG_CFG (TPS65950_PM_RECEIVER_BASE + 3) -#define TPS65950_RTC_BASE 0x1c -#define TPS65950_ID4_REG_SECONDS_REG (TPS65950_RTC_BASE + 0) -#define TPS65950_ID4_REG_MINUTES_REG (TPS65950_RTC_BASE + 1) -#define TPS65950_ID4_REG_HOURS_REG (TPS65950_RTC_BASE + 2) -#define TPS65950_ID4_REG_DAYS_REG (TPS65950_RTC_BASE + 3) -#define TPS65950_ID4_REG_MONTHS_REG (TPS65950_RTC_BASE + 4) -#define TPS65950_ID4_REG_YEARS_REG (TPS65950_RTC_BASE + 5) -#define TPS65950_ID4_REG_WEEKS_REG (TPS65950_RTC_BASE + 6) -#define TPS65950_ID4_REG_RTC_CTRL_REG (TPS65950_RTC_BASE + 13) -#define TPS65950_ID4_REG_RTC_CTRL_REG_GET_TIME __BIT(6) -#define TPS65950_ID4_REG_RTC_CTRL_REG_STOP_RTC __BIT(1) - struct tps65950_softc { device_t sc_dev; i2c_tag_t sc_i2c; Added files: Index: src/sys/dev/i2c/tps65950reg.h diff -u /dev/null src/sys/dev/i2c/tps65950reg.h:1.1.2.1 --- /dev/null Sat May 11 17:48:22 2013 +++ src/sys/dev/i2c/tps65950reg.h Sat May 11 17:48:22 2013 @@ -0,0 +1,74 @@ +/* $NetBSD: tps65950reg.h,v 1.1.2.1 2013/05/11 17:48:22 khorben Exp $ */ + +/*- + * Copyright (c) 2012 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 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. + */ + +#ifndef _DEV_I2C_TPS65950REG_H_ +#define _DEV_I2C_TPS65950REG_H_ + +/* + * TI TPS65950 OMAP
CVS commit: [khorben-n900] src/sys/arch/evbarm
Module Name:src Committed By: khorben Date: Sat May 11 18:01:04 UTC 2013 Modified Files: src/sys/arch/evbarm/conf [khorben-n900]: N900 src/sys/arch/evbarm/n900 [khorben-n900]: n900_acad.c n900_audjck.c n900_cambtn.c n900_camcvr.c n900_kbdsld.c n900_lckbtn.c n900_prxmty.c Log Message: Let the device drivers on the GPIO bus use the interrupt locator. To generate a diff of this commit: cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/arch/evbarm/conf/N900 cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/arch/evbarm/n900/n900_acad.c cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/arch/evbarm/n900/n900_audjck.c \ src/sys/arch/evbarm/n900/n900_cambtn.c \ src/sys/arch/evbarm/n900/n900_camcvr.c \ src/sys/arch/evbarm/n900/n900_kbdsld.c \ src/sys/arch/evbarm/n900/n900_prxmty.c cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/arch/evbarm/n900/n900_lckbtn.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/evbarm/conf/N900 diff -u src/sys/arch/evbarm/conf/N900:1.13.2.1 src/sys/arch/evbarm/conf/N900:1.13.2.2 --- src/sys/arch/evbarm/conf/N900:1.13.2.1 Sat May 11 17:28:51 2013 +++ src/sys/arch/evbarm/conf/N900 Sat May 11 18:01:04 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: N900,v 1.13.2.1 2013/05/11 17:28:51 khorben Exp $ +# $NetBSD: N900,v 1.13.2.2 2013/05/11 18:01:04 khorben Exp $ # # N900 -- Nokia N900 Kernel # @@ -216,25 +216,25 @@ gpio* at omapgpio? # GPIO devices # Charging sensor -n900acad0 at gpio0 offset 7 mask 0x1 #intr 103 +n900acad0 at gpio0 offset 7 mask 0x1 intr 103 # Camera button -n900cambtn0 at gpio2 offset 4 mask 0x3 #intr 164, 165 +n900cambtn0 at gpio2 offset 4 mask 0x3 intr 164 #and 165 # Keyboard slide -n900kbdsld0 at gpio2 offset 7 mask 0x1 #intr 167 +n900kbdsld0 at gpio2 offset 7 mask 0x1 intr 167 # Proximity sensor -n900prxmty0 at gpio2 offset 25 mask 0x1 #intr 185 +n900prxmty0 at gpio2 offset 25 mask 0x1 intr 185 # Camera cover -n900camcvr0 at gpio3 offset 14 mask 0x1 #intr 206 +n900camcvr0 at gpio3 offset 14 mask 0x1 intr 206 # Lock button -n900lckbtn0 at gpio3 offset 17 mask 0x1 #intr 209 +n900lckbtn0 at gpio3 offset 17 mask 0x1 intr 209 # Audio jack -n900audjck0 at gpio5 offset 17 mask 0x1 #intr 273 +n900audjck0 at gpio5 offset 17 mask 0x1 intr 273 # System Control Module omapscm0 at obio0 addr 0x48002000 size 0x1000 Index: src/sys/arch/evbarm/n900/n900_acad.c diff -u src/sys/arch/evbarm/n900/n900_acad.c:1.5 src/sys/arch/evbarm/n900/n900_acad.c:1.5.2.1 --- src/sys/arch/evbarm/n900/n900_acad.c:1.5 Sat Apr 20 03:37:55 2013 +++ src/sys/arch/evbarm/n900/n900_acad.c Sat May 11 18:01:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: n900_acad.c,v 1.5 2013/04/20 03:37:55 khorben Exp $ */ +/* $NetBSD: n900_acad.c,v 1.5.2.1 2013/05/11 18:01:04 khorben Exp $ */ /* * AC adapter driver for the Nokia N900. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: n900_acad.c,v 1.5 2013/04/20 03:37:55 khorben Exp $); +__KERNEL_RCSID(0, $NetBSD: n900_acad.c,v 1.5.2.1 2013/05/11 18:01:04 khorben Exp $); #include sys/param.h #include sys/systm.h @@ -45,11 +45,6 @@ __KERNEL_RCSID(0, $NetBSD: n900_acad.c, #include arm/omap/omap2_gpio.h -/* The base interrupt for the corresponding GPIO device where this driver - * attaches. This is an ugly workaround the current limitations of gpio(4), - * which does not seem to allow a better way to locate the interrupt yet. */ -#define N900ACAD_GPIO_BASE 96 - #define N900ACAD_PIN_INPUT 0 #define N900ACAD_NPINS 1 @@ -127,8 +122,8 @@ n900acad_attach(device_t parent, device_ gpio_pin_ctl(sc-sc_gpio, sc-sc_map, N900ACAD_PIN_INPUT, GPIO_PIN_INPUT); - sc-sc_intr = intr_establish(N900ACAD_GPIO_BASE + ga-ga_offset, IPL_VM, - IST_EDGE_RISING, n900acad_intr, sc); + sc-sc_intr = intr_establish(ga-ga_intr, IPL_VM, IST_EDGE_RISING, + n900acad_intr, sc); if (sc-sc_intr == NULL) { aprint_error(: couldn't establish interrupt\n); gpio_pin_unmap(sc-sc_gpio, sc-sc_map); Index: src/sys/arch/evbarm/n900/n900_audjck.c diff -u src/sys/arch/evbarm/n900/n900_audjck.c:1.1 src/sys/arch/evbarm/n900/n900_audjck.c:1.1.2.1 --- src/sys/arch/evbarm/n900/n900_audjck.c:1.1 Mon May 6 22:56:54 2013 +++ src/sys/arch/evbarm/n900/n900_audjck.c Sat May 11 18:01:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: n900_audjck.c,v 1.1 2013/05/06 22:56:54 khorben Exp $ */ +/* $NetBSD: n900_audjck.c,v 1.1.2.1 2013/05/11 18:01:04 khorben Exp $ */ /* * Audio jack driver for the Nokia N900. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: n900_audjck.c,v 1.1 2013/05/06 22:56:54 khorben Exp $); +__KERNEL_RCSID(0, $NetBSD: n900_audjck.c,v 1.1.2.1 2013/05/11 18:01:04 khorben Exp $); #include sys/param.h #include sys/systm.h @@ -45,11 +45,6 @@ __KERNEL_RCSID(0, $NetBSD: n900_audjck. #include arm/omap/omap2_gpio.h -/* The base interrupt for the corresponding GPIO device where this driver - * attaches. This
CVS commit: [khorben-n900] src/sys
Module Name:src Committed By: khorben Date: Sat May 11 18:22:47 UTC 2013 Modified Files: src/sys/arch/evbarm/conf [khorben-n900]: N900 src/sys/dev/i2c [khorben-n900]: tps65950.c tps65950reg.h Log Message: Beginning to handle interrupts from the TPS65950 companion chip. To generate a diff of this commit: cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/arch/evbarm/conf/N900 cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/sys/dev/i2c/tps65950.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/dev/i2c/tps65950reg.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/evbarm/conf/N900 diff -u src/sys/arch/evbarm/conf/N900:1.13.2.2 src/sys/arch/evbarm/conf/N900:1.13.2.3 --- src/sys/arch/evbarm/conf/N900:1.13.2.2 Sat May 11 18:01:04 2013 +++ src/sys/arch/evbarm/conf/N900 Sat May 11 18:22:47 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: N900,v 1.13.2.2 2013/05/11 18:01:04 khorben Exp $ +# $NetBSD: N900,v 1.13.2.3 2013/05/11 18:22:47 khorben Exp $ # # N900 -- Nokia N900 Kernel # @@ -248,7 +248,7 @@ iic* at omapiic? # I2C devices # Power Management and System Companion Device tps65950pm0 at iic0 addr 0x48 -tps65950pm1 at iic0 addr 0x49 +tps65950pm1 at iic0 addr 0x49 intr 7 tps65950pm2 at iic0 addr 0x4a tps65950pm3 at iic0 addr 0x4b Index: src/sys/dev/i2c/tps65950.c diff -u src/sys/dev/i2c/tps65950.c:1.3.10.1 src/sys/dev/i2c/tps65950.c:1.3.10.2 --- src/sys/dev/i2c/tps65950.c:1.3.10.1 Sat May 11 17:48:22 2013 +++ src/sys/dev/i2c/tps65950.c Sat May 11 18:22:47 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: tps65950.c,v 1.3.10.1 2013/05/11 17:48:22 khorben Exp $ */ +/* $NetBSD: tps65950.c,v 1.3.10.2 2013/05/11 18:22:47 khorben Exp $ */ /*- * Copyright (c) 2012 Jared D. McNeill jmcne...@invisible.ca @@ -31,11 +31,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tps65950.c,v 1.3.10.1 2013/05/11 17:48:22 khorben Exp $); +__KERNEL_RCSID(0, $NetBSD: tps65950.c,v 1.3.10.2 2013/05/11 18:22:47 khorben Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h +#include sys/workqueue.h #include sys/conf.h #include sys/bus.h #include sys/kmem.h @@ -60,10 +61,24 @@ struct tps65950_softc { i2c_addr_t sc_addr; struct sysctllog *sc_sysctllog; + + /* PIH */ + void *sc_intr; + struct workqueue *sc_workq; + struct work sc_work; + bool sc_queued; + + /* WATCHDOG */ struct sysmon_wdog sc_smw; struct todr_chip_handle sc_todr; }; + +/* XXX global workqueue to re-enable interrupts once handled */ +static struct workqueue *tps65950_pih_workqueue; +static struct work tps65950_pih_workqueue_work; +static bool tps65950_pih_workqueue_available; + static int tps65950_match(device_t, cfdata_t, void *); static void tps65950_attach(device_t, device_t, void *); @@ -72,6 +87,12 @@ static int tps65950_write_1(struct tps65 static void tps65950_sysctl_attach(struct tps65950_softc *); +static int tps65950_intr(void *); +static void tps65950_intr_work(struct work *, void *); + +static void tps65950_pih_attach(struct tps65950_softc *, int); +static void tps65950_pih_intr_work(struct work *, void *); + static void tps65950_rtc_attach(struct tps65950_softc *); static int tps65950_rtc_enable(struct tps65950_softc *, bool); static int tps65950_rtc_gettime(todr_chip_handle_t, struct clock_ymdhms *); @@ -128,7 +149,10 @@ tps65950_attach(device_t parent, device_ iic_release_bus(sc-sc_i2c, 0); idcode = (buf[0] 0) | (buf[1] 8) | (buf[2] 16) | (buf[3] 24); - aprint_normal(: IDCODE %08X\n, idcode); + aprint_normal(: IDCODE %08X, idcode); + + aprint_normal(: PIH\n); + tps65950_pih_attach(sc, ia-ia_intr); break; case TPS65950_ADDR_ID3: aprint_normal(: LED\n); @@ -262,6 +286,85 @@ tps65950_sysctl_attach(struct tps65950_s return; } +static int +tps65950_intr(void *v) +{ + struct tps65950_softc *sc = v; + + if (sc-sc_queued == false) { + workqueue_enqueue(sc-sc_workq, sc-sc_work, NULL); + sc-sc_queued = true; + } + + /* disable the interrupt until it's properly handled */ + return 0; +} + +static void +tps65950_intr_work(struct work *work, void *v) +{ + struct tps65950_softc *sc = v; + uint8_t u8; + + iic_acquire_bus(sc-sc_i2c, 0); + + /* acknowledge the interrupt */ + tps65950_read_1(sc, TPS65950_PIH_REG_ISR_P1, u8); + tps65950_write_1(sc, TPS65950_PIH_REG_ISR_P1, u8); + + iic_release_bus(sc-sc_i2c, 0); + + /* allow the workqueue to be entered again */ + sc-sc_queued = false; + + /* restore the main interrupt handler */ + if (tps65950_pih_workqueue_available) { + tps65950_pih_workqueue_available = false; + workqueue_enqueue(tps65950_pih_workqueue, +tps65950_pih_workqueue_work, NULL); + } +} + +static void +tps65950_pih_attach(struct tps65950_softc *sc, int intr) +{ + int error; + + /* create the workqueues */ + error = workqueue_create(sc-sc_workq, device_xname(sc-sc_dev), + tps65950_intr_work, sc, PRIO_MAX, IPL_VM, 0); + if (error) { +
CVS commit: src/lib/libc/iconv
Module Name:src Committed By: rodent Date: Sat May 11 19:20:30 UTC 2013 Modified Files: src/lib/libc/iconv: iconv.3 Log Message: s/conform/conforms/1 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/iconv/iconv.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/iconv/iconv.3 diff -u src/lib/libc/iconv/iconv.3:1.19 src/lib/libc/iconv/iconv.3:1.20 --- src/lib/libc/iconv/iconv.3:1.19 Mon Mar 11 10:44:43 2013 +++ src/lib/libc/iconv/iconv.3 Sat May 11 19:20:30 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: iconv.3,v 1.19 2013/03/11 10:44:43 yamt Exp $ +.\ $NetBSD: iconv.3,v 1.20 2013/05/11 19:20:30 rodent Exp $ .\ .\ Copyright (c)2003 Citrus Project, .\ All rights reserved. @@ -236,7 +236,7 @@ terminates with an incomplete character .Fn iconv_close , and .Fn iconv -conform to +conforms to .St -p1003.1-2001 . .Pp Historically, the definition of
CVS commit: [netbsd-6-0] src/distrib/hp700/ramdisk
Module Name:src Committed By: riz Date: Sat May 11 21:38:47 UTC 2013 Modified Files: src/distrib/hp700/ramdisk [netbsd-6-0]: Makefile Log Message: Pull up following revision(s) (requested by skrll in ticket #882): distrib/hp700/ramdisk/Makefile: revision 1.12 Fix PR/47123 for hp700 as well To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.14.1 src/distrib/hp700/ramdisk/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/hp700/ramdisk/Makefile diff -u src/distrib/hp700/ramdisk/Makefile:1.11 src/distrib/hp700/ramdisk/Makefile:1.11.14.1 --- src/distrib/hp700/ramdisk/Makefile:1.11 Thu Feb 11 09:06:48 2010 +++ src/distrib/hp700/ramdisk/Makefile Sat May 11 21:38:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/02/11 09:06:48 roy Exp $ +# $NetBSD: Makefile,v 1.11.14.1 2013/05/11 21:38:47 riz Exp $ .include bsd.own.mk .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib @@ -15,7 +15,7 @@ CRUNCHGEN_FLAGS= -d ${DBG} LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be -MAKEDEVTARGETS= all +MAKEDEVTARGETS= all ipty IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
CVS commit: [netbsd-6] src/distrib/hp700/ramdisk
Module Name:src Committed By: riz Date: Sat May 11 21:39:16 UTC 2013 Modified Files: src/distrib/hp700/ramdisk [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by skrll in ticket #882): distrib/hp700/ramdisk/Makefile: revision 1.12 Fix PR/47123 for hp700 as well To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.8.1 src/distrib/hp700/ramdisk/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/hp700/ramdisk/Makefile diff -u src/distrib/hp700/ramdisk/Makefile:1.11 src/distrib/hp700/ramdisk/Makefile:1.11.8.1 --- src/distrib/hp700/ramdisk/Makefile:1.11 Thu Feb 11 09:06:48 2010 +++ src/distrib/hp700/ramdisk/Makefile Sat May 11 21:39:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/02/11 09:06:48 roy Exp $ +# $NetBSD: Makefile,v 1.11.8.1 2013/05/11 21:39:16 riz Exp $ .include bsd.own.mk .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib @@ -15,7 +15,7 @@ CRUNCHGEN_FLAGS= -d ${DBG} LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be -MAKEDEVTARGETS= all +MAKEDEVTARGETS= all ipty IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
CVS commit: [netbsd-6] src/sys/kern
Module Name:src Committed By: riz Date: Sat May 11 21:43:06 UTC 2013 Modified Files: src/sys/kern [netbsd-6]: kern_drvctl.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #883): sys/kern/kern_drvctl.c: revision 1.34 Fix memory leak on the following cases when device attached or detached: - No one open drvctl. - kmem_alloc() failed in devmon_insert(). XXX pullup to both netbsd-5 and netbsd-6. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/kern/kern_drvctl.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/kern_drvctl.c diff -u src/sys/kern/kern_drvctl.c:1.32 src/sys/kern/kern_drvctl.c:1.32.8.1 --- src/sys/kern/kern_drvctl.c:1.32 Wed Aug 31 18:31:02 2011 +++ src/sys/kern/kern_drvctl.c Sat May 11 21:43:06 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_drvctl.c,v 1.32 2011/08/31 18:31:02 plunky Exp $ */ +/* $NetBSD: kern_drvctl.c,v 1.32.8.1 2013/05/11 21:43:06 riz Exp $ */ /* * Copyright (c) 2004 @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_drvctl.c,v 1.32 2011/08/31 18:31:02 plunky Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_drvctl.c,v 1.32.8.1 2013/05/11 21:43:06 riz Exp $); #include sys/param.h #include sys/systm.h @@ -115,6 +115,7 @@ devmon_insert(const char *event, prop_di mutex_enter(drvctl_lock); if (drvctl_nopen == 0) { + prop_object_release(ev); mutex_exit(drvctl_lock); return; } @@ -128,6 +129,7 @@ devmon_insert(const char *event, prop_di dce = kmem_alloc(sizeof(*dce), KM_SLEEP); if (dce == NULL) { + prop_object_release(ev); mutex_exit(drvctl_lock); return; }
CVS commit: [netbsd-6] src/lib/libcurses
Module Name:src Committed By: riz Date: Sat May 11 21:46:26 UTC 2013 Modified Files: src/lib/libcurses [netbsd-6]: border.c Log Message: Pull up following revision(s) (requested by jdc in ticket #884): lib/libcurses/border.c: revision 1.15 Also merge in background attributes. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.8.1 src/lib/libcurses/border.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/libcurses/border.c diff -u src/lib/libcurses/border.c:1.14 src/lib/libcurses/border.c:1.14.8.1 --- src/lib/libcurses/border.c:1.14 Sat Dec 25 09:59:52 2010 +++ src/lib/libcurses/border.c Sat May 11 21:46:26 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: border.c,v 1.14 2010/12/25 09:59:52 blymn Exp $ */ +/* $NetBSD: border.c,v 1.14.8.1 2013/05/11 21:46:26 riz Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: border.c,v 1.14 2010/12/25 09:59:52 blymn Exp $); +__RCSID($NetBSD: border.c,v 1.14.8.1 2013/05/11 21:46:26 riz Exp $); #endif/* not lint */ #include stdlib.h @@ -261,20 +261,36 @@ int wborder_set(WINDOW *win, const cchar /* Merge window attributes */ left.attributes |= (left.attributes __COLOR) ? (win-wattr ~__COLOR) : win-wattr; + left.attributes |= (left.attributes __COLOR) ? + (win-battr ~__COLOR) : win-battr; right.attributes |= (right.attributes __COLOR) ? (win-wattr ~__COLOR) : win-wattr; + right.attributes |= (right.attributes __COLOR) ? + (win-battr ~__COLOR) : win-battr; top.attributes |= (top.attributes __COLOR) ? (win-wattr ~__COLOR) : win-wattr; + top.attributes |= (top.attributes __COLOR) ? + (win-battr ~__COLOR) : win-battr; bottom.attributes |= (bottom.attributes __COLOR) ? (win-wattr ~__COLOR) : win-wattr; + bottom.attributes |= (bottom.attributes __COLOR) ? + (win-battr ~__COLOR) : win-battr; topleft.attributes |= (topleft.attributes __COLOR) ? (win-wattr ~__COLOR) : win-wattr; + topleft.attributes |= (topleft.attributes __COLOR) ? + (win-battr ~__COLOR) : win-battr; topright.attributes |= (topright.attributes __COLOR) ? (win-wattr ~__COLOR) : win-wattr; + topright.attributes |= (topright.attributes __COLOR) ? + (win-battr ~__COLOR) : win-battr; botleft.attributes |= (botleft.attributes __COLOR) ? (win-wattr ~__COLOR) : win-wattr; + botleft.attributes |= (botleft.attributes __COLOR) ? + (win-battr ~__COLOR) : win-battr; botright.attributes |= (botright.attributes __COLOR) ? (win-wattr ~__COLOR) : win-wattr; + botright.attributes |= (botright.attributes __COLOR) ? + (win-battr ~__COLOR) : win-battr; endx = win-maxx - 1; endy = win-maxy - 1;
CVS commit: [netbsd-6] src/lib/libcurses
Module Name:src Committed By: riz Date: Sat May 11 21:48:23 UTC 2013 Modified Files: src/lib/libcurses [netbsd-6]: setterm.c Log Message: Pull up following revision(s) (requested by jdc in ticket #885): lib/libcurses/setterm.c: revision 1.50 Extend does_ctrl_o() to compare exit attribute and ext ACS sequences. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.48.4.1 src/lib/libcurses/setterm.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/libcurses/setterm.c diff -u src/lib/libcurses/setterm.c:1.48 src/lib/libcurses/setterm.c:1.48.4.1 --- src/lib/libcurses/setterm.c:1.48 Tue Oct 4 11:01:14 2011 +++ src/lib/libcurses/setterm.c Sat May 11 21:48:23 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: setterm.c,v 1.48 2011/10/04 11:01:14 roy Exp $ */ +/* $NetBSD: setterm.c,v 1.48.4.1 2013/05/11 21:48:23 riz Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)setterm.c 8.8 (Berkeley) 10/25/94; #else -__RCSID($NetBSD: setterm.c,v 1.48 2011/10/04 11:01:14 roy Exp $); +__RCSID($NetBSD: setterm.c,v 1.48.4.1 2013/05/11 21:48:23 riz Exp $); #endif #endif /* not lint */ @@ -49,7 +49,7 @@ __RCSID($NetBSD: setterm.c,v 1.48 2011/ #include curses_private.h static int does_esc_m(const char *cap); -static int does_ctrl_o(const char *cap); +static int does_ctrl_o(const char *exit_cap, const char *acs_cap); attr_t __mask_op, __mask_me, __mask_ue, __mask_se; @@ -172,7 +172,8 @@ _cursesi_setterm(char *type, SCREEN *scr * It might turn off ACS, so check for that. */ if (t_exit_attribute_mode(screen-term) != NULL - does_ctrl_o(t_exit_attribute_mode(screen-term))) + does_ctrl_o(t_exit_attribute_mode(screen-term), + t_exit_alt_charset_mode(screen-term))) screen-mask_me = 0; else screen-mask_me = __ALTCHARSET; @@ -330,20 +331,22 @@ does_esc_m(const char *cap) /* * does_ctrl_o -- * A hack for vt100/xterm-like terminals where the me capability also - * unsets acs (i.e. it contains the character '\017'). + * unsets acs. */ static int -does_ctrl_o(const char *cap) +does_ctrl_o(const char *exit_cap, const char *acs_cap) { - const char *capptr = cap; + const char *eptr = exit_cap, *aptr = acs_cap; + int l; #ifdef DEBUG - __CTRACE(__CTRACE_INIT, does_ctrl_o: Looping on %s\n, capptr); + __CTRACE(__CTRACE_INIT, does_ctrl_o: Testing %s for %s\n, eptr, aptr); #endif - while (*capptr != 0) { - if (*capptr == '\x0f') + l = strlen(acs_cap); + while (*eptr != 0) { + if (!strncmp(eptr, aptr, l)) return 1; - capptr++; + eptr++; } return 0; }
CVS commit: [netbsd-6] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat May 11 21:51:23 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6]: antarctica asia australasia southamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #886): Merge tzdata2013c from ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz Summary of changes from tzdata2013b to tzdata2013c: Changes affecting current and future time stamps: Palestine observed DST starting March 29, 2013. From 2013 on, Gaza and Hebron both observe DST. Assume that the recent change to Paraguays DST rules is permanent. Changes affecting past time stamps: Fix some historical data for Palestine. Fix times of habitation for Macquarie. Changing affecting metadata only: Macquarie Island is politically part of Australia, not Antarctica. Sort Macquarie more-consistently with other parts of Australia. To generate a diff of this commit: cvs rdiff -u -r1.1.1.19.4.3 -r1.1.1.19.4.4 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.50.4.7 -r1.1.1.50.4.8 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.7 -r1.23.4.8 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.46.4.7 -r1.1.1.46.4.8 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.4 -r1.1.1.39.4.5 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/antarctica diff -u src/share/zoneinfo/antarctica:1.1.1.19.4.3 src/share/zoneinfo/antarctica:1.1.1.19.4.4 --- src/share/zoneinfo/antarctica:1.1.1.19.4.3 Fri Mar 15 18:49:52 2013 +++ src/share/zoneinfo/antarctica Sat May 11 21:51:23 2013 @@ -53,34 +53,6 @@ Rule ChileAQ 2011 only - Aug Sun=16 4:0 Rule ChileAQ 2012 max - Apr Sun=23 3:00u 0 - Rule ChileAQ 2012 max - Sep Sun=2 4:00u 1:00 S -# These rules are stolen from the `australasia' file. -Rule AusAQ 1917 only - Jan 1 0:01 1:00 - -Rule AusAQ 1917 only - Mar 25 2:00 0 - -Rule AusAQ 1942 only - Jan 1 2:00 1:00 - -Rule AusAQ 1942 only - Mar 29 2:00 0 - -Rule AusAQ 1942 only - Sep 27 2:00 1:00 - -Rule AusAQ 1943 1944 - Mar lastSun 2:00 0 - -Rule AusAQ 1943 only - Oct 3 2:00 1:00 - -Rule ATAQ 1967 only - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 1968 only - Mar lastSun 2:00s 0 - -Rule ATAQ 1968 1985 - Oct lastSun 2:00s 1:00 - -Rule ATAQ 1969 1971 - Mar Sun=8 2:00s 0 - -Rule ATAQ 1972 only - Feb lastSun 2:00s 0 - -Rule ATAQ 1973 1981 - Mar Sun=1 2:00s 0 - -Rule ATAQ 1982 1983 - Mar lastSun 2:00s 0 - -Rule ATAQ 1984 1986 - Mar Sun=1 2:00s 0 - -Rule ATAQ 1986 only - Oct Sun=15 2:00s 1:00 - -Rule ATAQ 1987 1990 - Mar Sun=15 2:00s 0 - -Rule ATAQ 1987 only - Oct Sun=22 2:00s 1:00 - -Rule ATAQ 1988 1990 - Oct lastSun 2:00s 1:00 - -Rule ATAQ 1991 1999 - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 1991 2005 - Mar lastSun 2:00s 0 - -Rule ATAQ 2000 only - Aug lastSun 2:00s 1:00 - -Rule ATAQ 2001 max - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 2006 only - Apr Sun=1 2:00s 0 - -Rule ATAQ 2007 only - Mar lastSun 2:00s 0 - -Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 - - # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 # Esperanza, San Martin Land, -6323-05659, since 1952-12-17 @@ -122,10 +94,7 @@ Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 # /a # From Steffen Thorsen (2010-03-10): -# We got these changes from the Australian Antarctic Division: -# - Macquarie Island will stay on UTC+11 for winter and therefore not -# switch back from daylight savings time when other parts of Australia do -# on 4 April. +# We got these changes from the Australian Antarctic Division: ... # # - Casey station reverted to its normal time of UTC+8 on 5 March 2010. # The change to UTC+11 is being considered as a regular summer thing but @@ -136,9 +105,6 @@ Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 # # - Mawson station stays on UTC+5. # -# In addition to the Rule changes for Casey/Davis, it means that Macquarie -# will no longer be like Hobart and will have to have its own Zone created. -# # Background: # a href=http://www.timeanddate.com/news/time/antartica-time-changes-2010.html; # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html @@ -165,12 +131,6 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time 5:00 - MAWT -Zone Antarctica/Macquarie 0 - zzz 1911 - 10:00 - EST 1916 Oct 1 2:00 - 10:00 1:00 EST 1917 Feb - 10:00 AusAQ EST 1967 - 10:00 ATAQ EST 2010 Apr 4 3:00 - 11:00 - MIST # Macquarie Island Time # References: # a href=http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html; # Casey Weather (1998-02-26) Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.50.4.7 src/share/zoneinfo/asia:1.1.1.50.4.8 --- src/share/zoneinfo/asia:1.1.1.50.4.7 Fri Mar 15 18:49:52 2013 +++ src/share/zoneinfo/asia Sat May 11 21:51:23 2013 @@ -2291,11 +2291,20 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 #
CVS commit: [netbsd-6-0] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat May 11 21:53:44 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-6-0]: antarctica asia australasia southamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #886): Merge tzdata2013c from ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz Summary of changes from tzdata2013b to tzdata2013c: Changes affecting current and future time stamps: Palestine observed DST starting March 29, 2013. From 2013 on, Gaza and Hebron both observe DST. Assume that the recent change to Paraguays DST rules is permanent. Changes affecting past time stamps: Fix some historical data for Palestine. Fix times of habitation for Macquarie. Changing affecting metadata only: Macquarie Island is politically part of Australia, not Antarctica. Sort Macquarie more-consistently with other parts of Australia. To generate a diff of this commit: cvs rdiff -u -r1.1.1.19.4.2.4.1 -r1.1.1.19.4.2.4.2 \ src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.50.4.3.4.4 -r1.1.1.50.4.3.4.5 src/share/zoneinfo/asia cvs rdiff -u -r1.23.4.4.2.3 -r1.23.4.4.2.4 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.46.4.3.4.4 -r1.1.1.46.4.3.4.5 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.39.4.3.4.1 -r1.1.1.39.4.3.4.2 \ src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/antarctica diff -u src/share/zoneinfo/antarctica:1.1.1.19.4.2.4.1 src/share/zoneinfo/antarctica:1.1.1.19.4.2.4.2 --- src/share/zoneinfo/antarctica:1.1.1.19.4.2.4.1 Fri Mar 15 18:50:18 2013 +++ src/share/zoneinfo/antarctica Sat May 11 21:53:44 2013 @@ -53,34 +53,6 @@ Rule ChileAQ 2011 only - Aug Sun=16 4:0 Rule ChileAQ 2012 max - Apr Sun=23 3:00u 0 - Rule ChileAQ 2012 max - Sep Sun=2 4:00u 1:00 S -# These rules are stolen from the `australasia' file. -Rule AusAQ 1917 only - Jan 1 0:01 1:00 - -Rule AusAQ 1917 only - Mar 25 2:00 0 - -Rule AusAQ 1942 only - Jan 1 2:00 1:00 - -Rule AusAQ 1942 only - Mar 29 2:00 0 - -Rule AusAQ 1942 only - Sep 27 2:00 1:00 - -Rule AusAQ 1943 1944 - Mar lastSun 2:00 0 - -Rule AusAQ 1943 only - Oct 3 2:00 1:00 - -Rule ATAQ 1967 only - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 1968 only - Mar lastSun 2:00s 0 - -Rule ATAQ 1968 1985 - Oct lastSun 2:00s 1:00 - -Rule ATAQ 1969 1971 - Mar Sun=8 2:00s 0 - -Rule ATAQ 1972 only - Feb lastSun 2:00s 0 - -Rule ATAQ 1973 1981 - Mar Sun=1 2:00s 0 - -Rule ATAQ 1982 1983 - Mar lastSun 2:00s 0 - -Rule ATAQ 1984 1986 - Mar Sun=1 2:00s 0 - -Rule ATAQ 1986 only - Oct Sun=15 2:00s 1:00 - -Rule ATAQ 1987 1990 - Mar Sun=15 2:00s 0 - -Rule ATAQ 1987 only - Oct Sun=22 2:00s 1:00 - -Rule ATAQ 1988 1990 - Oct lastSun 2:00s 1:00 - -Rule ATAQ 1991 1999 - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 1991 2005 - Mar lastSun 2:00s 0 - -Rule ATAQ 2000 only - Aug lastSun 2:00s 1:00 - -Rule ATAQ 2001 max - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 2006 only - Apr Sun=1 2:00s 0 - -Rule ATAQ 2007 only - Mar lastSun 2:00s 0 - -Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 - - # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 # Esperanza, San Martin Land, -6323-05659, since 1952-12-17 @@ -122,10 +94,7 @@ Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 # /a # From Steffen Thorsen (2010-03-10): -# We got these changes from the Australian Antarctic Division: -# - Macquarie Island will stay on UTC+11 for winter and therefore not -# switch back from daylight savings time when other parts of Australia do -# on 4 April. +# We got these changes from the Australian Antarctic Division: ... # # - Casey station reverted to its normal time of UTC+8 on 5 March 2010. # The change to UTC+11 is being considered as a regular summer thing but @@ -136,9 +105,6 @@ Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 # # - Mawson station stays on UTC+5. # -# In addition to the Rule changes for Casey/Davis, it means that Macquarie -# will no longer be like Hobart and will have to have its own Zone created. -# # Background: # a href=http://www.timeanddate.com/news/time/antartica-time-changes-2010.html; # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html @@ -165,12 +131,6 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time 5:00 - MAWT -Zone Antarctica/Macquarie 0 - zzz 1911 - 10:00 - EST 1916 Oct 1 2:00 - 10:00 1:00 EST 1917 Feb - 10:00 AusAQ EST 1967 - 10:00 ATAQ EST 2010 Apr 4 3:00 - 11:00 - MIST # Macquarie Island Time # References: # a href=http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html; # Casey Weather (1998-02-26) Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.50.4.3.4.4 src/share/zoneinfo/asia:1.1.1.50.4.3.4.5 --- src/share/zoneinfo/asia:1.1.1.50.4.3.4.4 Fri Mar 15 18:50:18 2013 +++ src/share/zoneinfo/asia Sat May 11 21:53:44 2013
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Sat May 11 21:54:50 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: Tickets 882, 886 To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/doc/CHANGES-6.0.2 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.2 diff -u src/doc/CHANGES-6.0.2:1.1.2.31 src/doc/CHANGES-6.0.2:1.1.2.32 --- src/doc/CHANGES-6.0.2:1.1.2.31 Mon Apr 29 03:30:05 2013 +++ src/doc/CHANGES-6.0.2 Sat May 11 21:54:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.2,v 1.1.2.31 2013/04/29 03:30:05 riz Exp $ +# $NetBSD: CHANGES-6.0.2,v 1.1.2.32 2013/05/11 21:54:50 riz Exp $ A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2 release: @@ -249,3 +249,18 @@ sys/arch/x68k/dev/ite_tv.c 1.16 Fix a kernel panic which can be triggered by printf(1) on x68k. [isaki, ticket #881] +distrib/hp700/ramdisk/Makefile 1.12 + + Fix PR/47123 (sysinst failure) for hp700 as well. + [skrll, ticket #882] + +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch + + Merge tzdata2013c from + ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz + [apb, ticket #886] +
CVS commit: [netbsd-6] src/usr.bin/sed
Module Name:src Committed By: riz Date: Sat May 11 21:59:29 UTC 2013 Modified Files: src/usr.bin/sed [netbsd-6]: process.c sed.1 Log Message: Pull up following revision(s) (requested by uwe in ticket #888): usr.bin/sed/process.c: revision 1.39 usr.bin/sed/sed.1: revision 1.30 usr.bin/sed/sed.1: revision 1.31 The change (c) command should start a new cycle. Apply one line patch I posted in PR #45981 and document this in the manual page. Bump date for previous (PR #45981): the change (c) command starts a new cycle. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.8.1 src/usr.bin/sed/process.c cvs rdiff -u -r1.27 -r1.27.20.1 src/usr.bin/sed/sed.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/sed/process.c diff -u src/usr.bin/sed/process.c:1.38 src/usr.bin/sed/process.c:1.38.8.1 --- src/usr.bin/sed/process.c:1.38 Mon Apr 13 07:29:55 2009 +++ src/usr.bin/sed/process.c Sat May 11 21:59:29 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: process.c,v 1.38 2009/04/13 07:29:55 lukem Exp $ */ +/* $NetBSD: process.c,v 1.38.8.1 2013/05/11 21:59:29 riz Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -76,7 +76,7 @@ #if 0 static char sccsid[] = @(#)process.c 8.6 (Berkeley) 4/20/94; #else -__RCSID($NetBSD: process.c,v 1.38 2009/04/13 07:29:55 lukem Exp $); +__RCSID($NetBSD: process.c,v 1.38.8.1 2013/05/11 21:59:29 riz Exp $); #endif #endif /* not lint */ @@ -168,7 +168,7 @@ redirect: psl = 0; if (cp-a2 == NULL || lastaddr) (void)printf(%s, cp-t); -break; +goto new; case 'd': pd = 1; goto new; Index: src/usr.bin/sed/sed.1 diff -u src/usr.bin/sed/sed.1:1.27 src/usr.bin/sed/sed.1:1.27.20.1 --- src/usr.bin/sed/sed.1:1.27 Sun Sep 21 16:46:01 2008 +++ src/usr.bin/sed/sed.1 Sat May 11 21:59:29 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: sed.1,v 1.27 2008/09/21 16:46:01 wiz Exp $ +.\ $NetBSD: sed.1,v 1.27.20.1 2013/05/11 21:59:29 riz Exp $ .\ .\ Copyright (c) 1992, 1993 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)sed.1 8.2 (Berkeley) 12/30/93 .\ -.Dd September 21, 2008 +.Dd March 17, 2013 .Dt SED 1 .Os .Sh NAME @@ -290,6 +290,7 @@ Delete the pattern space. With 0 or 1 address or at the end of a 2-address range, .Em text is written to the standard output. +Start the next cycle. .sp .It [2addr]d Delete the pattern space and start the next cycle.
CVS commit: [netbsd-5] src/share/zoneinfo
Module Name:src Committed By: riz Date: Sat May 11 22:29:10 UTC 2013 Modified Files: src/share/zoneinfo [netbsd-5]: antarctica asia australasia southamerica zone.tab Log Message: Pull up following revision(s) (requested by apb in ticket #1860): Merge tzdata2013c from ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz Summary of changes from tzdata2013b to tzdata2013c: Changes affecting current and future time stamps: Palestine observed DST starting March 29, 2013. From 2013 on, Gaza and Hebron both observe DST. Assume that the recent change to Paraguays DST rules is permanent. Changes affecting past time stamps: Fix some historical data for Palestine. Fix times of habitation for Macquarie. Changing affecting metadata only: Macquarie Island is politically part of Australia, not Antarctica. Sort Macquarie more-consistently with other parts of Australia. To generate a diff of this commit: cvs rdiff -u -r1.1.1.17.12.4 -r1.1.1.17.12.5 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.2.8 -r1.1.1.44.2.9 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.7 -r1.17.2.8 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.42.2.7 -r1.1.1.42.2.8 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.2.5 -r1.1.1.33.2.6 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/antarctica diff -u src/share/zoneinfo/antarctica:1.1.1.17.12.4 src/share/zoneinfo/antarctica:1.1.1.17.12.5 --- src/share/zoneinfo/antarctica:1.1.1.17.12.4 Fri Mar 15 18:48:07 2013 +++ src/share/zoneinfo/antarctica Sat May 11 22:29:10 2013 @@ -53,34 +53,6 @@ Rule ChileAQ 2011 only - Aug Sun=16 4:0 Rule ChileAQ 2012 max - Apr Sun=23 3:00u 0 - Rule ChileAQ 2012 max - Sep Sun=2 4:00u 1:00 S -# These rules are stolen from the `australasia' file. -Rule AusAQ 1917 only - Jan 1 0:01 1:00 - -Rule AusAQ 1917 only - Mar 25 2:00 0 - -Rule AusAQ 1942 only - Jan 1 2:00 1:00 - -Rule AusAQ 1942 only - Mar 29 2:00 0 - -Rule AusAQ 1942 only - Sep 27 2:00 1:00 - -Rule AusAQ 1943 1944 - Mar lastSun 2:00 0 - -Rule AusAQ 1943 only - Oct 3 2:00 1:00 - -Rule ATAQ 1967 only - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 1968 only - Mar lastSun 2:00s 0 - -Rule ATAQ 1968 1985 - Oct lastSun 2:00s 1:00 - -Rule ATAQ 1969 1971 - Mar Sun=8 2:00s 0 - -Rule ATAQ 1972 only - Feb lastSun 2:00s 0 - -Rule ATAQ 1973 1981 - Mar Sun=1 2:00s 0 - -Rule ATAQ 1982 1983 - Mar lastSun 2:00s 0 - -Rule ATAQ 1984 1986 - Mar Sun=1 2:00s 0 - -Rule ATAQ 1986 only - Oct Sun=15 2:00s 1:00 - -Rule ATAQ 1987 1990 - Mar Sun=15 2:00s 0 - -Rule ATAQ 1987 only - Oct Sun=22 2:00s 1:00 - -Rule ATAQ 1988 1990 - Oct lastSun 2:00s 1:00 - -Rule ATAQ 1991 1999 - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 1991 2005 - Mar lastSun 2:00s 0 - -Rule ATAQ 2000 only - Aug lastSun 2:00s 1:00 - -Rule ATAQ 2001 max - Oct Sun=1 2:00s 1:00 - -Rule ATAQ 2006 only - Apr Sun=1 2:00s 0 - -Rule ATAQ 2007 only - Mar lastSun 2:00s 0 - -Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 - - # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 # Esperanza, San Martin Land, -6323-05659, since 1952-12-17 @@ -122,10 +94,7 @@ Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 # /a # From Steffen Thorsen (2010-03-10): -# We got these changes from the Australian Antarctic Division: -# - Macquarie Island will stay on UTC+11 for winter and therefore not -# switch back from daylight savings time when other parts of Australia do -# on 4 April. +# We got these changes from the Australian Antarctic Division: ... # # - Casey station reverted to its normal time of UTC+8 on 5 March 2010. # The change to UTC+11 is being considered as a regular summer thing but @@ -136,9 +105,6 @@ Rule ATAQ 2008 max - Apr Sun=1 2:00s 0 # # - Mawson station stays on UTC+5. # -# In addition to the Rule changes for Casey/Davis, it means that Macquarie -# will no longer be like Hobart and will have to have its own Zone created. -# # Background: # a href=http://www.timeanddate.com/news/time/antartica-time-changes-2010.html; # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html @@ -165,12 +131,6 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time 5:00 - MAWT -Zone Antarctica/Macquarie 0 - zzz 1911 - 10:00 - EST 1916 Oct 1 2:00 - 10:00 1:00 EST 1917 Feb - 10:00 AusAQ EST 1967 - 10:00 ATAQ EST 2010 Apr 4 3:00 - 11:00 - MIST # Macquarie Island Time # References: # a href=http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html; # Casey Weather (1998-02-26) Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.2.8 src/share/zoneinfo/asia:1.1.1.44.2.9 --- src/share/zoneinfo/asia:1.1.1.44.2.8 Fri Mar 15 18:48:07 2013 +++ src/share/zoneinfo/asia Sat May 11 22:29:10 2013 @@ -2291,11 +2291,20 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 #
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Sat May 11 22:29:57 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: ticket 1860 To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-5.1.3 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-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.37 src/doc/CHANGES-5.1.3:1.1.2.38 --- src/doc/CHANGES-5.1.3:1.1.2.37 Fri Mar 15 18:54:45 2013 +++ src/doc/CHANGES-5.1.3 Sat May 11 22:29:56 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.37 2013/03/15 18:54:45 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.38 2013/05/11 22:29:56 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2377,3 +2377,13 @@ distrib/sets/lists/base/mi patch try to predict Ramadan in Morocco as best we can. [apb, ticket #1854] +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch + + Merge tzdata2013c from + ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz + [apb, ticket #1860] +
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Sat May 11 22:30:21 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Ticket 1860 To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-5.2.1 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-5.2.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.5 src/doc/CHANGES-5.2.1:1.1.2.6 --- src/doc/CHANGES-5.2.1:1.1.2.5 Fri Mar 15 18:55:18 2013 +++ src/doc/CHANGES-5.2.1 Sat May 11 22:30:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.5 2013/03/15 18:55:18 riz Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.6 2013/05/11 22:30:21 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -91,3 +91,13 @@ distrib/sets/lists/base/mi patch try to predict Ramadan in Morocco as best we can. [apb, ticket #1854] +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch + + Merge tzdata2013c from + ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz + [apb, ticket #1860] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat May 11 22:30:39 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1860 To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-5.3 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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.7 src/doc/CHANGES-5.3:1.1.2.8 --- src/doc/CHANGES-5.3:1.1.2.7 Fri Mar 15 18:54:05 2013 +++ src/doc/CHANGES-5.3 Sat May 11 22:30:39 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.7 2013/03/15 18:54:05 riz Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.8 2013/05/11 22:30:39 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -198,3 +198,13 @@ distrib/sets/lists/base/mi patch try to predict Ramadan in Morocco as best we can. [apb, ticket #1854] +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/southamerica patch +share/zoneinfo/zone.tabpatch + + Merge tzdata2013c from + ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz + [apb, ticket #1860] +
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src Committed By: riz Date: Sat May 11 22:34:38 UTC 2013 Modified Files: src/sys/dev/pci [netbsd-5]: pcireg.h ppb.c Log Message: Applied patch (requested by msaitoh in ticket #1844): sys/dev/pci/pcireg.h1.69 sys/dev/pci/ppb.c 1.44-1.45 Support PCI Express 2.0. Print version and device/port type information [msaitoh, ticket #1844] To generate a diff of this commit: cvs rdiff -u -r1.57.20.1 -r1.57.20.2 src/sys/dev/pci/pcireg.h cvs rdiff -u -r1.39 -r1.39.10.1 src/sys/dev/pci/ppb.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/pci/pcireg.h diff -u src/sys/dev/pci/pcireg.h:1.57.20.1 src/sys/dev/pci/pcireg.h:1.57.20.2 --- src/sys/dev/pci/pcireg.h:1.57.20.1 Fri Nov 19 23:40:28 2010 +++ src/sys/dev/pci/pcireg.h Sat May 11 22:34:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pcireg.h,v 1.57.20.1 2010/11/19 23:40:28 riz Exp $ */ +/* $NetBSD: pcireg.h,v 1.57.20.2 2013/05/11 22:34:38 riz Exp $ */ /* * Copyright (c) 1995, 1996, 1999, 2000 @@ -540,6 +540,17 @@ typedef u_int8_t pci_revision_t; * PCI Express; access via capability pointer. */ #define PCI_PCIE_XCAP 0x00 +#define PCI_PCIE_XCAP_VER_MASK 0x000f +#define PCI_PCIE_XCAP_VER_1_0 0x0001 +#define PCI_PCIE_XCAP_VER_2_0 0x0002 +#define PCI_PCIE_XCAP_TYPE_MASK 0x00f0 +#define PCI_PCIE_XCAP_TYPE_PCIE_DEV 0x +#define PCI_PCIE_XCAP_TYPE_PCI_DEV 0x0010 +#define PCI_PCIE_XCAP_TYPE_ROOT 0x0040 +#define PCI_PCIE_XCAP_TYPE_UP 0x0050 +#define PCI_PCIE_XCAP_TYPE_DOWN 0x0060 +#define PCI_PCIE_XCAP_TYPE_PCIE2PCI 0x0070 +#define PCI_PCIE_XCAP_TYPE_PCI2PCIE 0x0080 #define PCI_PCIE_XCAP_SI 0x0100 #define PCI_PCIE_DCAP 0x04 #define PCI_PCIE_DCSR 0x08 Index: src/sys/dev/pci/ppb.c diff -u src/sys/dev/pci/ppb.c:1.39 src/sys/dev/pci/ppb.c:1.39.10.1 --- src/sys/dev/pci/ppb.c:1.39 Sat May 3 05:44:06 2008 +++ src/sys/dev/pci/ppb.c Sat May 11 22:34:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ppb.c,v 1.39 2008/05/03 05:44:06 cegger Exp $ */ +/* $NetBSD: ppb.c,v 1.39.10.1 2013/05/11 22:34:38 riz Exp $ */ /* * Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ppb.c,v 1.39 2008/05/03 05:44:06 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: ppb.c,v 1.39.10.1 2013/05/11 22:34:38 riz Exp $); #include sys/param.h #include sys/systm.h @@ -43,6 +43,10 @@ __KERNEL_RCSID(0, $NetBSD: ppb.c,v 1.39 #include dev/pci/ppbreg.h #include dev/pci/pcidevs.h +#define PCI_PCIE_SLCSR_NOTIFY_MASK \ + (PCI_PCIE_SLCSR_ABE | PCI_PCIE_SLCSR_PFE | PCI_PCIE_SLCSR_MSE | \ + PCI_PCIE_SLCSR_PDE | PCI_PCIE_SLCSR_CCE | PCI_PCIE_SLCSR_HPE) + struct ppb_softc { device_t sc_dev; /* generic device glue */ pci_chipset_tag_t sc_pc; /* our PCI chipset... */ @@ -72,7 +76,7 @@ ppbmatch(device_t parent, cfdata_t match } static void -ppb_fix_pcix(device_t self) +ppb_fix_pcie(device_t self) { struct ppb_softc *sc = device_private(self); pcireg_t reg; @@ -82,15 +86,55 @@ ppb_fix_pcix(device_t self) off, reg)) return; /* Not a PCIe device */ - if ((reg 0x000f) != 0x0001) { - aprint_normal_dev(self, unsupported PCI Express version\n); + aprint_normal_dev(self, PCI Express ); + switch (reg PCI_PCIE_XCAP_VER_MASK) { + case PCI_PCIE_XCAP_VER_1_0: + aprint_normal(1.0); + break; + case PCI_PCIE_XCAP_VER_2_0: + aprint_normal(2.0); + break; + default: + aprint_normal_dev(self, version unsupported (0x%x)\n, + (reg PCI_PCIE_XCAP_VER_MASK) 16); return; } - reg = pci_conf_read(sc-sc_pc, sc-sc_tag, off + 0x18); - if (reg 0x003f) { - aprint_normal_dev(self, disabling notification events\n); - reg = ~0x003f; - pci_conf_write(sc-sc_pc, sc-sc_tag, off + 0x18, reg); + aprint_normal( ); + switch (reg PCI_PCIE_XCAP_TYPE_MASK) { + case PCI_PCIE_XCAP_TYPE_PCIE_DEV: + aprint_normal(PCI-E Endpoint device); + break; + case PCI_PCIE_XCAP_TYPE_PCI_DEV: + aprint_normal(Legacy PCI-E Endpoint device); + break; + case PCI_PCIE_XCAP_TYPE_ROOT: + aprint_normal(Root Port of PCI-E Root Complex); + break; + case PCI_PCIE_XCAP_TYPE_UP: + aprint_normal(Upstream Port of PCI-E Switch); + break; + case PCI_PCIE_XCAP_TYPE_DOWN: + aprint_normal(Downstream Port of PCI-E Switch); + break; + case PCI_PCIE_XCAP_TYPE_PCIE2PCI: + aprint_normal(PCI-E to PCI/PCI-X Bridge); + break; + case PCI_PCIE_XCAP_TYPE_PCI2PCIE: + aprint_normal(PCI/PCI-X to PCI-E Bridge); + break; + default: + aprint_normal(Device/Port Type 0x%x, + (reg PCI_PCIE_XCAP_TYPE_MASK) 20); + break; + } + aprint_normal(\n); + + reg = pci_conf_read(sc-sc_pc, sc-sc_tag, off + PCI_PCIE_SLCSR); + if (reg PCI_PCIE_SLCSR_NOTIFY_MASK) { + aprint_debug_dev(self, disabling notification events\n); + reg = ~PCI_PCIE_SLCSR_NOTIFY_MASK; + pci_conf_write(sc-sc_pc, sc-sc_tag, +
CVS commit: [netbsd-5] src/distrib/utils/sysinst
Module Name:src Committed By: riz Date: Sat May 11 22:41:10 UTC 2013 Modified Files: src/distrib/utils/sysinst [netbsd-5]: menus.mi Log Message: distrib/utils/sysinst/menus.mi 1.35, 1.43 Some v6 dns server are outdated, so replace them with google's public servers. [msaitoh, ticket #1846] To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.2.1 src/distrib/utils/sysinst/menus.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/utils/sysinst/menus.mi diff -u src/distrib/utils/sysinst/menus.mi:1.33 src/distrib/utils/sysinst/menus.mi:1.33.2.1 --- src/distrib/utils/sysinst/menus.mi:1.33 Fri Aug 8 02:54:06 2008 +++ src/distrib/utils/sysinst/menus.mi Sat May 11 22:41:10 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: menus.mi,v 1.33 2008/08/08 02:54:06 simonb Exp $ */ +/* $NetBSD: menus.mi,v 1.33.2.1 2013/05/11 22:41:10 riz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -347,28 +347,20 @@ menu localdirsource, y=-4, x=0, w=70, no action { src_prompt(MSG_Set_dir, set_dir, 60); }; menu namesrv6, title MSG_Select_IPv6_DNS_server; - option ns9.iij.ad.jp, exit, action + option google-public-dns-a.google.com, exit, action { #ifdef INET6 - strlcpy(net_namesvr6, 2001:240::1, sizeof(net_namesvr6)); - yesno = 1; -#else - yesno = 0; -#endif - }; - option ns-wide.wide.ad.jp, exit, action - { -#ifdef INET6 - strlcpy(net_namesvr6, 2001:200:0:1::3, sizeof(net_namesvr6)); + strlcpy(net_namesvr6, 2001:4860:4860::, + sizeof(net_namesvr6)); yesno = 1; #else yesno = 0; #endif }; - option light.imasy.or.jp, exit, action + option google-public-dns-b.google.com, exit, action { #ifdef INET6 - strlcpy(net_namesvr6, 3ffe:505:0:1:2a0:c9ff:fe61:6521, + strlcpy(net_namesvr6, 2001:4860:4860::8844, sizeof(net_namesvr6)); yesno = 1; #else
CVS commit: [netbsd-5-2] src/distrib/utils/sysinst
Module Name:src Committed By: riz Date: Sat May 11 22:41:34 UTC 2013 Modified Files: src/distrib/utils/sysinst [netbsd-5-2]: menus.mi Log Message: distrib/utils/sysinst/menus.mi 1.35, 1.43 Some v6 dns server are outdated, so replace them with google's public servers. [msaitoh, ticket #1846] To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.14.1 src/distrib/utils/sysinst/menus.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/utils/sysinst/menus.mi diff -u src/distrib/utils/sysinst/menus.mi:1.33 src/distrib/utils/sysinst/menus.mi:1.33.14.1 --- src/distrib/utils/sysinst/menus.mi:1.33 Fri Aug 8 02:54:06 2008 +++ src/distrib/utils/sysinst/menus.mi Sat May 11 22:41:34 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: menus.mi,v 1.33 2008/08/08 02:54:06 simonb Exp $ */ +/* $NetBSD: menus.mi,v 1.33.14.1 2013/05/11 22:41:34 riz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -347,28 +347,20 @@ menu localdirsource, y=-4, x=0, w=70, no action { src_prompt(MSG_Set_dir, set_dir, 60); }; menu namesrv6, title MSG_Select_IPv6_DNS_server; - option ns9.iij.ad.jp, exit, action + option google-public-dns-a.google.com, exit, action { #ifdef INET6 - strlcpy(net_namesvr6, 2001:240::1, sizeof(net_namesvr6)); - yesno = 1; -#else - yesno = 0; -#endif - }; - option ns-wide.wide.ad.jp, exit, action - { -#ifdef INET6 - strlcpy(net_namesvr6, 2001:200:0:1::3, sizeof(net_namesvr6)); + strlcpy(net_namesvr6, 2001:4860:4860::, + sizeof(net_namesvr6)); yesno = 1; #else yesno = 0; #endif }; - option light.imasy.or.jp, exit, action + option google-public-dns-b.google.com, exit, action { #ifdef INET6 - strlcpy(net_namesvr6, 3ffe:505:0:1:2a0:c9ff:fe61:6521, + strlcpy(net_namesvr6, 2001:4860:4860::8844, sizeof(net_namesvr6)); yesno = 1; #else
CVS commit: [netbsd-5-1] src/distrib/utils/sysinst
Module Name:src Committed By: riz Date: Sat May 11 22:41:59 UTC 2013 Modified Files: src/distrib/utils/sysinst [netbsd-5-1]: menus.mi Log Message: distrib/utils/sysinst/menus.mi 1.35, 1.43 Some v6 dns server are outdated, so replace them with google's public servers. [msaitoh, ticket #1846] To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.10.1 src/distrib/utils/sysinst/menus.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/utils/sysinst/menus.mi diff -u src/distrib/utils/sysinst/menus.mi:1.33 src/distrib/utils/sysinst/menus.mi:1.33.10.1 --- src/distrib/utils/sysinst/menus.mi:1.33 Fri Aug 8 02:54:06 2008 +++ src/distrib/utils/sysinst/menus.mi Sat May 11 22:41:59 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: menus.mi,v 1.33 2008/08/08 02:54:06 simonb Exp $ */ +/* $NetBSD: menus.mi,v 1.33.10.1 2013/05/11 22:41:59 riz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -347,28 +347,20 @@ menu localdirsource, y=-4, x=0, w=70, no action { src_prompt(MSG_Set_dir, set_dir, 60); }; menu namesrv6, title MSG_Select_IPv6_DNS_server; - option ns9.iij.ad.jp, exit, action + option google-public-dns-a.google.com, exit, action { #ifdef INET6 - strlcpy(net_namesvr6, 2001:240::1, sizeof(net_namesvr6)); - yesno = 1; -#else - yesno = 0; -#endif - }; - option ns-wide.wide.ad.jp, exit, action - { -#ifdef INET6 - strlcpy(net_namesvr6, 2001:200:0:1::3, sizeof(net_namesvr6)); + strlcpy(net_namesvr6, 2001:4860:4860::, + sizeof(net_namesvr6)); yesno = 1; #else yesno = 0; #endif }; - option light.imasy.or.jp, exit, action + option google-public-dns-b.google.com, exit, action { #ifdef INET6 - strlcpy(net_namesvr6, 3ffe:505:0:1:2a0:c9ff:fe61:6521, + strlcpy(net_namesvr6, 2001:4860:4860::8844, sizeof(net_namesvr6)); yesno = 1; #else
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Sat May 11 22:42:21 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: TIcket 1846 To generate a diff of this commit: cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/doc/CHANGES-5.1.3 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-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.38 src/doc/CHANGES-5.1.3:1.1.2.39 --- src/doc/CHANGES-5.1.3:1.1.2.38 Sat May 11 22:29:56 2013 +++ src/doc/CHANGES-5.1.3 Sat May 11 22:42:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.38 2013/05/11 22:29:56 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.39 2013/05/11 22:42:21 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2387,3 +2387,9 @@ share/zoneinfo/zone.tabpatch ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz [apb, ticket #1860] +distrib/utils/sysinst/menus.mi 1.35, 1.43 + + Some v6 dns server are outdated, so replace them with google's + public servers. + [msaitoh, ticket #1846] +
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: riz Date: Sat May 11 22:42:38 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Ticket 1846. To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/doc/CHANGES-5.2.1 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-5.2.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.6 src/doc/CHANGES-5.2.1:1.1.2.7 --- src/doc/CHANGES-5.2.1:1.1.2.6 Sat May 11 22:30:21 2013 +++ src/doc/CHANGES-5.2.1 Sat May 11 22:42:38 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.6 2013/05/11 22:30:21 riz Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.7 2013/05/11 22:42:38 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -101,3 +101,9 @@ share/zoneinfo/zone.tabpatch ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz [apb, ticket #1860] +distrib/utils/sysinst/menus.mi 1.35, 1.43 + + Some v6 dns server are outdated, so replace them with google's + public servers. + [msaitoh, ticket #1846] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Sat May 11 22:42:59 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: TIckets 1844, 1846 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-5.3 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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.8 src/doc/CHANGES-5.3:1.1.2.9 --- src/doc/CHANGES-5.3:1.1.2.8 Sat May 11 22:30:39 2013 +++ src/doc/CHANGES-5.3 Sat May 11 22:42:58 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.8 2013/05/11 22:30:39 riz Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.9 2013/05/11 22:42:58 riz Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -208,3 +208,16 @@ share/zoneinfo/zone.tabpatch ftp://ftp.iana.org/tz/releases/tzdata2013c.tar.gz [apb, ticket #1860] +sys/dev/pci/pcireg.h 1.69 +sys/dev/pci/ppb.c 1.44-1.45 + + Support PCI Express 2.0. + Print version and device/port type information + [msaitoh, ticket #1844] + +distrib/utils/sysinst/menus.mi 1.35, 1.43 + + Some v6 dns server are outdated, so replace them with google's + public servers. + [msaitoh, ticket #1846] +
CVS commit: [khorben-n900] src/sys
Module Name:src Committed By: khorben Date: Sun May 12 00:42:50 UTC 2013 Modified Files: src/sys/arch/evbarm/conf [khorben-n900]: N900 src/sys/dev/i2c [khorben-n900]: tps65950.c tps65950reg.h Log Message: Added GPIO support to the TPS65950 companion chip. I haven't been able to test it properly thus far unfortunately. XXX Implement level-triggered interrupts. To generate a diff of this commit: cvs rdiff -u -r1.13.2.3 -r1.13.2.4 src/sys/arch/evbarm/conf/N900 cvs rdiff -u -r1.3.10.2 -r1.3.10.3 src/sys/dev/i2c/tps65950.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/i2c/tps65950reg.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/evbarm/conf/N900 diff -u src/sys/arch/evbarm/conf/N900:1.13.2.3 src/sys/arch/evbarm/conf/N900:1.13.2.4 --- src/sys/arch/evbarm/conf/N900:1.13.2.3 Sat May 11 18:22:47 2013 +++ src/sys/arch/evbarm/conf/N900 Sun May 12 00:42:50 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: N900,v 1.13.2.3 2013/05/11 18:22:47 khorben Exp $ +# $NetBSD: N900,v 1.13.2.4 2013/05/12 00:42:50 khorben Exp $ # # N900 -- Nokia N900 Kernel # @@ -248,9 +248,12 @@ iic* at omapiic? # I2C devices # Power Management and System Companion Device tps65950pm0 at iic0 addr 0x48 -tps65950pm1 at iic0 addr 0x49 intr 7 +tps65950pm1 at iic0 addr 0x49 intrbase 288 intr 7 tps65950pm2 at iic0 addr 0x4a tps65950pm3 at iic0 addr 0x4b +#tps65950pm4 at iic1 addr 0x12 + +gpio* at tps65950pm1 # SPI devices omapspi0 at obio0 addr 0x48098000 size 0x1000 intr 65 Index: src/sys/dev/i2c/tps65950.c diff -u src/sys/dev/i2c/tps65950.c:1.3.10.2 src/sys/dev/i2c/tps65950.c:1.3.10.3 --- src/sys/dev/i2c/tps65950.c:1.3.10.2 Sat May 11 18:22:47 2013 +++ src/sys/dev/i2c/tps65950.c Sun May 12 00:42:50 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: tps65950.c,v 1.3.10.2 2013/05/11 18:22:47 khorben Exp $ */ +/* $NetBSD: tps65950.c,v 1.3.10.3 2013/05/12 00:42:50 khorben Exp $ */ /*- * Copyright (c) 2012 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tps65950.c,v 1.3.10.2 2013/05/11 18:22:47 khorben Exp $); +__KERNEL_RCSID(0, $NetBSD: tps65950.c,v 1.3.10.3 2013/05/12 00:42:50 khorben Exp $); + +#define _INTR_PRIVATE + +#include gpio.h #include sys/param.h #include sys/systm.h @@ -45,6 +49,12 @@ __KERNEL_RCSID(0, $NetBSD: tps65950.c,v #include dev/i2c/i2cvar.h +#if NGPIO 0 +#include arm/pic/picvar.h +#include sys/gpio.h +#include dev/gpio/gpiovar.h +#endif /* NGPIO 0 */ + #include dev/clock_subr.h #include dev/sysmon/sysmonvar.h @@ -68,6 +78,17 @@ struct tps65950_softc { struct work sc_work; bool sc_queued; +#if NGPIO 0 + /* GPIO */ + struct gpio_chipset_tag sc_gpio; + gpio_pin_t sc_gpio_pins[18]; + struct pic_softc sc_gpio_pic; + +#define PIC_TO_SOFTC(pic) \ + ((struct tps65950_softc *)((char *)(pic) - \ + offsetof(struct tps65950_softc, sc_gpio_pic))) +#endif /* NGPIO 0 */ + /* WATCHDOG */ struct sysmon_wdog sc_smw; struct todr_chip_handle sc_todr; @@ -93,6 +114,31 @@ static void tps65950_intr_work(struct wo static void tps65950_pih_attach(struct tps65950_softc *, int); static void tps65950_pih_intr_work(struct work *, void *); +#if NGPIO 0 +static void tps65950_gpio_attach(struct tps65950_softc *, int); + +static void tps65950_gpio_intr(struct tps65950_softc *); + +static int tps65950_gpio_pin_read(void *, int); +static void tps65950_gpio_pin_write(void *, int, int); +static void tps65950_gpio_pin_ctl(void *, int, int); + +static void tps65950_gpio_pic_block_irqs(struct pic_softc *, size_t, + uint32_t); +static void tps65950_gpio_pic_unblock_irqs(struct pic_softc *, size_t, + uint32_t); +static int tps65950_gpio_pic_find_pending_irqs(struct pic_softc *); +static void tps65950_gpio_pic_establish_irq(struct pic_softc *, + struct intrsource *); + +const struct pic_ops tps65950_gpio_pic_ops = { + .pic_block_irqs = tps65950_gpio_pic_block_irqs, + .pic_unblock_irqs = tps65950_gpio_pic_unblock_irqs, + .pic_find_pending_irqs = tps65950_gpio_pic_find_pending_irqs, + .pic_establish_irq = tps65950_gpio_pic_establish_irq +}; +#endif /* NGPIO 0 */ + static void tps65950_rtc_attach(struct tps65950_softc *); static int tps65950_rtc_enable(struct tps65950_softc *, bool); static int tps65950_rtc_gettime(todr_chip_handle_t, struct clock_ymdhms *); @@ -151,8 +197,15 @@ tps65950_attach(device_t parent, device_ (buf[2] 16) | (buf[3] 24); aprint_normal(: IDCODE %08X, idcode); - aprint_normal(: PIH\n); + aprint_normal(: PIH); tps65950_pih_attach(sc, ia-ia_intr); + +#if NGPIO 0 + aprint_normal(, GPIO); + tps65950_gpio_attach(sc, ia-ia_intrbase); +#else + aprint_normal(\n); +#endif /* NGPIO 0 */ break; case TPS65950_ADDR_ID3: aprint_normal(: LED\n); @@ -312,6 +365,12 @@ tps65950_intr_work(struct work *work, vo tps65950_read_1(sc, TPS65950_PIH_REG_ISR_P1, u8); tps65950_write_1(sc,
CVS commit: [khorben-n900] src/sys/dev/i2c
Module Name:src Committed By: khorben Date: Sun May 12 00:56:28 UTC 2013 Modified Files: src/sys/dev/i2c [khorben-n900]: files.i2c Log Message: tps65950pm(4) can now expose a GPIO bus. To generate a diff of this commit: cvs rdiff -u -r1.49.2.1 -r1.49.2.2 src/sys/dev/i2c/files.i2c 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/i2c/files.i2c diff -u src/sys/dev/i2c/files.i2c:1.49.2.1 src/sys/dev/i2c/files.i2c:1.49.2.2 --- src/sys/dev/i2c/files.i2c:1.49.2.1 Fri May 10 01:10:02 2013 +++ src/sys/dev/i2c/files.i2c Sun May 12 00:56:28 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.i2c,v 1.49.2.1 2013/05/10 01:10:02 khorben Exp $ +# $NetBSD: files.i2c,v 1.49.2.2 2013/05/12 00:56:28 khorben Exp $ obsolete defflag opt_i2cbus.h I2C_SCAN define i2cbus { } @@ -173,7 +173,7 @@ attach ibmhawk at iic file dev/i2c/ibmhawk.c ibmhawk # TI TPS65950 OMAP Power Management and System Companion Device -device tps65950pm: sysmon_wdog +device tps65950pm: gpiobus, sysmon_wdog attach tps65950pm at iic file dev/i2c/tps65950.c tps65950pm
CVS commit: [khorben-n900] src/sys/arch/arm/omap
Module Name:src Committed By: khorben Date: Sun May 12 01:19:54 UTC 2013 Modified Files: src/sys/arch/arm/omap [khorben-n900]: omap2_spi.c Log Message: Removed debugging code To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/arm/omap/omap2_spi.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/omap/omap2_spi.c diff -u src/sys/arch/arm/omap/omap2_spi.c:1.1.2.1 src/sys/arch/arm/omap/omap2_spi.c:1.1.2.2 --- src/sys/arch/arm/omap/omap2_spi.c:1.1.2.1 Sat May 11 17:19:41 2013 +++ src/sys/arch/arm/omap/omap2_spi.c Sun May 12 01:19:54 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: omap2_spi.c,v 1.1.2.1 2013/05/11 17:19:41 khorben Exp $ */ +/* $NetBSD: omap2_spi.c,v 1.1.2.2 2013/05/12 01:19:54 khorben Exp $ */ /* * Texas Instruments OMAP2/3 Multichannel SPI driver. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: omap2_spi.c,v 1.1.2.1 2013/05/11 17:19:41 khorben Exp $); +__KERNEL_RCSID(0, $NetBSD: omap2_spi.c,v 1.1.2.2 2013/05/12 01:19:54 khorben Exp $); #include opt_omap.h @@ -188,8 +188,6 @@ omap2_spi_configure(void *cookie, int sl uint32_t conf = 0; uint32_t div; - aprint_normal_dev(sc-sc_dev, %s(%d)\n, __func__, slave); - if (slave = sc-sc_spi.sct_nslaves) return EINVAL; @@ -273,8 +271,6 @@ omap2_spi_start(struct omap2_spi_softc * uint32_t ctrlval; uint32_t u32; - aprint_normal_dev(sc-sc_dev, %s(%d)\n, __func__, channel); - chan = sc-sc_channels[channel]; if (chan-running) return; @@ -353,8 +349,6 @@ omap2_spi_intr(void *v) uint32_t tx_empty = 0; uint32_t rx_full = 0; - aprint_normal_dev(sc-sc_dev, %s()\n, __func__); - /* reset the channel status bits */ status = SPI_READ_REG(sc, OMAP2_MCSPI_IRQSTATUS); u32 = 0; @@ -414,8 +408,6 @@ omap2_spi_intr(void *v) omap2_spi_recv(sc, i); } - aprint_normal_dev(sc-sc_dev, %s() %p %p\n, __func__, -chan-wchunk, chan-rchunk); if (chan-wchunk == NULL chan-rchunk == NULL) { st = chan-transfer; chan-transfer = NULL; @@ -445,8 +437,6 @@ omap2_spi_reset(struct omap2_spi_softc * uint32_t status; int i; - aprint_normal_dev(sc-sc_dev, %s()\n, __func__); - /* proceed to a software reset */ SPI_WRITE_REG(sc, OMAP2_MCSPI_SYSCONFIG, OMAP2_MCSPI_SYSCONFIG_SOFTRESET); @@ -484,8 +474,6 @@ omap2_spi_send(struct omap2_spi_softc * uint32_t u32; uint32_t data; - aprint_normal_dev(sc-sc_dev, %s(%d)\n, __func__, channel); - if ((chunk = sc-sc_channels[channel].wchunk) == NULL) return; @@ -513,8 +501,6 @@ omap2_spi_recv(struct omap2_spi_softc * uint32_t u32; uint32_t data; - aprint_normal_dev(sc-sc_dev, %s(%d)\n, __func__, channel); - while ((chunk = sc-sc_channels[channel].rchunk) != NULL chunk-chunk_rresid == 0) { sc-sc_channels[channel].rchunk = chunk-chunk_next;
CVS commit: [khorben-n900] src/sys
Module Name:src Committed By: khorben Date: Sun May 12 01:49:44 UTC 2013 Modified Files: src/sys/arch/evbarm/conf [khorben-n900]: N900 src/sys/conf [khorben-n900]: files src/sys/dev/i2c [khorben-n900]: files.i2c tps65950.c tps65950reg.h Log Message: Added keyboard support for the TPS65950 companion chip. Tested on the Nokia N900 (multi-user) To generate a diff of this commit: cvs rdiff -u -r1.13.2.4 -r1.13.2.5 src/sys/arch/evbarm/conf/N900 cvs rdiff -u -r1.1070 -r1.1070.2.1 src/sys/conf/files cvs rdiff -u -r1.49.2.2 -r1.49.2.3 src/sys/dev/i2c/files.i2c cvs rdiff -u -r1.3.10.3 -r1.3.10.4 src/sys/dev/i2c/tps65950.c cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/dev/i2c/tps65950reg.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/evbarm/conf/N900 diff -u src/sys/arch/evbarm/conf/N900:1.13.2.4 src/sys/arch/evbarm/conf/N900:1.13.2.5 --- src/sys/arch/evbarm/conf/N900:1.13.2.4 Sun May 12 00:42:50 2013 +++ src/sys/arch/evbarm/conf/N900 Sun May 12 01:49:44 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: N900,v 1.13.2.4 2013/05/12 00:42:50 khorben Exp $ +# $NetBSD: N900,v 1.13.2.5 2013/05/12 01:49:44 khorben Exp $ # # N900 -- Nokia N900 Kernel # @@ -255,6 +255,9 @@ tps65950pm3 at iic0 addr 0x4b gpio* at tps65950pm1 +# Integrated keyboard +wskbd* at tps65950pm2 mux 1 + # SPI devices omapspi0 at obio0 addr 0x48098000 size 0x1000 intr 65 omapspi1 at obio0 addr 0x4809a000 size 0x1000 intr 66 Index: src/sys/conf/files diff -u src/sys/conf/files:1.1070 src/sys/conf/files:1.1070.2.1 --- src/sys/conf/files:1.1070 Sun Apr 28 03:11:32 2013 +++ src/sys/conf/files Sun May 12 01:49:44 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1070 2013/04/28 03:11:32 christos Exp $ +# $NetBSD: files,v 1.1070.2.1 2013/05/12 01:49:44 khorben Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -323,6 +323,17 @@ attach midi at midibus # define audiobell +# display attributes, display with emulator, keyboard, and mouse +# +define wsdisplaydev {[kbdmux = 1]} +define wsemuldisplaydev {[console = -1], [kbdmux = 1]} +define wskbddev {[console = -1], [mux = 1]} +define wsmousedev {[mux = 0]} +define vcons +# attribute to pull in raster support +# +define wsrasteremulops + # video devices, attaches to video hardware driver # device video @@ -1100,16 +,6 @@ include dev/drm/files.drm # Definitions for wscons -# device attributes: display, display with emulator, keyboard, and mouse -# -define wsdisplaydev {[kbdmux = 1]} -define wsemuldisplaydev {[console = -1], [kbdmux = 1]} -define wskbddev {[console = -1], [mux = 1]} -define wsmousedev {[mux = 0]} -define vcons -# attribute to pull in raster support -# -define wsrasteremulops # common PC display functions # defflag opt_pcdisplay.h PCDISPLAY_SOFTCURSOR Index: src/sys/dev/i2c/files.i2c diff -u src/sys/dev/i2c/files.i2c:1.49.2.2 src/sys/dev/i2c/files.i2c:1.49.2.3 --- src/sys/dev/i2c/files.i2c:1.49.2.2 Sun May 12 00:56:28 2013 +++ src/sys/dev/i2c/files.i2c Sun May 12 01:49:44 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.i2c,v 1.49.2.2 2013/05/12 00:56:28 khorben Exp $ +# $NetBSD: files.i2c,v 1.49.2.3 2013/05/12 01:49:44 khorben Exp $ obsolete defflag opt_i2cbus.h I2C_SCAN define i2cbus { } @@ -173,7 +173,7 @@ attach ibmhawk at iic file dev/i2c/ibmhawk.c ibmhawk # TI TPS65950 OMAP Power Management and System Companion Device -device tps65950pm: gpiobus, sysmon_wdog +device tps65950pm: gpiobus, sysmon_wdog, wskbddev attach tps65950pm at iic file dev/i2c/tps65950.c tps65950pm Index: src/sys/dev/i2c/tps65950.c diff -u src/sys/dev/i2c/tps65950.c:1.3.10.3 src/sys/dev/i2c/tps65950.c:1.3.10.4 --- src/sys/dev/i2c/tps65950.c:1.3.10.3 Sun May 12 00:42:50 2013 +++ src/sys/dev/i2c/tps65950.c Sun May 12 01:49:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: tps65950.c,v 1.3.10.3 2013/05/12 00:42:50 khorben Exp $ */ +/* $NetBSD: tps65950.c,v 1.3.10.4 2013/05/12 01:49:44 khorben Exp $ */ /*- * Copyright (c) 2012 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tps65950.c,v 1.3.10.3 2013/05/12 00:42:50 khorben Exp $); +__KERNEL_RCSID(0, $NetBSD: tps65950.c,v 1.3.10.4 2013/05/12 01:49:44 khorben Exp $); #define _INTR_PRIVATE @@ -55,6 +55,13 @@ __KERNEL_RCSID(0, $NetBSD: tps65950.c,v #include dev/gpio/gpiovar.h #endif /* NGPIO 0 */ +#if defined(OMAP_3430) +#include dev/wscons/wsconsio.h +#include dev/wscons/wskbdvar.h +#include dev/wscons/wsksymdef.h +#include dev/wscons/wsksymvar.h +#endif + #include dev/clock_subr.h #include dev/sysmon/sysmonvar.h @@ -89,17 +96,29 @@ struct tps65950_softc { offsetof(struct tps65950_softc, sc_gpio_pic))) #endif /* NGPIO 0 */ +#if defined(OMAP_3430) + /* KEYPAD */ + device_t sc_wskbddev; + uint8_t sc_keycodes[8]; +#endif + /* WATCHDOG */ struct sysmon_wdog sc_smw; struct todr_chip_handle sc_todr; }; - /*
CVS commit: src/sys/arch/evbarm/beagle
Module Name:src Committed By: matt Date: Sun May 12 02:55:54 UTC 2013 Modified Files: src/sys/arch/evbarm/beagle: beagle_machdep.c Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/beagle/beagle_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/evbarm/beagle/beagle_machdep.c diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.41 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.42 --- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.41 Mon May 6 23:12:53 2013 +++ src/sys/arch/evbarm/beagle/beagle_machdep.c Sun May 12 02:55:54 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: beagle_machdep.c,v 1.41 2013/05/06 23:12:53 matt Exp $ */ +/* $NetBSD: beagle_machdep.c,v 1.42 2013/05/12 02:55:54 matt Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: beagle_machdep.c,v 1.41 2013/05/06 23:12:53 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: beagle_machdep.c,v 1.42 2013/05/12 02:55:54 matt Exp $); #include opt_machdep.h #include opt_ddb.h @@ -721,7 +721,7 @@ am335x_memprobe(void) * if we detect if it has the wrong value. */ if (sdram_config == 0x41805332) - sdram_config -= __SHIFTOUT(1, SDRAM_CONFIG_RSIZE); + sdram_config -= __SHIFTIN(1, SDRAM_CONFIG_RSIZE); const u_int ibank = __SHIFTOUT(sdram_config, SDRAM_CONFIG_IBANK); const u_int rsize = 9 + __SHIFTOUT(sdram_config, SDRAM_CONFIG_RSIZE);
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Sun May 12 03:29:07 UTC 2013 Modified Files: src/games/fortune/datfiles: fortunes Log Message: Don't expect fairings. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.53 src/games/fortune/datfiles/fortunes:1.54 --- src/games/fortune/datfiles/fortunes:1.53 Mon Oct 22 14:33:27 2012 +++ src/games/fortune/datfiles/fortunes Sun May 12 03:29:07 2013 @@ -16172,3 +16172,6 @@ ya get 1 whacked with a service pack, now there's 63,005 bugs in the code!! % It's not very common in Crowthorne +% +1) Don't expect fairings. +2) If confused read #1.