Re: CVS commit: src/sys/arch/i386/i386
On Wed, Jan 18, 2012 at 09:34:39PM +, Matthias Drochner wrote: Module Name: src Committed By: drochner Date: Wed Jan 18 21:34:38 UTC 2012 Modified Files: src/sys/arch/i386/i386: mainbus.c Log Message: revert previous, the assumption all buses 1 and up must be subordinate to pci0 doesn't even hold on i386 -- there are server-class chipsets with multiple primary PCI buses, see arch/x86/pci/pchb.c for examples Matthias, was setting pba_sub = 255 causing material problems for someone, or are you concerned that lossage will eventually occur on certain server-class machines? I ask because, while setting pba_sub that way is far from ideal, it has worked well for me on a variety of machines, and if it has caused anybody any trouble, I don't remember them bringing it up with me. Dave -- David Young dyo...@pobox.comUrbana, IL(217) 721-9981
Re: CVS commit: src/sys/arch/i386/i386
dyo...@pobox.com said: was setting pba_sub = 255 causing material problems for someone, or are you concerned that lossage will eventually occur on certain server-class machines? No, this wasn't causing damage. I was tracking another problem which was incidentally triggered by another of your changes -- increased stack use lead to stack overflow on amd64 with a deep PCI hierarchy (a MicroTCA system). Just stumbled over this. But it is obviously wrong. If you think it should be in the public tree there should be at least a big fat comment telling that it is for testing purposes and nothing uses it really and it will be removed before it can cause damage. best regards Matthias Forschungszentrum Juelich GmbH 52425 Juelich Sitz der Gesellschaft: Juelich Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498 Vorsitzender des Aufsichtsrats: MinDir Dr. Karl Eugen Huthmacher Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender), Karsten Beneke (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt, Prof. Dr. Sebastian M. Schmidt Kennen Sie schon unsere app? http://www.fz-juelich.de/app
Re: CVS commit: src/sys/arch/i386/i386
On Wed, Jan 18, 2012 at 11:38:39PM +0100, Matthias Drochner wrote: dyo...@pobox.com said: was setting pba_sub = 255 causing material problems for someone, or are you concerned that lossage will eventually occur on certain server-class machines? No, this wasn't causing damage. I was tracking another problem which was incidentally triggered by another of your changes -- increased stack use lead to stack overflow on amd64 with a deep PCI hierarchy (a MicroTCA system). Tell me more about this. Just stumbled over this. But it is obviously wrong. If you think it should be in the public tree there should be at least a big fat comment telling that it is for testing purposes and nothing uses it really and it will be removed before it can cause damage. It does belong in the public tree. Please revert the reversion. I will add a big, fat comment. Dave -- David Young dyo...@pobox.comUrbana, IL(217) 721-9981
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Wed Jan 18 08:04:19 UTC 2012 Modified Files: src/sys/dev/pci: voodoofb.c voodoofbreg.h Log Message: do some mode validation - for now reject everything above 1680x1200 until I find out why these don't work ( 1680x1200 works but not 1920x1080 ). Also use sync polarity info from videomode instead of guessing. Finally, if there is no useble preferred mode, be a little smarter trying to find the next best mode. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/voodoofb.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/voodoofbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/voodoofb.c diff -u src/sys/dev/pci/voodoofb.c:1.32 src/sys/dev/pci/voodoofb.c:1.33 --- src/sys/dev/pci/voodoofb.c:1.32 Tue Jan 17 21:31:46 2012 +++ src/sys/dev/pci/voodoofb.c Wed Jan 18 08:04:18 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: voodoofb.c,v 1.32 2012/01/17 21:31:46 macallan Exp $ */ +/* $NetBSD: voodoofb.c,v 1.33 2012/01/18 08:04:18 macallan Exp $ */ /* * Copyright (c) 2005, 2006 Michael Lorenz @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.32 2012/01/17 21:31:46 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: voodoofb.c,v 1.33 2012/01/18 08:04:18 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -976,8 +976,9 @@ voodoofb_ioctl(void *v, void *vs, u_long sc-sc_cmap_blue[i]); } vcons_redraw_screen(ms); - } else + } else { voodoofb_drm_unmap(sc); + } } } return 0; @@ -1185,11 +1186,21 @@ voodoofb_setup_monitor(struct voodoofb_s vertical_blanking_start = vertical_display_enable_end; vertical_blanking_end = vertical_total; +#if 0 misc = 0x0f | (vm-hdisplay 400 ? 0xa0 : vm-hdisplay 480 ? 0x60 : vm-hdisplay 768 ? 0xe0 : 0x20); - +#else + misc = 0x2f; + if (vm-flags VID_NHSYNC) + misc |= HSYNC_NEG; + if (vm-flags VID_NVSYNC) + misc |= VSYNC_NEG; +#ifdef VOODOOFB_DEBUG + printf(misc: %02x\n, misc); +#endif +#endif mode-vr_seq[0] = 3; mode-vr_seq[1] = 1; mode-vr_seq[2] = 8; @@ -1247,7 +1258,7 @@ voodoofb_setup_monitor(struct voodoofb_s mode-vr_crtc[CRTC_VDISP_EXT] = (vertical_total 0x400) 10 | - (vertical_display_enable_end 0x400) 8 | + (vertical_display_enable_end 0x400) 8 | /* the manual is contradictory here */ (vertical_blanking_start 0x400) 6 | (vertical_blanking_end 0x400) 4; @@ -1438,6 +1449,16 @@ voodoofb_init(struct voodoofb_softc *sc) voodoofb_wait_idle(sc); } +#define MAX_CLOCK 25 /* all Voodoo3 should support that */ +#define MAX_HRES 1700 /* + * XXX in theory we can go higher but I + * couldn't get anything above 1680 x 1200 + * to work, so until I find out why it's + * disabled so people won't end up with a + * blank screen + */ +#define MODE_IS_VALID(m) (((m)-dot_clock = MAX_CLOCK) \ + ((m)-hdisplay MAX_HRES)) static void voodoofb_setup_i2c(struct voodoofb_softc *sc) { @@ -1482,20 +1503,33 @@ voodoofb_setup_i2c(struct voodoofb_softc * which we're not going to exhaust either in 8bit. */ if ((sc-sc_edid_info.edid_preferred_mode != NULL)) { -sc-sc_videomode = +struct videomode *m = sc-sc_edid_info.edid_preferred_mode; - } else { +if (MODE_IS_VALID(m)) { + sc-sc_videomode = m; +} else { + aprint_error_dev(sc-sc_dev, + unable to use preferred mode\n); +} + } + /* + * if we can't use the preferred mode go look for the + * best one we can support + */ + if (sc-sc_videomode == NULL) { int n; -struct videomode *m = sc-sc_edid_info.edid_modes; +struct videomode *m = + sc-sc_edid_info.edid_modes; sort_modes(sc-sc_edid_info.edid_modes, sc-sc_edid_info.edid_preferred_mode, sc-sc_edid_info.edid_nmodes); while ((sc-sc_videomode == NULL) (n sc-sc_edid_info.edid_nmodes)) { - if (m[n].dot_clock = 25) { + if (MODE_IS_VALID(m[n])) { sc-sc_videomode = m[n]; } + n++; } } } Index: src/sys/dev/pci/voodoofbreg.h diff -u src/sys/dev/pci/voodoofbreg.h:1.1 src/sys/dev/pci/voodoofbreg.h:1.2 --- src/sys/dev/pci/voodoofbreg.h:1.1 Tue Apr 11 16:11:07 2006 +++ src/sys/dev/pci/voodoofbreg.h Wed Jan 18 08:04:18 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: voodoofbreg.h,v 1.1 2006/04/11 16:11:07 macallan Exp $ */ +/* $NetBSD: voodoofbreg.h,v 1.2 2012/01/18 08:04:18 macallan Exp $ */ /* * Copyright 2005, 2006 by Michael Lorenz. @@ -256,6 +256,8 @@ #define SEQ_INDEX 0x3c4 #define SEQ_DATA 0x3c5 #define MISC_W 0x3c2 + #define VSYNC_NEG 0x80 + #define HSYNC_NEG 0x40 #define GRA_INDEX 0x3ce #define GRA_DATA 0x3cf #define ATT_IW 0x3c0
CVS commit: src
Module Name:src Committed By: skrll Date: Wed Jan 18 09:35:48 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: db_disasm.c db_interface.c db_machdep.c db_trace.c src/sys/arch/hppa/include: db_machdep.h types.h src/usr.sbin/crash: Makefile Log Message: Support crash(8) on hppa. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/hppa/db_disasm.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hppa/hppa/db_interface.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/hppa/db_machdep.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/hppa/db_trace.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/db_machdep.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/include/types.h cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/crash/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/db_disasm.c diff -u src/sys/arch/hppa/hppa/db_disasm.c:1.15 src/sys/arch/hppa/hppa/db_disasm.c:1.16 --- src/sys/arch/hppa/hppa/db_disasm.c:1.15 Tue Jan 17 12:32:52 2012 +++ src/sys/arch/hppa/hppa/db_disasm.c Wed Jan 18 09:35:48 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: db_disasm.c,v 1.15 2012/01/17 12:32:52 skrll Exp $ */ +/* $NetBSD: db_disasm.c,v 1.16 2012/01/18 09:35:48 skrll Exp $ */ /* $OpenBSD: db_disasm.c,v 1.9 2000/04/18 20:02:45 mickey Exp $ */ @@ -38,17 +38,21 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.15 2012/01/17 12:32:52 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.16 2012/01/18 09:35:48 skrll Exp $); #include sys/param.h #include sys/systm.h #include machine/db_machdep.h + #include ddb/db_access.h #include ddb/db_sym.h #include ddb/db_output.h #include ddb/db_interface.h +#ifndef _KERNEL +#include string.h +#endif /* IMPORTANT NOTE: * All modules using this header may assume that the datatype int is a @@ -1138,7 +1142,7 @@ static const struct inst instrs[] = { { FMPYADD,0, fmpy,fmpyaddDasm }, { FSTQX, 0, fstqx, lpkDasm }, { FSTQS, 0, fstqs, lpkDasm }, - {0} + { 0, 0, 0, 0, 0, , NULL} }; @@ -1160,70 +1164,70 @@ static const struct inst *so_deps [0x08] #define ILLEG NULL #define NENTS(a) (sizeof(a)/sizeof(a[0])-1) static struct majoropcode majopcs[NMAJOPCS] = { - { so_sysop, NENTS(so_sysop) }, /* 00 */ - { so_mmuop, NENTS(so_mmuop) }, /* 01 */ - { so_arith, NENTS(so_arith) }, /* 02 */ - { so_loads, NENTS(so_loads) }, /* 03 */ - { ILLEG, 1 }, /* 04 */ - { ILLEG, 1 }, /* 05 */ - { ILLEG, 1 }, /* 06 */ - { ILLEG, 1 }, /* 07 */ - { ILLEG, 1 }, /* 08 */ - { so_cldw , NENTS(so_cldw ) }, /* 09 */ - { ILLEG, 1 }, /* 0A */ - { so_cldd , NENTS(so_cldd ) }, /* 0B */ - { ILLEG, 1 }, /* 0C */ - { ILLEG, 1 }, /* 0D */ - { so_float, NENTS(so_float) }, /* 0E */ - { so_fstq , NENTS(so_fstq ) }, /* 0F */ - { ILLEG, 1 }, /* 10 */ - { ILLEG, 1 }, /* 11 */ - { ILLEG, 1 }, /* 12 */ - { ILLEG, 1 }, /* 13 */ - { ILLEG, 1 }, /* 14 */ - { ILLEG, 1 }, /* 15 */ - { ILLEG, 1 }, /* 16 */ - { ILLEG, 1 }, /* 17 */ - { ILLEG, 1 }, /* 18 */ - { ILLEG, 1 }, /* 19 */ - { ILLEG, 1 }, /* 1A */ - { ILLEG, 1 }, /* 1B */ - { ILLEG, 1 }, /* 1C */ - { ILLEG, 1 }, /* 1D */ - { ILLEG, 1 }, /* 1E */ - { ILLEG, 1 }, /* 1F */ - { ILLEG, 1 }, /* 20 */ - { ILLEG, 1 }, /* 21 */ - { ILLEG, 1 }, /* 22 */ - { ILLEG, 1 }, /* 23 */ - { ILLEG, 1 }, /* 24 */ - { so_subi , NENTS(so_subi ) }, /* 25 */ - { ILLEG, 1 }, /* 26 */ - { ILLEG, 1 }, /* 27 */ - { ILLEG, 1 }, /* 28 */ - { ILLEG, 1 }, /* 29 */ - { ILLEG, 1 }, /* 2A */ - { ILLEG, 1 }, /* 2B */ - { so_addit, NENTS(so_addit) }, /* 2C */ - { so_addi , NENTS(so_addi ) }, /* 2D */ - { ILLEG, 1 }, /* 2E */ - { ILLEG, 1 }, /* 2F */ - { ILLEG, 1 }, /* 30 */ - { ILLEG, 1 }, /* 31 */ - { ILLEG, 1 }, /* 32 */ - { ILLEG, 1 }, /* 33 */ - { so_shext, NENTS(so_shext) }, /* 34 */ - { so_deps , NENTS(so_deps ) }, /* 35 */ - { ILLEG, 1 }, /* 36 */ - { ILLEG, 1 }, /* 37 */ - { ILLEG, 1 }, /* 38 */ - { ILLEG, 1 }, /* 39 */ - { so_ebran, NENTS(so_ebran) }, /* 3A */ - { ILLEG, 1 }, /* 3B */ - { ILLEG, 1 }, /* 3C */ - { ILLEG, 1 }, /* 3D */ - { ILLEG, 1 }, /* 3E */ - { ILLEG, 1 }, /* 3F */ + { so_sysop, NENTS(so_sysop), 0, 0 }, /* 00 */ + { so_mmuop, NENTS(so_mmuop), 0, 0 }, /* 01 */ + { so_arith, NENTS(so_arith), 0, 0 }, /* 02 */ + { so_loads, NENTS(so_loads), 0, 0 }, /* 03 */ + { ILLEG, 1, 0, 0 }, /* 04 */ + { ILLEG, 1, 0, 0 }, /* 05 */ + { ILLEG, 1, 0, 0 }, /* 06 */ + { ILLEG, 1, 0, 0 }, /* 07 */ + { ILLEG, 1, 0, 0 }, /* 08 */ + { so_cldw , NENTS(so_cldw ), 0, 0 }, /* 09 */ + { ILLEG, 1, 0, 0 }, /* 0A */ + { so_cldd , NENTS(so_cldd ), 0, 0 }, /* 0B */ + { ILLEG, 1, 0, 0 }, /* 0C */ + { ILLEG, 1, 0, 0 }, /* 0D */ + { so_float, NENTS(so_float), 0, 0 }, /* 0E */ + { so_fstq , NENTS(so_fstq ), 0, 0 }, /* 0F */ + { ILLEG, 1, 0, 0 }, /* 10 */ + { ILLEG, 1, 0, 0 }, /* 11 */ + { ILLEG, 1, 0, 0 }, /* 12 */ + { ILLEG, 1, 0, 0 }, /* 13 */ + { ILLEG, 1, 0, 0 }, /* 14 */ + { ILLEG, 1, 0, 0 }, /* 15 */
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Wed Jan 18 12:39:45 UTC 2012 Modified Files: src/sys/arch/usermode/usermode: trap.c Log Message: Another step towards unification of the signal handers: separate the printing of details usefull for debugging / porting from the main code. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/trap.c diff -u src/sys/arch/usermode/usermode/trap.c:1.59 src/sys/arch/usermode/usermode/trap.c:1.60 --- src/sys/arch/usermode/usermode/trap.c:1.59 Tue Jan 17 20:50:38 2012 +++ src/sys/arch/usermode/usermode/trap.c Wed Jan 18 12:39:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.59 2012/01/17 20:50:38 reinoud Exp $ */ +/* $NetBSD: trap.c,v 1.60 2012/01/18 12:39:45 reinoud Exp $ */ /*- * Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.59 2012/01/17 20:50:38 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.60 2012/01/18 12:39:45 reinoud Exp $); #include sys/types.h #include sys/param.h @@ -146,22 +146,15 @@ userret(struct lwp *l) } -/* signal handler switching to a pagefault context */ +#ifdef DEBUG +/* + * Uncomment the following if you want to receive information about what + * triggered the fault. Mainly for debugging and porting purposes + */ static void -mem_access_handler(int sig, siginfo_t *info, void *ctx) +print_mem_access_siginfo(int sig, siginfo_t *info, void *ctx, + vaddr_t pc, vaddr_t va, vaddr_t sp) { - ucontext_t *ucp = ctx; - struct lwp *l; - struct pcb *pcb; - vaddr_t va, sp, pc, fp; - int from_userland; - - assert((info-si_signo == SIGSEGV) || (info-si_signo == SIGBUS)); - - if (info-si_code == SI_NOINFO) - panic(received signal %d with no info, - info-si_signo); - #if 0 thunk_printf_debug(SIGSEGV or SIGBUS!\n); thunk_printf_debug(\tsi_signo = %d\n, info-si_signo); @@ -181,6 +174,75 @@ mem_access_handler(int sig, siginfo_t *i thunk_printf_debug(\tsi_trap = %d\n, info-si_trap); #endif +#if 0 + printf(memaccess error, pc %p, va %p, + sys_stack %p, sp %p, stack top %p\n, + (void *) pc, (void *) va, + (void *) pcb-sys_stack, (void *) sp, + (void *) pcb-sys_stack_top); +#endif +} + +/* + * Uncomment the following if you want to receive information about what + * triggered the fault. Mainly for debugging and porting purposes + */ +static void +print_illegal_instruction_siginfo(int sig, siginfo_t *info, void *ctx, + vaddr_t pc, vaddr_t va, vaddr_t sp) +{ +#if 0 + thunk_printf(SIGILL!\n); + thunk_printf(\tsi_signo = %d\n, info-si_signo); + thunk_printf(\tsi_errno = %d\n, info-si_errno); + thunk_printf(\tsi_code = %d\n, info-si_code); + if (info-si_code == ILL_ILLOPC) + thunk_printf(\t\tIllegal opcode); + if (info-si_code == ILL_ILLOPN) + thunk_printf(\t\tIllegal operand); + if (info-si_code == ILL_ILLADR) + thunk_printf(\t\tIllegal addressing mode); + if (info-si_code == ILL_ILLTRP) + thunk_printf(\t\tIllegal trap); + if (info-si_code == ILL_PRVOPC) + thunk_printf(\t\tPrivileged opcode); + if (info-si_code == ILL_PRVREG) + thunk_printf(\t\tPrivileged register); + if (info-si_code == ILL_COPROC) + thunk_printf(\t\tCoprocessor error); + if (info-si_code == ILL_BADSTK) + thunk_printf(\t\tInternal stack error); + thunk_printf(\tsi_addr = %p\n, info-si_addr); + thunk_printf(\tsi_trap = %d\n, info-si_trap); + + thunk_printf(%p : , info-si_addr); + for (int i = 0; i 10; i++) + thunk_printf(%02x , *((uint8_t *) info-si_addr + i)); + thunk_printf(\n); +#endif +} +#else /* DEBUG */ +#define print_mem_access_siginfo(s, i, c, p, v, sp) +#define print_illegal_instruction_siginfo(s, i, c, p, v, sp) +#endif /* DEBUG */ + + +/* signal handler switching to a pagefault context */ +static void +mem_access_handler(int sig, siginfo_t *info, void *ctx) +{ + ucontext_t *ucp = ctx; + struct lwp *l; + struct pcb *pcb; + vaddr_t va, sp, pc, fp; + int from_userland; + + assert((info-si_signo == SIGSEGV) || (info-si_signo == SIGBUS)); + + if (info-si_code == SI_NOINFO) + panic(received signal %d with no info, + info-si_signo); + l = curlwp; pcb = lwp_getpcb(l); @@ -194,13 +256,7 @@ mem_access_handler(int sig, siginfo_t *i /* setup for pagefault context */ sp = md_get_sp(ctx); -#if 0 - printf(memaccess error, pc %p, va %p, - sys_stack %p, sp %p, stack top %p\n, - (void *) pc, (void *) va, - (void *) pcb-sys_stack, (void *) sp, - (void *) pcb-sys_stack_top); -#endif + print_mem_access_siginfo(sig, info, ctx, pc, va, sp); /* if we're running on a stack of our own, use the system stack */ from_userland = 0; @@ -246,35 +302,6 @@ illegal_instruction_handler(int sig, sig int from_userland; assert(info-si_signo == SIGILL); -#if 0 - thunk_printf(SIGILL!\n); - thunk_printf(\tsi_signo =
CVS commit: src/lib/libc/locale
Module Name:src Committed By: joerg Date: Wed Jan 18 14:22:28 UTC 2012 Modified Files: src/lib/libc/locale: runetype_misc.h Log Message: _runetype_from_ctype is unused To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/runetype_misc.h 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/locale/runetype_misc.h diff -u src/lib/libc/locale/runetype_misc.h:1.2 src/lib/libc/locale/runetype_misc.h:1.3 --- src/lib/libc/locale/runetype_misc.h:1.2 Tue Dec 14 02:28:57 2010 +++ src/lib/libc/locale/runetype_misc.h Wed Jan 18 14:22:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: runetype_misc.h,v 1.2 2010/12/14 02:28:57 joerg Exp $ */ +/* $NetBSD: runetype_misc.h,v 1.3 2012/01/18 14:22:27 joerg Exp $ */ /*- * Copyright (c) 1993 @@ -79,52 +79,4 @@ _runetype_to_ctype(_RuneType bits) return ret; } -static __inline _RuneType -_runetype_from_ctype(int bits, int ch) -{ -_RuneType ret; - - /* - * TWEAKS! - * - old locale file declarations do not have proper _B - * in many cases. - * - isprint() declaration in ctype.h incorrectly uses _B. - * _B means isprint but !isgraph, not isblank with the - * declaration. - * - _X and _RUNETYPE_X have negligible difference in meaning. - * - we don't set digit value, fearing that it would be - * too much of hardcoding. we may need to revisit it. - */ - - ret = (_RuneType)0; - if (bits _CTYPE_U) - ret |= _RUNETYPE_U; - if (bits _CTYPE_L) - ret |= _RUNETYPE_L; - if (bits _CTYPE_N) - ret |= _RUNETYPE_D; - if (bits _CTYPE_S) - ret |= _RUNETYPE_S; - if (bits _CTYPE_P) - ret |= _RUNETYPE_P; - if (bits _CTYPE_C) - ret |= _RUNETYPE_C; - /* derived flag bits, duplicate of ctype.h */ - if (bits (_CTYPE_U|_CTYPE_L)) - ret |= _RUNETYPE_A; - if (bits (_CTYPE_N|_CTYPE_X)) - ret |= _RUNETYPE_X; - if (bits (_CTYPE_P|_CTYPE_U|_CTYPE_L|_CTYPE_N)) - ret |= _RUNETYPE_G; - /* we don't really trust _B in the file. see above. */ - if (bits _CTYPE_B) - ret |= _RUNETYPE_B; - if ((bits (_CTYPE_P|_CTYPE_U|_CTYPE_L|_CTYPE_N|_CTYPE_B)) || - ch == ' ') - ret |= (_RUNETYPE_R | _RUNETYPE_SW1); - if (ch == ' ' || ch == '\t') - ret |= _RUNETYPE_B; - return ret; -} - #endif /* !_RUNETYPE_MISC_H_ */
CVS commit: src/external/bsd/llvm/bin/clang
Module Name:src Committed By: joerg Date: Wed Jan 18 16:53:09 UTC 2012 Modified Files: src/external/bsd/llvm/bin/clang: Makefile Log Message: Make sure to link the MIPS assembler parser in. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/bsd/llvm/bin/clang/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/llvm/bin/clang/Makefile diff -u src/external/bsd/llvm/bin/clang/Makefile:1.16 src/external/bsd/llvm/bin/clang/Makefile:1.17 --- src/external/bsd/llvm/bin/clang/Makefile:1.16 Thu Nov 3 17:52:53 2011 +++ src/external/bsd/llvm/bin/clang/Makefile Wed Jan 18 16:53:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2011/11/03 17:52:53 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2012/01/18 16:53:09 joerg Exp $ PROG_CXX= clang NOMAN= yes @@ -49,6 +49,7 @@ LLVM_LIBS+= \ MipsTargetInfo \ MipsMCTargetDesc \ MipsAsmPrinter \ + MipsAsmParser \ PowerPCCodeGen \ PowerPCTargetInfo \ PowerPCMCTargetDesc \
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: riz Date: Wed Jan 18 17:32:43 UTC 2012 Modified Files: src/distrib/sets/lists/comp: md.amd64 mi Log Message: Setlist fix for MKDEBUGLIB=yes on amd64. Probably needs a similar fix on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.1725 -r1.1726 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.149 src/distrib/sets/lists/comp/md.amd64:1.150 --- src/distrib/sets/lists/comp/md.amd64:1.149 Wed Jan 11 23:24:46 2012 +++ src/distrib/sets/lists/comp/md.amd64 Wed Jan 18 17:32:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.149 2012/01/11 23:24:46 joerg Exp $ +# $NetBSD: md.amd64,v 1.150 2012/01/18 17:32:41 riz Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -969,6 +969,7 @@ ./usr/lib/i386/libtermlib_pic.a comp-c-piclib compat,pic ./usr/lib/i386/libtre.acomp-c-lib compat ./usr/lib/i386/libtre.so comp-sys-shlib compat,pic +./usr/lib/i386/libtre_g.a comp-c-proflib compat,debuglib ./usr/lib/i386/libtre_p.a comp-c-proflib compat,profile ./usr/lib/i386/libtre_pic.a comp-c-piclib compat,pic ./usr/lib/i386/libukfs.a comp-c-lib compat Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1725 src/distrib/sets/lists/comp/mi:1.1726 --- src/distrib/sets/lists/comp/mi:1.1725 Mon Jan 9 15:19:44 2012 +++ src/distrib/sets/lists/comp/mi Wed Jan 18 17:32:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1725 2012/01/09 15:19:44 dholland Exp $ +# $NetBSD: mi,v 1.1726 2012/01/18 17:32:41 riz Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3299,6 +3299,7 @@ ./usr/lib/libtermlib.acomp-c-lib ./usr/lib/libtermlib_p.a comp-c-proflib profile ./usr/lib/libtre.acomp-c-lib +./usr/lib/libtre_g.acomp-c-proflib debuglib ./usr/lib/libtre_p.acomp-c-proflib profile ./usr/lib/libukfs.acomp-c-lib ./usr/lib/libukfs_g.a-unknown- debuglib
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Wed Jan 18 19:17:02 UTC 2012 Modified Files: src/sys/arch/usermode/dev: cpu.c Log Message: Create an atomic switchto() that has SIGALRM and SIGIO signals blocked that might otherwise disrupt the setting of curlwp to match the lwp context. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/usermode/dev/cpu.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/usermode/dev/cpu.c diff -u src/sys/arch/usermode/dev/cpu.c:1.67 src/sys/arch/usermode/dev/cpu.c:1.68 --- src/sys/arch/usermode/dev/cpu.c:1.67 Sun Jan 15 10:45:03 2012 +++ src/sys/arch/usermode/dev/cpu.c Wed Jan 18 19:17:02 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.67 2012/01/15 10:45:03 jmcneill Exp $ */ +/* $NetBSD: cpu.c,v 1.68 2012/01/18 19:17:02 reinoud Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca @@ -30,7 +30,7 @@ #include opt_hz.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.67 2012/01/15 10:45:03 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.68 2012/01/18 19:17:02 reinoud Exp $); #include sys/param.h #include sys/conf.h @@ -78,6 +78,9 @@ char cpu_model[48] = virtual processor typedef struct cpu_softc { device_t sc_dev; struct cpu_info *sc_ci; + + ucontext_t sc_ucp; + uint8_t sc_ucp_stack[PAGE_SIZE]; } cpu_softc_t; @@ -108,8 +111,16 @@ cpu_attach(device_t parent, device_t sel aprint_naive(\n); aprint_normal(\n); + cpu_info_primary.ci_dev = self; sc-sc_dev = self; sc-sc_ci = cpu_info_primary; + + thunk_getcontext(sc-sc_ucp); + sc-sc_ucp.uc_stack.ss_sp = sc-sc_ucp_stack; + sc-sc_ucp.uc_stack.ss_size = PAGE_SIZE - sizeof(register_t); + sc-sc_ucp.uc_flags = _UC_STACK | _UC_CPU | _UC_SIGMASK; + thunk_sigaddset(sc-sc_ucp.uc_sigmask, SIGALRM); + thunk_sigaddset(sc-sc_ucp.uc_sigmask, SIGIO); } void @@ -176,12 +187,34 @@ cpu_need_proftick(struct lwp *l) { } +static +void +cpu_switchto_atomic(lwp_t *oldlwp, lwp_t *newlwp) +{ + struct pcb *oldpcb = oldlwp ? lwp_getpcb(oldlwp) : NULL; + struct pcb *newpcb = lwp_getpcb(newlwp); + struct cpu_info *ci = curcpu(); + + ci-ci_stash = oldlwp; + + if (oldpcb) + oldpcb-pcb_errno = thunk_geterrno(); + + thunk_seterrno(newpcb-pcb_errno); + + curlwp = newlwp; + if (thunk_setcontext(newpcb-pcb_ucp)) + panic(setcontext failed); + /* not reached */ +} + lwp_t * cpu_switchto(lwp_t *oldlwp, lwp_t *newlwp, bool returning) { struct pcb *oldpcb = oldlwp ? lwp_getpcb(oldlwp) : NULL; struct pcb *newpcb = lwp_getpcb(newlwp); struct cpu_info *ci = curcpu(); + cpu_softc_t *sc = device_private(ci-ci_dev); #ifdef CPU_DEBUG thunk_printf_debug(cpu_switchto [%s,pid=%d,lid=%d] - [%s,pid=%d,lid=%d]\n, @@ -207,19 +240,16 @@ cpu_switchto(lwp_t *oldlwp, lwp_t *newlw } #endif /* !CPU_DEBUG */ - ci-ci_stash = oldlwp; - - if (oldpcb) { - oldpcb-pcb_errno = thunk_geterrno(); - thunk_seterrno(newpcb-pcb_errno); - curlwp = newlwp; - if (thunk_swapcontext(oldpcb-pcb_ucp, newpcb-pcb_ucp)) - panic(swapcontext failed); + /* create atomic switcher */ + thunk_makecontext(sc-sc_ucp, (void (*)(void)) cpu_switchto_atomic, + 2, oldlwp, newlwp, NULL); + + if (!oldpcb) { + thunk_setcontext(sc-sc_ucp); + /* never returns */ } else { - thunk_seterrno(newpcb-pcb_errno); - curlwp = newlwp; - if (thunk_setcontext(newpcb-pcb_ucp)) - panic(setcontext failed); + thunk_swapcontext(oldpcb-pcb_ucp, sc-sc_ucp); + /* returns here */ } #ifdef CPU_DEBUG @@ -344,7 +374,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp /* get l2 its own stack */ pcb2-pcb_ucp.uc_stack.ss_sp = pcb2-sys_stack; pcb2-pcb_ucp.uc_stack.ss_size = pcb2-sys_stack_top - pcb2-sys_stack; - pcb2-pcb_ucp.uc_flags = _UC_STACK | _UC_CPU; + pcb2-pcb_ucp.uc_flags = _UC_STACK | _UC_CPU | _UC_SIGMASK; pcb2-pcb_ucp.uc_link = pcb2-pcb_userret_ucp; thunk_makecontext(pcb2-pcb_ucp, (void (*)(void)) cpu_lwp_trampoline, @@ -382,6 +412,7 @@ cpu_startup(void) /* init lwp0 */ memset(lwp0pcb, 0, sizeof(lwp0pcb)); thunk_getcontext(lwp0pcb.pcb_ucp); + lwp0pcb.pcb_ucp.uc_flags = _UC_STACK | _UC_CPU | _UC_SIGMASK; uvm_lwp_setuarea(lwp0, (vaddr_t) lwp0pcb); memcpy(lwp0pcb.pcb_userret_ucp, lwp0pcb.pcb_ucp, sizeof(ucontext_t));
CVS commit: src/crypto/external/bsd/openssl/dist/ssl
Module Name:src Committed By: drochner Date: Wed Jan 18 20:08:50 UTC 2012 Modified Files: src/crypto/external/bsd/openssl/dist/ssl: d1_pkt.c Log Message: pull in rev.22050 from upstream CVS, following secadv_20120118.txt: Fix for DTLS DoS issue introduced by fix for CVE-2011-4108 (CVE-2012-0050) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c diff -u src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c:1.2 src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c:1.3 --- src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c:1.2 Thu Jan 5 17:32:02 2012 +++ src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c Wed Jan 18 20:08:49 2012 @@ -376,6 +376,7 @@ dtls1_process_record(SSL *s) unsigned int mac_size; unsigned char md[EVP_MAX_MD_SIZE]; int decryption_failed_or_bad_record_mac = 0; + unsigned char *mac = NULL; rr= (s-s3-rrec); @@ -450,19 +451,15 @@ printf(\n); #endif } /* check the MAC for rr-input (it's in mac_size bytes at the tail) */ - if (rr-length mac_size) + if (rr-length = mac_size) { -#if 0 /* OK only for stream ciphers */ - al=SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_LENGTH_TOO_SHORT); - goto f_err; -#else - decryption_failed_or_bad_record_mac = 1; -#endif + rr-length -= mac_size; + mac = rr-data[rr-length]; } - rr-length-=mac_size; + else + rr-length = 0; i=s-method-ssl3_enc-mac(s,md,0); - if (i 0 || memcmp(md,(rr-data[rr-length]),mac_size) != 0) + if (i 0 || mac == NULL || memcmp(md, mac, mac_size) != 0) { decryption_failed_or_bad_record_mac = 1; }
CVS commit: src/sys/conf
Module Name:src Committed By: drochner Date: Wed Jan 18 20:37:20 UTC 2012 Modified Files: src/sys/conf: files Log Message: get the logics straight: CPU_UCODE requires firmload as a dependency To generate a diff of this commit: cvs rdiff -u -r1.1036 -r1.1037 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1036 src/sys/conf/files:1.1037 --- src/sys/conf/files:1.1036 Sat Jan 14 04:18:49 2012 +++ src/sys/conf/files Wed Jan 18 20:37:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1036 2012/01/14 04:18:49 pgoyette Exp $ +# $NetBSD: files,v 1.1037 2012/01/18 20:37:20 drochner Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -58,7 +58,6 @@ defparam opt_dump.h DUMP_ON_PANIC defflag opt_callout.h CALLWHEEL_STATS defflagCPU_IN_CKSUM -defflagCPU_UCODE defflag opt_dtrace.h KDTRACE_HOOKS @@ -1355,6 +1354,7 @@ file kern/kern_drvctl.c drvctl needs-f # cpu control defpseudo cpuctl +defflagCPU_UCODE: firmload # pass-to-userspace transporter defpseudo putter @@ -1428,7 +1428,7 @@ file dev/dkwedge/dk.c file dev/dkwedge/dkwedge_bsdlabel.c dkwedge_method_bsdlabel file dev/dkwedge/dkwedge_gpt.c dkwedge_method_gpt file dev/dkwedge/dkwedge_mbr.c dkwedge_method_mbr -file dev/firmload.c firmload | cpu_ucode needs-flag +file dev/firmload.c firmload needs-flag file dev/fss.c fss file dev/keylock.c keylock file dev/lockstat.c lockstat needs-flag
CVS commit: src
Module Name:src Committed By: bouyer Date: Wed Jan 18 20:51:23 UTC 2012 Modified Files: src/distrib/sets/lists/tests: mi src/tests/fs/ffs: Makefile quotas_common.sh t_clearquota.sh t_getquota.sh t_miscquota.sh t_quotalimit.sh t_setquota.sh Added Files: src/tests/fs/ffs: ffs_common.sh h_ffs_server.c Removed Files: src/tests/fs/ffs: h_quota2_server.c Log Message: Make parts of the quota tests useable for more than quotas: - rename h_quota2_server to h_ffs_server, there's nothing about quotas in there. - extract non-quota parts of quotas_common.sh to ffs_common.sh To generate a diff of this commit: cvs rdiff -u -r1.433 -r1.434 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.16 -r1.17 src/tests/fs/ffs/Makefile cvs rdiff -u -r0 -r1.1 src/tests/fs/ffs/ffs_common.sh \ src/tests/fs/ffs/h_ffs_server.c cvs rdiff -u -r1.2 -r0 src/tests/fs/ffs/h_quota2_server.c cvs rdiff -u -r1.3 -r1.4 src/tests/fs/ffs/quotas_common.sh \ src/tests/fs/ffs/t_clearquota.sh src/tests/fs/ffs/t_getquota.sh \ src/tests/fs/ffs/t_miscquota.sh src/tests/fs/ffs/t_quotalimit.sh \ src/tests/fs/ffs/t_setquota.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.433 src/distrib/sets/lists/tests/mi:1.434 --- src/distrib/sets/lists/tests/mi:1.433 Tue Dec 27 17:13:10 2011 +++ src/distrib/sets/lists/tests/mi Wed Jan 18 20:51:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.433 2011/12/27 17:13:10 pgoyette Exp $ +# $NetBSD: mi,v 1.434 2012/01/18 20:51:23 bouyer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -227,7 +227,8 @@ ./usr/libdata/debug/usr/tests/dev/sysmon tests-fs-debug ./usr/libdata/debug/usr/tests/dev/sysmon/t_swwdog.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug -./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_server.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/h_ffs_server.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_server.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/fs/ffs/h_quota2_tests.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_fifos.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_mount.debug tests-fs-debug debug,atf @@ -1410,7 +1411,8 @@ ./usr/tests/fs/h_funcs.subr tests-fs-tests atf ./usr/tests/fs/ffstests-fs-tests ./usr/tests/fs/ffs/Atffile tests-fs-tests atf -./usr/tests/fs/ffs/h_quota2_server tests-fs-tests atf +./usr/tests/fs/ffs/h_ffs_server tests-fs-tests atf +./usr/tests/fs/ffs/h_quota2_server tests-obsolete obsolete ./usr/tests/fs/ffs/h_quota2_tests tests-fs-tests atf ./usr/tests/fs/ffs/rump_edquota tests-obsolete obsolete ./usr/tests/fs/ffs/rump_quota tests-obsolete obsolete Index: src/tests/fs/ffs/Makefile diff -u src/tests/fs/ffs/Makefile:1.16 src/tests/fs/ffs/Makefile:1.17 --- src/tests/fs/ffs/Makefile:1.16 Wed Mar 9 20:13:47 2011 +++ src/tests/fs/ffs/Makefile Wed Jan 18 20:51:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2011/03/09 20:13:47 tron Exp $ +# $NetBSD: Makefile,v 1.17 2012/01/18 20:51:23 bouyer Exp $ # .include bsd.own.mk @@ -6,10 +6,10 @@ TESTSDIR= ${TESTSBASE}/fs/ffs WARNS= 4 -PROGS= h_quota2_server h_quota2_tests -SRCS.h_quota2_server= h_quota2_server.c -MAN.h_quota2_server= # empty -BINDIR.h_quota2_server= ${TESTSDIR} +PROGS= h_ffs_server h_quota2_tests +SRCS.h_ffs_server= h_ffs_server.c +MAN.h_ffs_server= # empty +BINDIR.h_ffs_server= ${TESTSDIR} SRCS.h_quota2_tests= h_quota2_tests.c MAN.h_quota2_tests= # empty @@ -17,7 +17,7 @@ BINDIR.h_quota2_tests= ${TESTSDIR} .for name in t_getquota t_setquota t_quotalimit t_clearquota t_miscquota TESTS_SH+= ${name} -TESTS_SH_SRC_${name}= quotas_common.sh ${name}.sh +TESTS_SH_SRC_${name}= ffs_common.sh quotas_common.sh ${name}.sh .endfor TESTS_C+= t_fifos Index: src/tests/fs/ffs/quotas_common.sh diff -u src/tests/fs/ffs/quotas_common.sh:1.3 src/tests/fs/ffs/quotas_common.sh:1.4 --- src/tests/fs/ffs/quotas_common.sh:1.3 Sat Mar 12 13:43:58 2011 +++ src/tests/fs/ffs/quotas_common.sh Wed Jan 18 20:51:23 2012 @@ -1,29 +1,6 @@ -# $NetBSD: quotas_common.sh,v 1.3 2011/03/12 13:43:58 bouyer Exp $ +# $NetBSD: quotas_common.sh,v 1.4 2012/01/18 20:51:23 bouyer Exp $ -create_with_quotas() -{ - local endian=$1; shift - local vers=$1; shift - local type=$1; shift - local op; - if [ ${type} = both ]; then - op=-q user -q group - else - op=-q ${type} - fi - atf_check -o ignore -e ignore newfs ${op} \ - -B ${endian} -O ${vers} -s 4000 -F ${IMG} -} - -create_with_quotas_server() -{ - local sarg=$1; shift - create_with_quotas $* - atf_check -o ignore -e ignore $(atf_get_srcdir)/h_quota2_server \ - ${sarg} ${IMG} ${RUMP_SERVER} -} - -rump_shutdown()
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: drochner Date: Wed Jan 18 21:34:38 UTC 2012 Modified Files: src/sys/arch/i386/i386: mainbus.c Log Message: revert previous, the assumption all buses 1 and up must be subordinate to pci0 doesn't even hold on i386 -- there are server-class chipsets with multiple primary PCI buses, see arch/x86/pci/pchb.c for examples To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/arch/i386/i386/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/mainbus.c diff -u src/sys/arch/i386/i386/mainbus.c:1.92 src/sys/arch/i386/i386/mainbus.c:1.93 --- src/sys/arch/i386/i386/mainbus.c:1.92 Fri Oct 21 21:35:28 2011 +++ src/sys/arch/i386/i386/mainbus.c Wed Jan 18 21:34:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.92 2011/10/21 21:35:28 dyoung Exp $ */ +/* $NetBSD: mainbus.c,v 1.93 2012/01/18 21:34:38 drochner Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.92 2011/10/21 21:35:28 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.93 2012/01/18 21:34:38 drochner Exp $); #include sys/param.h #include sys/systm.h @@ -406,7 +406,6 @@ mainbus_rescan(device_t self, const char mba.mba_pba.pba_pc = NULL; mba.mba_pba.pba_flags = pci_bus_flags(); mba.mba_pba.pba_bus = 0; - mba.mba_pba.pba_sub = 255; mba.mba_pba.pba_bridgetag = NULL; #if NACPICA 0 defined(ACPI_SCANPCI) if (npcibus == 0 sc-sc_mpacpi_active)
CVS commit: src/sys/arch/zaurus/stand/zboot
Module Name:src Committed By: nonaka Date: Wed Jan 18 23:12:22 UTC 2012 Modified Files: src/sys/arch/zaurus/stand/zboot: Makefile boot.c boot.h bootmenu.c conf.c devopen.c diskprobe.c pathnames.h unixdev.c unixdev.h version Added Files: src/sys/arch/zaurus/stand/zboot: pathfs.c pathfs.h Log Message: Support to read the kernel from local file system. ex. boot path:/mnt/card/netbsd To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/stand/zboot/Makefile cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/stand/zboot/boot.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/stand/zboot/boot.h \ src/sys/arch/zaurus/stand/zboot/bootmenu.c \ src/sys/arch/zaurus/stand/zboot/conf.c \ src/sys/arch/zaurus/stand/zboot/devopen.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/stand/zboot/diskprobe.c \ src/sys/arch/zaurus/stand/zboot/pathnames.h \ src/sys/arch/zaurus/stand/zboot/unixdev.c \ src/sys/arch/zaurus/stand/zboot/unixdev.h \ src/sys/arch/zaurus/stand/zboot/version cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/stand/zboot/pathfs.c \ src/sys/arch/zaurus/stand/zboot/pathfs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/zaurus/stand/zboot/Makefile diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.7 src/sys/arch/zaurus/stand/zboot/Makefile:1.8 --- src/sys/arch/zaurus/stand/zboot/Makefile:1.7 Sun Dec 25 06:09:10 2011 +++ src/sys/arch/zaurus/stand/zboot/Makefile Wed Jan 18 23:12:21 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/12/25 06:09:10 tsutsui Exp $ +# $NetBSD: Makefile,v 1.8 2012/01/18 23:12:21 nonaka Exp $ PROG= zboot @@ -8,6 +8,7 @@ SRCS= crt0.c SRCS+= boot.c bootinfo.c bootmenu.c conf.c devopen.c diskprobe.c SRCS+= loadfile_zboot.c SRCS+= getsecs.c termios.c unixcons.c unixdev.c unixsys.S +SRCS+= pathfs.c NOMAN= # defined @@ -33,7 +34,7 @@ NEWVERSWHAT?= Boot VERSIONFILE?= ${.CURDIR}/version ### find out what to use for libkern -KERN_AS= library +KERN_AS= library .include ${S}/lib/libkern/Makefile.inc LIBKERN= ${KERNLIB} @@ -48,7 +49,7 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE .include ${S}/lib/libsa/Makefile.inc LIBSA= ${SALIB} -${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} +${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${VERSIONFILE} ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == yes :?:-D} \ ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT} ${CC} -c vers.c Index: src/sys/arch/zaurus/stand/zboot/boot.c diff -u src/sys/arch/zaurus/stand/zboot/boot.c:1.4 src/sys/arch/zaurus/stand/zboot/boot.c:1.5 --- src/sys/arch/zaurus/stand/zboot/boot.c:1.4 Sun Dec 25 06:09:10 2011 +++ src/sys/arch/zaurus/stand/zboot/boot.c Wed Jan 18 23:12:21 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: boot.c,v 1.4 2011/12/25 06:09:10 tsutsui Exp $ */ +/* $NetBSD: boot.c,v 1.5 2012/01/18 23:12:21 nonaka Exp $ */ /* * Copyright (c) 2009 NONAKA Kimihiro non...@netbsd.org @@ -53,6 +53,7 @@ const char *default_filename; int default_timeout = 5; static char probed_disks[256]; +static char bootconfpath[1024]; static void bootcmd_help(char *); static void bootcmd_ls(char *); @@ -196,7 +197,10 @@ boot(dev_t bootdev) diskprobe(probed_disks, sizeof(probed_disks)); - parsebootconf(_PATH_BOOTCONF); + snprintf(bootconfpath, sizeof(bootconfpath), %s%d%c:%s, + default_devname, default_unit, 'a' + default_partition, + _PATH_BOOTCONF); + parsebootconf(bootconfpath); #ifdef SUPPORT_CONSDEV /* @@ -296,8 +300,9 @@ bootcmd_help(char *arg) { printf(commands are:\n - boot [xdNx:][filename] [-acdqsv]\n - (ex. \hd0a:netbsd.old -s\\n + boot [xdNx:][filename] [-1acdqsv]\n + (ex. \boot hd0a:netbsd.old -s\)\n + (ex. \boot path:/mnt/card/netbsd -1\)\n ls [path]\n #ifdef SUPPORT_CONSDEV consdev {glass|com [speed]}\n Index: src/sys/arch/zaurus/stand/zboot/boot.h diff -u src/sys/arch/zaurus/stand/zboot/boot.h:1.1 src/sys/arch/zaurus/stand/zboot/boot.h:1.2 --- src/sys/arch/zaurus/stand/zboot/boot.h:1.1 Mon Mar 2 09:33:02 2009 +++ src/sys/arch/zaurus/stand/zboot/boot.h Wed Jan 18 23:12:21 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: boot.h,v 1.1 2009/03/02 09:33:02 nonaka Exp $ */ +/* $NetBSD: boot.h,v 1.2 2012/01/18 23:12:21 nonaka Exp $ */ /* * Copyright (c) 2009 NONAKA Kimihiro @@ -52,6 +52,7 @@ void bootmenu(void); /* conf.c */ extern char devname_hd[]; extern char devname_mmcd[]; +extern char devname_path[]; /* loadfile_zboot.c */ int loadfile_zboot(const char *fname, u_long *marks, int flags); Index: src/sys/arch/zaurus/stand/zboot/bootmenu.c diff -u src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.1 src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.2 --- src/sys/arch/zaurus/stand/zboot/bootmenu.c:1.1 Mon Mar 2 09:33:02 2009 +++ src/sys/arch/zaurus/stand/zboot/bootmenu.c Wed Jan 18 23:12:21 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: bootmenu.c,v 1.1
CVS commit: src/sys/arch/amiga
Module Name:src Committed By: rkujawa Date: Thu Jan 19 00:14:08 UTC 2012 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL files.amiga src/sys/arch/amiga/dev: p5bus.c zbus.c src/sys/arch/amiga/include: pci_machdep.h src/sys/arch/amiga/pci: mppb.c p5membar.c p5pb.c p5pbreg.h p5pbvar.h Log Message: Tons of enchancements to MD PCI code: - The G-REX 4000 and G-REX 1200 are now really supported and working (still only 1st slot but the rest are a matter of time). - Add bridge identification to p5pb, simplifies the driver and make it more user-friendly. - Retire P5PB_GENFB and P5PB_OLD_FIRMWARE options, these are now handled automatically, depending on used hardware and firmware. - Add PCI bus reconfiguration support to p5pb (PCI_NETBSD_CONFIGURE), allows using G-REX without boot to AmigaOS. - Bring p5pb registers desription up to date with my knowledge. - Add a lot of debugging code to p5pb (enabled by P5PB_DEBUG kernel option). - Fix PCI_NETBSD_CONFIGURE in mppb (now it really works). - Fix quirk handling in zbus. - Update GENERIC.in and regen the kernel configs. - Misc cleanup. To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.280 -r1.281 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.102 -r1.103 src/sys/arch/amiga/conf/INSTALL cvs rdiff -u -r1.152 -r1.153 src/sys/arch/amiga/conf/files.amiga cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/p5bus.c cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/dev/zbus.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/include/pci_machdep.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/pci/mppb.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/pci/p5membar.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/pci/p5pb.c \ src/sys/arch/amiga/pci/p5pbreg.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/pci/p5pbvar.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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.150 src/sys/arch/amiga/conf/DRACO:1.151 --- src/sys/arch/amiga/conf/DRACO:1.150 Wed Jan 11 17:04:29 2012 +++ src/sys/arch/amiga/conf/DRACO Thu Jan 19 00:14:08 2012 @@ -1,9 +1,9 @@ -# $NetBSD: DRACO,v 1.150 2012/01/11 17:04:29 rkujawa Exp $ +# $NetBSD: DRACO,v 1.151 2012/01/19 00:14:08 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.92 2012/01/11 17:04:29 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.150 $ +#ident GENERIC-$Revision: 1.151 $ maxusers 8 Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.280 src/sys/arch/amiga/conf/GENERIC:1.281 --- src/sys/arch/amiga/conf/GENERIC:1.280 Wed Jan 11 17:04:29 2012 +++ src/sys/arch/amiga/conf/GENERIC Thu Jan 19 00:14:08 2012 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.280 2012/01/11 17:04:29 rkujawa Exp $ +# $NetBSD: GENERIC,v 1.281 2012/01/19 00:14:08 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.92 2012/01/11 17:04:29 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.280 $ +#ident GENERIC-$Revision: 1.281 $ maxusers 8 @@ -470,12 +470,10 @@ uk* at scsibus? target ? lun ? # scsi un # PCI bus support options PCIVERBOSE # verbose PCI device autoconfig messages #options PCI_CONFIG_DUMP -options PCI_NETBSD_CONFIGURE # used only by mppb(4) +options PCI_NETBSD_CONFIGURE # supported by mppb(4) and p5pb(4) p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX) p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs -#options P5PB_OLD_FIRMWARE # enable support for p5pb with old fw -#options P5PB_GENFB # enable genfb support for CVPPC/BVPPC #options P5PB_DEBUG # enable excessive debug for p5pb pci* at p5pb0 Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.92 src/sys/arch/amiga/conf/GENERIC.in:1.93 --- src/sys/arch/amiga/conf/GENERIC.in:1.92 Wed Jan 11 17:04:29 2012 +++ src/sys/arch/amiga/conf/GENERIC.in Thu Jan 19 00:14:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.92 2012/01/11 17:04:29 rkujawa Exp $ +# $NetBSD: GENERIC.in,v 1.93 2012/01/19 00:14:08 rkujawa Exp $ # ## # GENERIC machine description file @@ -52,7 +52,7 @@
CVS commit: src/doc
Module Name:src Committed By: rkujawa Date: Thu Jan 19 00:41:33 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Mention support for G-REX 1200 and G-REX 4000 in p5pb(4). To generate a diff of this commit: cvs rdiff -u -r1.1647 -r1.1648 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.1647 src/doc/CHANGES:1.1648 --- src/doc/CHANGES:1.1647 Mon Jan 16 22:44:15 2012 +++ src/doc/CHANGES Thu Jan 19 00:41:33 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1647 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1648 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1202,3 +1202,5 @@ Changes from NetBSD 5.0 to NetBSD 6.0: sandpoint: Netronix NH-230/231 and compatible NAS are supported. [phx 20120114] atf(7): Import 0.15. [jmmv 20120116] + p5pb(4): DCE Computer G-REX 1200 and G-REX 4000 PCI bridges are now + supported. [rkujawa 20120119]
CVS commit: src/bin/csh
Module Name:src Committed By: christos Date: Thu Jan 19 02:42:53 UTC 2012 Modified Files: src/bin/csh: char.c char.h Log Message: PR/45856: Bernhard Burnhard Riedel: Infinite loop on nbsp; input. Sending char 160 in the input to csh, lead it to an infinite loop, because tcsh tables counted this as a space character, but the word logic switch does not. Change that character tables, so that this does not count as a spacing character anymore, by syncing the table with the one from tcsh. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/bin/csh/char.c cvs rdiff -u -r1.8 -r1.9 src/bin/csh/char.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/csh/char.c diff -u src/bin/csh/char.c:1.9 src/bin/csh/char.c:1.10 --- src/bin/csh/char.c:1.9 Thu Aug 7 05:05:03 2003 +++ src/bin/csh/char.c Wed Jan 18 21:42:53 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: char.c,v 1.9 2003/08/07 09:05:03 agc Exp $ */ +/* $NetBSD: char.c,v 1.10 2012/01/19 02:42:53 christos Exp $ */ /*- * Copyright (c) 1980, 1991, 1993 @@ -34,209 +34,210 @@ #if 0 static char sccsid[] = @(#)char.c 8.1 (Berkeley) 5/31/93; #else -__RCSID($NetBSD: char.c,v 1.9 2003/08/07 09:05:03 agc Exp $); +__RCSID($NetBSD: char.c,v 1.10 2012/01/19 02:42:53 christos Exp $); #endif #endif /* not lint */ #include char.h +/* on default same as original map */ unsigned short _cmap[256] = { -/* nul soh stx etx */ +/* 0 nul 1 soh 2 stx 3 etx */ _CTR, _CTR, _CTR, _CTR, -/* eot enq ack bel */ +/* 4 eot 5 enq 6 ack 7 bel */ _CTR, _CTR, _CTR, _CTR, -/* bs ht nl vt */ +/* 8 bs 9 ht 10 nl 11 vt */ _CTR, _CTR|_SP|_META, _CTR|_NL|_META, _CTR, -/* np cr so si */ +/* 12 np 13 cr 14 so 15 si */ _CTR, _CTR, _CTR, _CTR, -/* dle dc1 dc2 dc3 */ +/* 16 dle 17 dc1 18 dc2 19 dc3 */ _CTR, _CTR, _CTR, _CTR, -/* dc4 nak syn etb */ +/* 20 dc4 21 nak 22 syn 23 etb */ _CTR, _CTR, _CTR, _CTR, -/* can em sub esc */ +/* 24 can 25 em 26 sub 27 esc */ _CTR, _CTR, _CTR, _CTR, -/* fs gs rs us */ +/* 28 fs 29 gs 30 rs 31 us */ _CTR, _CTR, _CTR, _CTR, -/* sp !# */ - _SP|_META, 0, _QF, _META, +/* 32 sp 33 ! 34 35 # */ + _SP|_META, _PUN, _QF|_PUN, _META|_PUN, -/* $ %' */ - _DOL, 0, _META|_CMD, _QF, +/* 36 $ 37 % 38 39 ' */ + _DOL|_PUN, _PUN, _META|_CMD|_PUN,_QF|_PUN, -/* ( ) * + */ - _META|_CMD, _META, _GLOB, 0, +/* 40 ( 41 ) 42 * 43 + */ + _META|_CMD|_PUN,_META|_PUN, _GLOB|_PUN, _PUN, -/* , - . / */ - 0, 0, 0, 0, +/* 44 , 45 - 46 . 47 / */ + _PUN, _PUN, _PUN, _PUN, -/* 0 1 2 3 */ +/* 48 0 49 1 50 2 51 3 */ _DIG|_XD, _DIG|_XD, _DIG|_XD, _DIG|_XD, -/* 4 5 6 7 */ +/* 52 4 53 5 54 6 55 7 */ _DIG|_XD, _DIG|_XD, _DIG|_XD, _DIG|_XD, -/* 8 9 : ; */ - _DIG|_XD, _DIG|_XD, 0, _META|_CMD, +/* 56 8 57 9 58 : 59 ; */ + _DIG|_XD, _DIG|_XD, _PUN, _META|_CMD|_PUN, -/* =? */ - _META, 0, _META, _GLOB, +/* 60 61 = 62 63 ? */ + _META|_PUN, _PUN, _META|_PUN, _GLOB|_PUN, -/* @ A B C */ - 0, _LET|_UP|_XD, _LET|_UP|_XD, _LET|_UP|_XD, +/* 64 @ 65 A 66 B 67 C */ + _PUN, _LET|_UP|_XD, _LET|_UP|_XD, _LET|_UP|_XD, -/* D E F G */ +/* 68 D 69 E 70 F 71 G */ _LET|_UP|_XD, _LET|_UP|_XD, _LET|_UP|_XD, _LET|_UP, -/* H I J K */ +/* 72 H 73 I 74 J 75 K */ _LET|_UP, _LET|_UP, _LET|_UP, _LET|_UP, -/* L M N O */ +/* 76 L 77 M 78 N 79 O */ _LET|_UP, _LET|_UP, _LET|_UP, _LET|_UP, -/* P Q R S */ +/* 80 P 81 Q 82 R 83 S */ _LET|_UP, _LET|_UP, _LET|_UP, _LET|_UP, -/* T U V W */ +/* 84 T 85 U 86 V 87 W */ _LET|_UP, _LET|_UP, _LET|_UP, _LET|_UP, -/* X Y Z [ */ - _LET|_UP, _LET|_UP, _LET|_UP, _GLOB, +/* 88 X 89 Y 90 Z 91 [ */ + _LET|_UP, _LET|_UP, _LET|_UP, _GLOB|_PUN, -/* \ ] ^ _ */ - _ESC, 0, 0, 0, +/* 92 \ 93 ] 94 ^ 95 _ */ + _ESC|_PUN, _PUN, _PUN, _PUN, -/* ` a b c */ - _QB|_GLOB|_META, _LET|_LOW|_XD, _LET|_LOW|_XD, _LET|_LOW|_XD, +/* 96 ` 97 a 98 b 99 c */ + _QB|_GLOB|_META|_PUN, _LET|_LOW|_XD, _LET|_LOW|_XD, _LET|_LOW|_XD, -/* d e f g */ +/* 100 d 101 e 102 f 103 g */ _LET|_LOW|_XD, _LET|_LOW|_XD, _LET|_LOW|_XD, _LET|_LOW, -/* h i j k */ +/* 104 h 105 i 106 j 107 k */ _LET|_LOW, _LET|_LOW, _LET|_LOW, _LET|_LOW, -/* l m n o */ +/* 108 l 109 m 110 n 111 o */ _LET|_LOW, _LET|_LOW, _LET|_LOW, _LET|_LOW, -/* p q r s */ +/* 112 p 113 q 114 r 115 s */ _LET|_LOW, _LET|_LOW, _LET|_LOW, _LET|_LOW, -/* t u v w */ +/* 116 t 117 u 118 v 119 w */ _LET|_LOW, _LET|_LOW, _LET|_LOW, _LET|_LOW, -/* x y z { */ - _LET|_LOW, _LET|_LOW, _LET|_LOW, _GLOB, +/* 120 x 121 y 122 z 123 { */ + _LET|_LOW, _LET|_LOW, _LET|_LOW, _GLOB|_PUN, -/* | } ~ del */ - _META|_CMD, 0, 0, _CTR, +/* 124
CVS commit: src/sys/arch/sandpoint
Module Name:src Committed By: nisimura Date: Thu Jan 19 07:38:06 UTC 2012 Modified Files: src/sys/arch/sandpoint/sandpoint: autoconf.c src/sys/arch/sandpoint/stand/altboot: dsk.c Log Message: Change BTINFO_ROOTDEV to include boot device partition number in its cookie field to allow a kernel to determine rootdev correctly when kernel image is loaded from other than 'a' partition. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sandpoint/sandpoint/autoconf.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sandpoint/stand/altboot/dsk.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/sandpoint/sandpoint/autoconf.c diff -u src/sys/arch/sandpoint/sandpoint/autoconf.c:1.23 src/sys/arch/sandpoint/sandpoint/autoconf.c:1.24 --- src/sys/arch/sandpoint/sandpoint/autoconf.c:1.23 Sat Jun 18 08:08:30 2011 +++ src/sys/arch/sandpoint/sandpoint/autoconf.c Thu Jan 19 07:38:06 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.23 2011/06/18 08:08:30 matt Exp $ */ +/* $NetBSD: autoconf.c,v 1.24 2012/01/19 07:38:06 nisimura Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.23 2011/06/18 08:08:30 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.24 2012/01/19 07:38:06 nisimura Exp $); #include sys/param.h #include sys/systm.h @@ -138,8 +138,8 @@ device_register(device_t dev, void *aux) } if (bi_rdev != NULL device_class(dev) == DV_DISK device_is_a(dev, bi_rdev-devname) - device_unit(dev) == bi_rdev-cookie) { + device_unit(dev) == (bi_rdev-cookie 8)) { booted_device = dev; - booted_partition = 0; + booted_partition = bi_rdev-cookie 0xff; } } Index: src/sys/arch/sandpoint/stand/altboot/dsk.c diff -u src/sys/arch/sandpoint/stand/altboot/dsk.c:1.11 src/sys/arch/sandpoint/stand/altboot/dsk.c:1.12 --- src/sys/arch/sandpoint/stand/altboot/dsk.c:1.11 Sat Nov 12 16:56:12 2011 +++ src/sys/arch/sandpoint/stand/altboot/dsk.c Thu Jan 19 07:38:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: dsk.c,v 1.11 2011/11/12 16:56:12 phx Exp $ */ +/* $NetBSD: dsk.c,v 1.12 2012/01/19 07:38:05 nisimura Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -498,7 +498,7 @@ dsk_open(struct open_file *f, ...) /* build btinfo to identify disk device */ snprintf(bi_rdev.devname, sizeof(bi_rdev.devname), wd); - bi_rdev.cookie = d-unittag; /* disk unit number */ + bi_rdev.cookie = (d-unittag 8) | d-part; return 0; }
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src Committed By: matt Date: Thu Jan 19 07:58:58 UTC 2012 Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_cpucore.c Log Message: Add missing arg. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/arch/mips/rmi/rmixl_cpucore.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/mips/rmi/rmixl_cpucore.c diff -u src/sys/arch/mips/rmi/rmixl_cpucore.c:1.1.2.13 src/sys/arch/mips/rmi/rmixl_cpucore.c:1.1.2.14 --- src/sys/arch/mips/rmi/rmixl_cpucore.c:1.1.2.13 Wed Jan 4 16:17:53 2012 +++ src/sys/arch/mips/rmi/rmixl_cpucore.c Thu Jan 19 07:58:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_cpucore.c,v 1.1.2.13 2012/01/04 16:17:53 matt Exp $ */ +/* $NetBSD: rmixl_cpucore.c,v 1.1.2.14 2012/01/19 07:58:58 matt Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -38,7 +38,7 @@ #include locators.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_cpucore.c,v 1.1.2.13 2012/01/04 16:17:53 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_cpucore.c,v 1.1.2.14 2012/01/19 07:58:58 matt Exp $); #include opt_multiprocessor.h @@ -233,7 +233,7 @@ cpucore_rmixl_hatch(device_t self) if (sc-sc_hatched == false) { /* PCRs for core#0 are set up in mach_init() */ if (sc-sc_core != 0) - rmixl_pcr_init_core(); + rmixl_pcr_init_core(cpu_rmixlp(mips_options.mips_cpu)); sc-sc_hatched = true; } }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Wed Jan 18 08:04:19 UTC 2012 Modified Files: src/sys/dev/pci: voodoofb.c voodoofbreg.h Log Message: do some mode validation - for now reject everything above 1680x1200 until I find out why these don't work ( 1680x1200 works but not 1920x1080 ). Also use sync polarity info from videomode instead of guessing. Finally, if there is no useble preferred mode, be a little smarter trying to find the next best mode. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/voodoofb.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/voodoofbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: skrll Date: Wed Jan 18 09:35:48 UTC 2012 Modified Files: src/sys/arch/hppa/hppa: db_disasm.c db_interface.c db_machdep.c db_trace.c src/sys/arch/hppa/include: db_machdep.h types.h src/usr.sbin/crash: Makefile Log Message: Support crash(8) on hppa. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/hppa/db_disasm.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hppa/hppa/db_interface.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/hppa/db_machdep.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/hppa/db_trace.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/db_machdep.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/include/types.h cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/crash/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/locale
Module Name:src Committed By: joerg Date: Wed Jan 18 14:22:28 UTC 2012 Modified Files: src/lib/libc/locale: runetype_misc.h Log Message: _runetype_from_ctype is unused To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/runetype_misc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/llvm/bin/clang
Module Name:src Committed By: joerg Date: Wed Jan 18 16:53:09 UTC 2012 Modified Files: src/external/bsd/llvm/bin/clang: Makefile Log Message: Make sure to link the MIPS assembler parser in. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/bsd/llvm/bin/clang/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: riz Date: Wed Jan 18 17:32:43 UTC 2012 Modified Files: src/distrib/sets/lists/comp: md.amd64 mi Log Message: Setlist fix for MKDEBUGLIB=yes on amd64. Probably needs a similar fix on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.1725 -r1.1726 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Wed Jan 18 19:17:02 UTC 2012 Modified Files: src/sys/arch/usermode/dev: cpu.c Log Message: Create an atomic switchto() that has SIGALRM and SIGIO signals blocked that might otherwise disrupt the setting of curlwp to match the lwp context. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/usermode/dev/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src Committed By: drochner Date: Wed Jan 18 20:37:20 UTC 2012 Modified Files: src/sys/conf: files Log Message: get the logics straight: CPU_UCODE requires firmload as a dependency To generate a diff of this commit: cvs rdiff -u -r1.1036 -r1.1037 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: bouyer Date: Wed Jan 18 20:51:23 UTC 2012 Modified Files: src/distrib/sets/lists/tests: mi src/tests/fs/ffs: Makefile quotas_common.sh t_clearquota.sh t_getquota.sh t_miscquota.sh t_quotalimit.sh t_setquota.sh Added Files: src/tests/fs/ffs: ffs_common.sh h_ffs_server.c Removed Files: src/tests/fs/ffs: h_quota2_server.c Log Message: Make parts of the quota tests useable for more than quotas: - rename h_quota2_server to h_ffs_server, there's nothing about quotas in there. - extract non-quota parts of quotas_common.sh to ffs_common.sh To generate a diff of this commit: cvs rdiff -u -r1.433 -r1.434 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.16 -r1.17 src/tests/fs/ffs/Makefile cvs rdiff -u -r0 -r1.1 src/tests/fs/ffs/ffs_common.sh \ src/tests/fs/ffs/h_ffs_server.c cvs rdiff -u -r1.2 -r0 src/tests/fs/ffs/h_quota2_server.c cvs rdiff -u -r1.3 -r1.4 src/tests/fs/ffs/quotas_common.sh \ src/tests/fs/ffs/t_clearquota.sh src/tests/fs/ffs/t_getquota.sh \ src/tests/fs/ffs/t_miscquota.sh src/tests/fs/ffs/t_quotalimit.sh \ src/tests/fs/ffs/t_setquota.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: drochner Date: Wed Jan 18 21:34:38 UTC 2012 Modified Files: src/sys/arch/i386/i386: mainbus.c Log Message: revert previous, the assumption all buses 1 and up must be subordinate to pci0 doesn't even hold on i386 -- there are server-class chipsets with multiple primary PCI buses, see arch/x86/pci/pchb.c for examples To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/arch/i386/i386/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/zaurus/stand/zboot
Module Name:src Committed By: nonaka Date: Wed Jan 18 23:12:22 UTC 2012 Modified Files: src/sys/arch/zaurus/stand/zboot: Makefile boot.c boot.h bootmenu.c conf.c devopen.c diskprobe.c pathnames.h unixdev.c unixdev.h version Added Files: src/sys/arch/zaurus/stand/zboot: pathfs.c pathfs.h Log Message: Support to read the kernel from local file system. ex. boot path:/mnt/card/netbsd To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/stand/zboot/Makefile cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/stand/zboot/boot.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/stand/zboot/boot.h \ src/sys/arch/zaurus/stand/zboot/bootmenu.c \ src/sys/arch/zaurus/stand/zboot/conf.c \ src/sys/arch/zaurus/stand/zboot/devopen.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/stand/zboot/diskprobe.c \ src/sys/arch/zaurus/stand/zboot/pathnames.h \ src/sys/arch/zaurus/stand/zboot/unixdev.c \ src/sys/arch/zaurus/stand/zboot/unixdev.h \ src/sys/arch/zaurus/stand/zboot/version cvs rdiff -u -r0 -r1.1 src/sys/arch/zaurus/stand/zboot/pathfs.c \ src/sys/arch/zaurus/stand/zboot/pathfs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amiga
Module Name:src Committed By: rkujawa Date: Thu Jan 19 00:14:08 UTC 2012 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL files.amiga src/sys/arch/amiga/dev: p5bus.c zbus.c src/sys/arch/amiga/include: pci_machdep.h src/sys/arch/amiga/pci: mppb.c p5membar.c p5pb.c p5pbreg.h p5pbvar.h Log Message: Tons of enchancements to MD PCI code: - The G-REX 4000 and G-REX 1200 are now really supported and working (still only 1st slot but the rest are a matter of time). - Add bridge identification to p5pb, simplifies the driver and make it more user-friendly. - Retire P5PB_GENFB and P5PB_OLD_FIRMWARE options, these are now handled automatically, depending on used hardware and firmware. - Add PCI bus reconfiguration support to p5pb (PCI_NETBSD_CONFIGURE), allows using G-REX without boot to AmigaOS. - Bring p5pb registers desription up to date with my knowledge. - Add a lot of debugging code to p5pb (enabled by P5PB_DEBUG kernel option). - Fix PCI_NETBSD_CONFIGURE in mppb (now it really works). - Fix quirk handling in zbus. - Update GENERIC.in and regen the kernel configs. - Misc cleanup. To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.280 -r1.281 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.102 -r1.103 src/sys/arch/amiga/conf/INSTALL cvs rdiff -u -r1.152 -r1.153 src/sys/arch/amiga/conf/files.amiga cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/p5bus.c cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/dev/zbus.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/include/pci_machdep.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/pci/mppb.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/pci/p5membar.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/pci/p5pb.c \ src/sys/arch/amiga/pci/p5pbreg.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/pci/p5pbvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: rkujawa Date: Thu Jan 19 00:30:31 UTC 2012 Modified Files: src/share/man/man4/man4.amiga: p5pb.4 Log Message: Update the p5pb(4) page to reflect the recent changes in this driver. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.amiga/p5pb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: rkujawa Date: Thu Jan 19 00:41:33 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Mention support for G-REX 1200 and G-REX 4000 in p5pb(4). To generate a diff of this commit: cvs rdiff -u -r1.1647 -r1.1648 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/csh
Module Name:src Committed By: christos Date: Thu Jan 19 02:42:53 UTC 2012 Modified Files: src/bin/csh: char.c char.h Log Message: PR/45856: Bernhard Burnhard Riedel: Infinite loop on nbsp; input. Sending char 160 in the input to csh, lead it to an infinite loop, because tcsh tables counted this as a space character, but the word logic switch does not. Change that character tables, so that this does not count as a spacing character anymore, by syncing the table with the one from tcsh. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/bin/csh/char.c cvs rdiff -u -r1.8 -r1.9 src/bin/csh/char.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint
Module Name:src Committed By: nisimura Date: Thu Jan 19 07:38:06 UTC 2012 Modified Files: src/sys/arch/sandpoint/sandpoint: autoconf.c src/sys/arch/sandpoint/stand/altboot: dsk.c Log Message: Change BTINFO_ROOTDEV to include boot device partition number in its cookie field to allow a kernel to determine rootdev correctly when kernel image is loaded from other than 'a' partition. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sandpoint/sandpoint/autoconf.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sandpoint/stand/altboot/dsk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src Committed By: matt Date: Thu Jan 19 07:58:58 UTC 2012 Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_cpucore.c Log Message: Add missing arg. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/arch/mips/rmi/rmixl_cpucore.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.