From owner-p4-projects@FreeBSD.ORG Sun Apr 9 00:32:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A79616A404; Sun, 9 Apr 2006 00:32:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D010116A402 for ; Sun, 9 Apr 2006 00:32:49 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 94C8443D46 for ; Sun, 9 Apr 2006 00:32:49 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k390Wn54041747 for ; Sun, 9 Apr 2006 00:32:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k390WnL9041741 for perforce@freebsd.org; Sun, 9 Apr 2006 00:32:49 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Apr 2006 00:32:49 GMT Message-Id: <200604090032.k390WnL9041741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 00:32:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=94828 Change 94828 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/09 00:31:52 save the pil the intr interrupted track resumable and non-resumable errors track the trap type in reserved traps Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#41 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#41 (text+ko) ==== @@ -34,6 +34,7 @@ #include "opt_compat.h" #include "opt_ddb.h" +#include "opt_simulator.h" #include #include @@ -211,7 +212,7 @@ .endm .macro tl0_setup type - clr %g3 + rdpr %tt, %g3 sub %g0, 1, %g4 set trap, %g1 ba %xcc, tl0_trap @@ -233,11 +234,7 @@ .macro tl0_reserved count .rept \count -#if 0 tl0_gen T_RESERVED -#else - MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT -#endif .align 32 .endr .endm @@ -272,9 +269,7 @@ .endm .macro insn_excptn - MAGIC_TRAP_ON - MAGIC_TRAP_ON - MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT + tl0_gen T_RESERVED .align 32 .endm @@ -291,8 +286,13 @@ .endm .macro data_excptn - MAGIC_TRAP_ON - MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT + GET_MMFSA_SCRATCH(%g1) + mov MMFSA_D_ADDR, %g2 + ldxa [%g1 + %g2]ASI_REAL, %g3 + sub %g0, 1, %g4 + set trap, %g1 + ba %xcc, tl0_trap + mov T_DATA_EXCEPTION, %g2 .align 32 .endm @@ -319,7 +319,15 @@ .endm .macro tl0_align - MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT + tl0_gen T_RESERVED +#if 0 + GET_MMFSA_SCRATCH(%g1) + mov MMFSA_D_ADDR, %g3 + mov MMFSA_D_CTX, %g7 + ldxa [%g1 + %g3]ASI_REAL, %g5 + ba,pt %xcc, tsb_miss_handler + mov T_DATA_PROTECTION, %g3 +#endif .align 32 .endm @@ -334,14 +342,20 @@ .endm .macro resumable_error - MAGIC_TRAP_ON - MAGIC_EXIT + clr %g3 + sub %g0, 1, %g4 + set trap, %g1 + ba %xcc, tl0_trap + mov T_RESUMABLE_ERROR, %g2 .align 32 .endm .macro nonresumable_error - MAGIC_TRAP_ON - MAGIC_EXIT + clr %g3 + sub %g0, 1, %g4 + set trap, %g1 + ba %xcc, tl0_trap + mov T_NONRESUMABLE_ERROR, %g2 .align 32 .endm @@ -493,7 +507,6 @@ ba,a,pt %xcc, fault_64bit_so1 nop .align 128 - .endm .macro spill_mixed @@ -509,9 +522,7 @@ .endm .macro tl1_align - MAGIC_TRAP_ON - MAGIC_TRAP_ON - MAGIC_EXIT + ba,a,pt %xcc, tl1_trap .align 32 .endm @@ -1071,7 +1082,6 @@ wrpr %g0, %g1, %cleanwin rdpr %cwp, %g1 wrpr %g1, %g6, %tstate -! MAGIC_TRAP_ON retry END(user_rtt) END(utl0) @@ -1122,7 +1132,6 @@ wrpr %g0, %l0, %pil #endif GET_PCPU_SCRATCH - /* simulator incorrectly exits if tl != gl */ ldx [PCPU(CURTHREAD)], %l0 ldx [%l0 + TD_MD + MD_SAVED_PIL], %l0 wrpr %g0, %l0, %pil @@ -1166,7 +1175,7 @@ GET_PCPU_SCRATCH set ktl0, %g6 save %sp, -(CCFSZ + TF_SIZEOF), %sp - + or %g2, T_KERNEL, %g2 ! if the kwbuf is full we need to save to the stack now @@ -1186,13 +1195,14 @@ ! %g2=level %g1=mask ENTRY(tl0_intr) - wrpr %g4, 0, %pil wr %g1, 0, %clear_softint SET(intr_handlers, %g7, %g6) sllx %g4, IH_SHIFT, %g7 ldx [%g6 + %g7], %g1 ! pointer to interrupt handler - - + rdpr %pil, %g5 ! interrupted pil + wrpr %g4, 0, %pil + mov %g5, %g4 + ! %g1 pc of trap handler ! %g2, %g3 args of trap handler ! %g4 desired pil @@ -1284,6 +1294,7 @@ wrpr %g0, %g4, %pil 1: wrpr %g0, %g6, %tnpc + MAGIC_TRAP_OFF rdpr %cwp, %l0 set TSTATE_KERNEL, %l1 wrpr %l1, %l0, %tstate @@ -1328,7 +1339,6 @@ ba,pt %xcc, 4f nop 2: -! MAGIC_TRAP_ON cmp %g6, %g0 ! kernel? be,pn %xcc, 3f nop @@ -1348,13 +1358,6 @@ ! %g4 == fault type %g5 == fault addr %g6 == tag ! XXX only handle normal miss for now (look at fault type in the future) -#ifdef PMAP_DEBUG - cmp %g3, T_INSTRUCTION_MISS - bne,pn %xcc, 17f - nop -! MAGIC_TRAP_ON ! enable debugging for instruction misses -17: -#endif tsb_miss_compute_hash_addr: sethi %hi(PAGE_SIZE), %g7 From owner-p4-projects@FreeBSD.ORG Sun Apr 9 00:33:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA8AF16A403; Sun, 9 Apr 2006 00:33:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 860E516A401 for ; Sun, 9 Apr 2006 00:33:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5239C43D46 for ; Sun, 9 Apr 2006 00:33:51 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k390XpD8041898 for ; Sun, 9 Apr 2006 00:33:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k390XpAC041895 for perforce@freebsd.org; Sun, 9 Apr 2006 00:33:51 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Apr 2006 00:33:51 GMT Message-Id: <200604090033.k390XpAC041895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 00:33:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=94829 Change 94829 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/09 00:33:02 use renamed interrupt control functions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#5 (text+ko) ==== @@ -90,6 +90,7 @@ hardclock_cpu(TRAPF_USERMODE(tf)); if (profprocs != 0) profclock(TRAPF_USERMODE(tf), TRAPF_PC(tf)); + statclock(TRAPF_USERMODE(tf)); } @@ -108,10 +109,11 @@ * stop. */ adj = PCPU_GET(tickadj); - s = intr_disable(); + s = intr_disable_all(); tick = rd(tick); wrtickcmpr(tick + tick_increment - adj, 0); - intr_restore(s); + intr_restore_all(s); + ref = PCPU_GET(tickref); delta = tick - ref; count = 0; @@ -152,14 +154,12 @@ */ printf("tick_freq=%ld hz=%d tick_increment=%ld\n", tick_freq, hz, tick_increment); -#ifndef notyet - /* XXX SUN4V_FIXME the simulator sets the clock to 5Mhz */ - tick_increment = TICK_GRACE; -#endif + +#ifndef SIMULATOR if (tick_increment < TICK_GRACE) panic("%s: HZ too high, decrease to at least %ld", __func__, clock / TICK_GRACE); - +#endif /* * UltraSparc II[e,i] based systems come up with the tick interrupt * enabled and a handler that resets the tick counter, causing DELAY() @@ -186,12 +186,12 @@ * one tick to make sure that it is not missed. */ PCPU_SET(tickadj, 0); - s = intr_disable(); + s = intr_disable_all(); base = rd(tick); base = roundup(base, tick_increment); PCPU_SET(tickref, base); wrtickcmpr(base + tick_increment, 0); - intr_restore(s); + intr_restore_all(s); } void From owner-p4-projects@FreeBSD.ORG Sun Apr 9 00:34:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79BEB16A403; Sun, 9 Apr 2006 00:34:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4160416A400 for ; Sun, 9 Apr 2006 00:34:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1016343D45 for ; Sun, 9 Apr 2006 00:34:53 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k390YqxE041934 for ; Sun, 9 Apr 2006 00:34:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k390YqlP041931 for perforce@freebsd.org; Sun, 9 Apr 2006 00:34:52 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Apr 2006 00:34:52 GMT Message-Id: <200604090034.k390YqlP041931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 00:34:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=94830 Change 94830 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/09 00:34:34 initialize queue head registers add another field to init mondo Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#12 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#12 (text+ko) ==== @@ -812,7 +812,7 @@ stx %o0, [%g2] stx %o1, [%g2+8] stx %o2, [%g2+0x10] - stx %g0, [%g2+0x18] + stx %o3, [%g2+0x18] stx %g0, [%g2+0x20] stx %g0, [%g2+0x28] stx %g0, [%g2+0x30] @@ -820,8 +820,21 @@ retl membar #Sync END(init_mondo) - - + + +ENTRY(init_mondo_queue) + mov CPU_MONDO_QUEUE_TAIL, %g2 + ldxa [%g2]ASI_QUEUE, %g2 + mov CPU_MONDO_QUEUE_HEAD, %g6 + stxa %g2, [%g6]ASI_QUEUE + mov DEV_MONDO_QUEUE_TAIL, %g2 + ldxa [%g2]ASI_QUEUE, %g2 + mov DEV_MONDO_QUEUE_HEAD, %g6 + stxa %g2, [%g6]ASI_QUEUE + retl + membar #Sync +END(init_mondo_queue) + #ifdef GPROF ENTRY(user) From owner-p4-projects@FreeBSD.ORG Sun Apr 9 04:04:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08F6816A405; Sun, 9 Apr 2006 04:04:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB7D216A401 for ; Sun, 9 Apr 2006 04:04:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E12743D46 for ; Sun, 9 Apr 2006 04:04:04 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39444I4064653 for ; Sun, 9 Apr 2006 04:04:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39444mK064650 for perforce@freebsd.org; Sun, 9 Apr 2006 04:04:04 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Apr 2006 04:04:04 GMT Message-Id: <200604090404.k39444mK064650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 04:04:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=94831 Change 94831 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/09 04:03:19 add interrupt setup for sun4v Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#3 (text+ko) ==== @@ -163,6 +163,8 @@ extern struct bus_space_tag nexus_bustag; +#define SUN4V_REG_SPEC2CFG_HDL(x) ((x >> 32) & ~(0xfull << 28)) + static int nexus_inlist(const char *name, const char **list) { @@ -277,10 +279,87 @@ type != NULL ? type : "unknown"); } +#ifdef SUN4V + + static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, driver_intr_t *intr, void *arg, void **cookiep) { + + uint64_t reg, nreg; + uint64_t ihdl, cfg; + uint64_t ino, nino; + int error, cpuid; + + if (res == NULL) + panic("%s: NULL interrupt resource!", __func__); + + printf("dev=%s child=%s\n", ofw_bus_get_name(dev), ofw_bus_get_name(child)); + + if ((error = bus_get_resource(child, SYS_RES_MEMORY, 0, ®, &nreg))) + goto fail; + + if ((error = bus_get_resource(child, SYS_RES_IRQ, 0, &ino, &nino))) + goto fail; + + printf("child=%s reg=0x%lx ino=0x%lx\n", ofw_bus_get_name(child), + reg, ino); + + cfg = SUN4V_REG_SPEC2CFG_HDL(reg); + + if (hvio_intr_devino_to_sysino(cfg, (uint32_t)ino, &ihdl) != H_EOK) { + error = ENXIO; + goto fail; + } + + cpuid = 0; + + if (hvio_intr_settarget(ihdl, cpuid) != H_EOK) { + error = ENXIO; + goto fail; + } + + if (hvio_intr_setstate(ihdl, HV_INTR_IDLE_STATE) != H_EOK) { + error = ENXIO; + goto fail; + } + + if (hvio_intr_setvalid(ihdl, HV_INTR_VALID) != H_EOK) { + error = ENXIO; + goto fail; + } + + if ((rman_get_flags(res) & RF_SHAREABLE) == 0) + flags |= INTR_EXCL; + + /* We depend here on rman_activate_resource() being idempotent. */ + if ((error = rman_activate_resource(res))) + goto fail; + + error = inthand_add(device_get_nameunit(child), ihdl, + intr, arg, flags, cookiep); + + printf("inthandler added\n"); +fail: + + return (error); +} + +static int +nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih) +{ + + inthand_remove(rman_get_start(r), ih); + return (0); +} + +#else + +static int +nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, + driver_intr_t *intr, void *arg, void **cookiep) +{ int error; if (res == NULL) @@ -308,6 +387,8 @@ return (0); } +#endif + static struct resource * nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) From owner-p4-projects@FreeBSD.ORG Sun Apr 9 04:07:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 221D416A405; Sun, 9 Apr 2006 04:07:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D518016A403 for ; Sun, 9 Apr 2006 04:07:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3D3A43D45 for ; Sun, 9 Apr 2006 04:07:08 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39478KU067211 for ; Sun, 9 Apr 2006 04:07:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k394787n067205 for perforce@freebsd.org; Sun, 9 Apr 2006 04:07:08 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Apr 2006 04:07:08 GMT Message-Id: <200604090407.k394787n067205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 04:07:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=94832 Change 94832 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/09 04:06:40 add intr_restore_all, intr_disable_all Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpufunc.h#7 (text+ko) ==== @@ -207,7 +207,7 @@ } static __inline register_t -intr_disable(void) +intr_disable_all(void) { u_long s; @@ -215,7 +215,19 @@ wrpr(pstate, s & ~PSTATE_IE, 0); return (s); } -#define intr_restore(s) wrpr(pstate, (s), 0) +#define intr_restore_all(s) wrpr(pstate, (s), 0) + +static __inline register_t +intr_disable(void) +{ + u_long s; + + s = rdpr(pil); + wrpr(pil, 14, 0); + return (s); +} +#define intr_restore(s) wrpr(pil, (s), 0) + /* * In some places, it is required that the store is directly followed by a @@ -224,7 +236,7 @@ */ #define stxa_sync(va, asi, val) do { \ u_long s; \ - s = intr_disable(); \ + s = intr_disable_all(); \ __asm __volatile("stxa %0, [%1] %2; membar #Sync" \ : : "r" (val), "r" (va), "n" (asi)); \ intr_restore(s); \ From owner-p4-projects@FreeBSD.ORG Sun Apr 9 04:14:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B02A16A403; Sun, 9 Apr 2006 04:14:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BEA516A400 for ; Sun, 9 Apr 2006 04:14:18 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 045F643D46 for ; Sun, 9 Apr 2006 04:14:18 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k394EHtn071762 for ; Sun, 9 Apr 2006 04:14:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k394EH3k071759 for perforce@freebsd.org; Sun, 9 Apr 2006 04:14:17 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Apr 2006 04:14:17 GMT Message-Id: <200604090414.k394EH3k071759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 04:14:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=94833 Change 94833 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/09 04:14:08 add RE and NRE trap types Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#6 (text+ko) ==== @@ -88,8 +88,10 @@ #define T_RSTRWP_PHYS 49 #define T_RSTRWP_VIRT 50 #define T_KSTACK_FAULT 51 +#define T_RESUMABLE_ERROR 52 +#define T_NONRESUMABLE_ERROR 53 -#define T_MAX (T_KSTACK_FAULT + 1) +#define T_MAX (T_NONRESUMABLE_ERROR + 1) #define T_KERNEL 0x100 From owner-p4-projects@FreeBSD.ORG Sun Apr 9 06:48:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB8E916A405; Sun, 9 Apr 2006 06:48:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBE6316A403 for ; Sun, 9 Apr 2006 06:48:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E9B843D45 for ; Sun, 9 Apr 2006 06:48:26 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k396mQxM062468 for ; Sun, 9 Apr 2006 06:48:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k396mQvD062460 for perforce@freebsd.org; Sun, 9 Apr 2006 06:48:26 GMT (envelope-from imp@freebsd.org) Date: Sun, 9 Apr 2006 06:48:26 GMT Message-Id: <200604090648.k396mQvD062460@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 06:48:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=94838 Change 94838 by imp@imp_hammer on 2006/04/09 06:47:35 First pass as a bootstrap loader for loading bootstrap programs via the serial port. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/Makefile#2 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/arm_init.s#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/AT91RM9200.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/README#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/arm_init.s#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/debug_io.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/debug_io.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/linker.cfg#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/tag_list.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/Makefile#2 (text+ko) ==== @@ -22,11 +22,11 @@ # ****************************************************************************** # -CFILES= eeprom.o at91rm9200_lowlevel.o main.o env_vars.o debug_io.o loader_prompt.o p_string.o xmodem.o tag_list.o emac.o +CFILES= at91rm9200_lowlevel.o main.o debug_io.o p_string.o xmodem.o tag_list.o ASFILES= arm_init.o OBJCOPY=objcopy LD=ld -CFLAGS=-O -mcpu=arm9 -ffreestanding +CFLAGS=-O2 -mcpu=arm9 -ffreestanding -fpic bootloader: ${CFILES} ${ASFILES} ${LD} -e 0 -o bootloader.out -T linker.cfg ${ASFILES} ${CFILES} ==== //depot/projects/arm/src/sys/boot/arm/kb920x/tag_list.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ void InitTagList(char *parms, void *output) { -#if +#if 0 char *src, *dst; struct tag *tagList = (struct tag*)output; @@ -73,5 +73,5 @@ tagList->hdr.size = 0; tagList->hdr.tag = ATAG_NONE; -#endi +#endif } From owner-p4-projects@FreeBSD.ORG Sun Apr 9 07:32:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F67016A406; Sun, 9 Apr 2006 07:32:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4622516A402 for ; Sun, 9 Apr 2006 07:32:21 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12EC143D45 for ; Sun, 9 Apr 2006 07:32:21 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k397WKlk087235 for ; Sun, 9 Apr 2006 07:32:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k397WKaa087229 for perforce@freebsd.org; Sun, 9 Apr 2006 07:32:20 GMT (envelope-from imp@freebsd.org) Date: Sun, 9 Apr 2006 07:32:20 GMT Message-Id: <200604090732.k397WKaa087229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 07:32:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=94840 Change 94840 by imp@imp_hammer on 2006/04/09 07:31:58 Automatically start xmodem download to base + 1MB and jump to it when downloaded. Loaded programs are expected to copy themselves to the right location or run at 1MB. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#2 (text+ko) ==== @@ -24,6 +24,8 @@ #include "at91rm9200_lowlevel.h" #include "AT91RM9200.h" +typedef void fn_t(void); + /* * .KB_C_FN_DEFINITION_START * int main(void) @@ -34,13 +36,15 @@ * from this function. * .KB_C_FN_DEFINITION_END */ -int main(void) { +int +main(void) +{ + char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ + fn_t *fn = (fn_t *)addr; - char l_char; - AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC10; - while (1) - DebugPrint("."); - + xmodem_rx(addr); + AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; + fn(); return (1); } From owner-p4-projects@FreeBSD.ORG Sun Apr 9 11:02:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C200016A407; Sun, 9 Apr 2006 11:02:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FFC116A405 for ; Sun, 9 Apr 2006 11:02:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 118B043D4C for ; Sun, 9 Apr 2006 11:02:33 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39B2WRr002093 for ; Sun, 9 Apr 2006 11:02:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39B2TK8001987 for perforce@freebsd.org; Sun, 9 Apr 2006 11:02:29 GMT (envelope-from jb@freebsd.org) Date: Sun, 9 Apr 2006 11:02:29 GMT Message-Id: <200604091102.k39B2TK8001987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 94843 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 11:02:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=94843 Change 94843 by jb@jb_freebsd2 on 2006/04/09 10:49:44 Initial FreeBSD source tree for Dtrace. Affected files ... .. //depot/projects/dtrace/doc/Makefile#1 branch .. //depot/projects/dtrace/doc/README#1 branch .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/dtrace/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/dtrace/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/geom-class/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/chapters.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/README#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/st.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/euro/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/euro/article.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/new-users/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/flyer/Makefile#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/flyer/flyer.tex#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/articles.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/books.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/catalog#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/translators.ent#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/dtrace/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributing/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributing/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributors/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributors/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/diskless-x/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fonts/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/fonts/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/multi-os/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/multi-os/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/problem-reports/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/zip-drive/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/design-44bsd/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/faq/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/faq/book.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/fdp-primer/Makefile#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/fdp-primer/book.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 9 11:55:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEB8A16A482; Sun, 9 Apr 2006 11:55:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D1AC16A46E for ; Sun, 9 Apr 2006 11:55:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBA2B43D46 for ; Sun, 9 Apr 2006 11:55:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39BtdAH033001 for ; Sun, 9 Apr 2006 11:55:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39BtdhT032993 for perforce@freebsd.org; Sun, 9 Apr 2006 11:55:39 GMT (envelope-from jb@freebsd.org) Date: Sun, 9 Apr 2006 11:55:39 GMT Message-Id: <200604091155.k39BtdhT032993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 94844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 11:55:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=94844 Change 94844 by jb@jb_freebsd2 on 2006/04/09 11:54:39 Build userland CDDL libs and programs in a tree like GPL'd ones are. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 9 17:20:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A7EB16A405; Sun, 9 Apr 2006 17:20:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 292E016A401 for ; Sun, 9 Apr 2006 17:20:29 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA3EC43D66 for ; Sun, 9 Apr 2006 17:20:28 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39HKSKg032722 for ; Sun, 9 Apr 2006 17:20:28 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39HKS1Q032716 for perforce@freebsd.org; Sun, 9 Apr 2006 17:20:28 GMT (envelope-from cognet@freebsd.org) Date: Sun, 9 Apr 2006 17:20:28 GMT Message-Id: <200604091720.k39HKS1Q032716@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 94855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 17:20:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=94855 Change 94855 by cognet@cognet on 2006/04/09 17:19:52 MFi36: enable promotion of kmem_object pages. Affected files ... .. //depot/projects/superpages/src/sys/arm/arm/pmap.c#8 edit Differences ... ==== //depot/projects/superpages/src/sys/arm/arm/pmap.c#8 (text+ko) ==== @@ -493,7 +493,7 @@ * we have a write-back cache, then we assume setting * only C will make those pages write-through. */ - if (1 || cpufuncs.cf_dcache_wb_range == (void *) cpufunc_nullop) { + if (cpufuncs.cf_dcache_wb_range == (void *) cpufunc_nullop) { pte_l1_s_cache_mode_pt = L1_S_B|L1_S_C; pte_l2_l_cache_mode_pt = L2_B|L2_C; pte_l2_s_cache_mode_pt = L2_B|L2_C; @@ -1565,12 +1565,6 @@ /* There's no way we can do it. */ return; } - if (((ptep[i] & pte_l2_s_cache_mask) == - pte_l2_s_cache_mode_pt || - (ptep[i - 1] & pte_l2_s_cache_mask) == - pte_l2_s_cache_mode_pt) && pte_l2_s_cache_mode_pt - != pte_l2_s_cache_mode) - panic("fuck"); } #ifdef SP_DEBUG printf("promoting small %x\n", va); @@ -1595,6 +1589,7 @@ vm_offset_t va0; vm_paddr_t pa; struct l2_dtable *l2; + struct l1_ttable *l1; uint16_t l1idx; int i; @@ -1623,11 +1618,6 @@ pa = (pt[i] & L2_L_FRAME) + (i & 0xf) * PAGE_SIZE; else pa = pt[i] & L2_S_FRAME; - if (((pt[i - 1] & pte_l2_s_cache_mask) == pte_l2_s_cache_mode_pt - || - (pt[i] & pte_l2_s_cache_mask) == pte_l2_s_cache_mode_pt) && - pte_l2_s_cache_mode_pt != pte_l2_s_cache_mode) - panic("fuck2"); if ((pt[i - 1] & L2_TYPE_MASK) == L2_TYPE_L) pa2 = (pt[i - 1] & L2_L_FRAME) + ((i - 1) & 0xf) * PAGE_SIZE; @@ -1646,10 +1636,13 @@ if (*pt & L2_S_PROT_W) pa |= L1_S_PROT_W; *pd = L1_S_PROTO | pa | pte_l1_s_cache_mode | L1_S_DOM(pmap->pm_domain); -#if 0 - bzero(pt, 0x100 * sizeof(*pt)); -#endif pmap_free_l2_bucket(pmap, &l2->l2_bucket[L2_BUCKET(l1idx)], 0x100); + if (pmap == kernel_pmap) { + SLIST_FOREACH(l1, &l1_list, l1_link) { + l1->l1_kva[l1idx] = *pd; + PTE_SYNC(&l1->l1_kva[l1idx]); + } + } } static void @@ -1658,6 +1651,7 @@ pd_entry_t *pd; pt_entry_t *pt; struct l2_bucket *l2b; + struct l1_ttable *l1; vm_offset_t va0; uint16_t l1idx; uint16_t demote_size; @@ -1684,6 +1678,12 @@ pt = &l2b->l2b_kva[l2pte_index(va0)]; *pd = l2b->l2b_phys | L1_C_DOM(pmap->pm_domain) | L1_C_PROTO; l2b->l2b_occupancy += 0x100; + if (pmap == kernel_pmap) { + SLIST_FOREACH(l1, &l1_list, l1_link) { + l1->l1_kva[l1idx] = *pd; + PTE_SYNC(&l1->l1_kva[l1idx]); + } + } } else { va0 = va & L2_L_FRAME; l2b = pmap_get_l2_bucket(pmap, va0); @@ -3099,6 +3099,8 @@ if ((pv->pv_va & L1_S_ADDR_MASK) >= sva && ((pv->pv_va & L1_S_ADDR_MASK) + L1_S_SIZE) < eva) { + struct l1_ttable *l1; + pmap_destroy_pv_range(pmap, *pd & L1_S_ADDR_MASK, pv->pv_va & L1_S_ADDR_MASK, @@ -3114,6 +3116,18 @@ } *pd = 0; npv = TAILQ_FIRST(&pmap->pm_pvlist); + if (pmap == pmap_kernel()) { + SLIST_FOREACH(l1, &l1_list, + l1_link) { + l1->l1_kva[ + L1_IDX(pv->pv_va & + L1_S_ADDR_MASK)] = 0; + PTE_SYNC( + &l1->l1_kva[L1_IDX( + pv->pv_va & + L1_S_ADDR_MASK)]); + } + } continue; } else pmap_demote(pmap, pv->pv_va); @@ -3577,6 +3591,8 @@ if (l1pte_section_p(pm->pm_l1->l1_kva[L1_IDX(sva)])) { if ((sva & L1_S_OFFSET) == 0 && sva + L1_S_SIZE < eva) { + struct l1_ttable *l1; + /* Change the whole 1MB superpage. */ pd = &pm->pm_l1->l1_kva[L1_IDX(sva)]; if (*pd & L1_S_PROT_W) { @@ -3597,6 +3613,13 @@ vm_page_dirty(m); } } + if (pm == pmap_kernel()) { + SLIST_FOREACH(l1, &l1_list, l1_link) { + l1->l1_kva[L1_IDX(sva)] = + *pd; + PTE_SYNC(&l1->l1_kva[L1_IDX(sva)]); + } + } sva += L1_S_SIZE; continue; } @@ -4282,6 +4305,7 @@ if (l2b == NULL) { pd_entry_t *pd = &pm->pm_l1->l1_kva[L1_IDX(sva)]; if (l1pte_section_p(*pd)) { + struct l1_ttable *l1; /* We can just remove the superpage. */ if ((sva == (sva & L1_S_ADDR_MASK)) && (sva + L1_S_SIZE < eva)) { @@ -4291,6 +4315,14 @@ *pd = 0; flushall = 1; sva += L1_S_SIZE; + if (pm == pmap_kernel()) { + SLIST_FOREACH(l1, &l1_list, + l1_link) { + l1->l1_kva[L1_IDX(sva)] = + 0; + PTE_SYNC(&l1->l1_kva[L1_IDX(sva)]); + } + } continue; } else { pmap_demote(pm, sva); From owner-p4-projects@FreeBSD.ORG Sun Apr 9 19:40:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 664BB16A415; Sun, 9 Apr 2006 19:40:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 425C216A413 for ; Sun, 9 Apr 2006 19:40:24 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C96143D6E for ; Sun, 9 Apr 2006 19:40:23 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39JeNDF009812 for ; Sun, 9 Apr 2006 19:40:23 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39JeMpr009803 for perforce@freebsd.org; Sun, 9 Apr 2006 19:40:22 GMT (envelope-from cognet@freebsd.org) Date: Sun, 9 Apr 2006 19:40:22 GMT Message-Id: <200604091940.k39JeMpr009803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 94863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 19:40:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=94863 Change 94863 by cognet@cognet on 2006/04/09 19:39:31 Be a bit smarter when promoting pages, and don't do it if different small pages into the larger page have different cache mode. This let us mapping PTE as write-through again, instead of forcing writa-back, however that means we have to demote some kernel superpage, if one of them contains PTEs. Affected files ... .. //depot/projects/superpages/src/sys/arm/arm/pmap.c#9 edit .. //depot/projects/superpages/src/sys/arm/include/pmap.h#8 edit Differences ... ==== //depot/projects/superpages/src/sys/arm/arm/pmap.c#9 (text+ko) ==== @@ -220,6 +220,7 @@ static void pmap_promote_large(pmap_t, vm_offset_t va, reservation_t); static void pmap_demote(pmap_t, vm_offset_t); +static void pmap_demote_large(pmap_t, vm_offset_t); static MALLOC_DEFINE(M_VMPMAP, "pmap", "PMAP L1"); @@ -286,6 +287,11 @@ char *_tmppt; +#ifdef ARM_USE_SMALL_ALLOC +extern struct mtx smallalloc_mtx; +extern vm_offset_t alloc_curaddr; +extern vm_offset_t alloc_firstaddr; +#endif /* * Metadata for L1 translation tables. */ @@ -619,11 +625,9 @@ pte_l2_s_cache_mode = L2_B|L2_C; pte_l2_s_cache_mask = L2_S_CACHE_MASK_xscale; -#if 0 pte_l1_s_cache_mode_pt = L1_S_C; pte_l2_l_cache_mode_pt = L2_C; pte_l2_s_cache_mode_pt = L2_C; -#endif #ifdef XSCALE_CACHE_READ_WRITE_ALLOCATE /* * The XScale core has an enhanced mode where writes that @@ -682,9 +686,6 @@ xscale_use_minidata = 1; #endif - pte_l1_s_cache_mode_pt = pte_l1_s_cache_mode; - pte_l2_l_cache_mode_pt = pte_l2_s_cache_mode; - pte_l2_s_cache_mode_pt = pte_l2_s_cache_mode; pte_l2_s_prot_u = L2_S_PROT_U_xscale; pte_l2_s_prot_w = L2_S_PROT_W_xscale; pte_l2_s_prot_mask = L2_S_PROT_MASK_xscale; @@ -1099,9 +1100,7 @@ #ifndef PMAP_INCLUDE_PTE_SYNC struct l2_bucket *l2b; pt_entry_t *ptep, pte; -#ifdef ARM_USE_SMALL_ALLOC pd_entry_t *pde; -#endif vm_offset_t va = (vm_offset_t)mem & ~PAGE_MASK; /* @@ -1112,33 +1111,38 @@ * page tables, we simply fix up the cache-mode here if it's not * correct. */ + pde = &kernel_pmap->pm_l1->l1_kva[L1_IDX(va)]; #ifdef ARM_USE_SMALL_ALLOC - pde = &kernel_pmap->pm_l1->l1_kva[L1_IDX(va)]; - if (l1pte_section_p(*pde) && va < 0xd0000000 && va > virtual_avail) - panic("ouin"); - if (!l1pte_section_p(*pde)) { + if (l1pte_section_p(*pde) && va >= alloc_firstaddr) + return (0); #endif + if (l1pte_section_p(*pde) && (*pde & pte_l1_s_cache_mask) != + pte_l1_s_cache_mode_pt) + pmap_demote_large(pmap_kernel(), va); + else if (l1pte_section_p(*pde)) + return (0); + + l2b = pmap_get_l2_bucket(pmap_kernel(), va); + ptep = &l2b->l2b_kva[l2pte_index(va)]; + if ((*ptep & L2_TYPE_MASK) == L2_TYPE_L && + (*ptep & L2_L_CACHE_MASK) != pte_l2_l_cache_mode_pt) { + pmap_demote(pmap_kernel(), va); l2b = pmap_get_l2_bucket(pmap_kernel(), va); - ptep = &l2b->l2b_kva[l2pte_index(va)]; - if ((*ptep & L2_TYPE_MASK) == L2_TYPE_L) - panic("fuxor"); - pte = *ptep; + } + pte = *ptep; - if ((pte & L2_S_CACHE_MASK) != pte_l2_s_cache_mode_pt) { - /* - * Page tables must have the cache-mode set to - * Write-Thru. - */ - *ptep = (pte & ~L2_S_CACHE_MASK) | pte_l2_s_cache_mode_pt; - PTE_SYNC(ptep); - cpu_tlb_flushD_SE(va); - cpu_cpwait(); - } + if ((pte & L2_S_CACHE_MASK) != pte_l2_s_cache_mode_pt) { + /* + * Page tables must have the cache-mode set to + * Write-Thru. + */ + *ptep = (pte & ~L2_S_CACHE_MASK) | pte_l2_s_cache_mode_pt; + PTE_SYNC(ptep); + cpu_tlb_flushD_SE(va); + cpu_cpwait(); -#ifdef ARM_USE_SMALL_ALLOC } #endif -#endif memset(mem, 0, L2_TABLE_SIZE_REAL); PTE_SYNC_RANGE(mem, L2_TABLE_SIZE_REAL / sizeof(pt_entry_t)); return (0); @@ -1551,6 +1555,7 @@ int i; pt_entry_t *ptep; vm_paddr_t pa0; + int cachemode; ptep = &l2b->l2b_kva[l2pte_index(va & L2_L_FRAME)]; pa0 = *ptep & L2_L_FRAME; @@ -1574,10 +1579,14 @@ if (*ptep & L2_S_PROT_W) pa0 |= L2_L_PROT_W; /* Let's do it. */ + if ((*ptep & pte_l2_s_cache_mask) == pte_l2_s_cache_mode) + cachemode = pte_l2_l_cache_mode; + else + cachemode = pte_l2_l_cache_mode_pt; for (i = 0; i < 0x10; i++) { pmap_tlb_flushID_SE(pmap, va + i * PAGE_SIZE); ptep[i] = pa0 | L2_L_PROTO | - pte_l2_l_cache_mode; + cachemode; } } @@ -1592,6 +1601,7 @@ struct l1_ttable *l1; uint16_t l1idx; int i; + int cachemode, cachemode2; va0 = va & L1_S_ADDR_MASK; l1idx = L1_IDX(va0); @@ -1614,18 +1624,43 @@ for (i = 1; i < 0x100; i++) { vm_paddr_t pa, pa2; - if ((pt[i] & L2_TYPE_MASK) == L2_TYPE_L) + if ((pt[i] & L2_TYPE_MASK) == L2_TYPE_L) { pa = (pt[i] & L2_L_FRAME) + (i & 0xf) * PAGE_SIZE; - else + if ((pt[i] & pte_l2_l_cache_mask) == + pte_l2_l_cache_mode) + cachemode = pte_l1_s_cache_mode; + else + cachemode = pte_l1_s_cache_mode_pt; + } else { pa = pt[i] & L2_S_FRAME; - if ((pt[i - 1] & L2_TYPE_MASK) == L2_TYPE_L) + if ((pt[i] & pte_l2_s_cache_mask) == + pte_l2_s_cache_mode) + cachemode = pte_l1_s_cache_mode; + else + cachemode = pte_l1_s_cache_mode_pt; + } + if ((pt[i - 1] & L2_TYPE_MASK) == L2_TYPE_L) { pa2 = (pt[i - 1] & L2_L_FRAME) + ((i - 1) & 0xf) * PAGE_SIZE; - else + if ((pt[i - 1] & pte_l2_l_cache_mask) == + pte_l2_l_cache_mode) + cachemode2 = pte_l1_s_cache_mode; + else + cachemode2 = pte_l1_s_cache_mode_pt; + + } else { pa2 = pt[i - 1] & L2_S_FRAME; + if ((pt[i - 1] & pte_l2_s_cache_mask) == + pte_l2_s_cache_mode) + cachemode2 = pte_l1_s_cache_mode; + else + cachemode2 = pte_l1_s_cache_mode_pt; + } if (pa != pa2 + PAGE_SIZE) /* Nothing much we can do. */ return; + if (cachemode != cachemode2) + return; } #ifdef SP_DEBUG printf("promoting large %x\n", va); @@ -1635,7 +1670,7 @@ pa |= L1_S_PROT_U; if (*pt & L2_S_PROT_W) pa |= L1_S_PROT_W; - *pd = L1_S_PROTO | pa | pte_l1_s_cache_mode | L1_S_DOM(pmap->pm_domain); + *pd = L1_S_PROTO | pa | cachemode | L1_S_DOM(pmap->pm_domain); pmap_free_l2_bucket(pmap, &l2->l2_bucket[L2_BUCKET(l1idx)], 0x100); if (pmap == kernel_pmap) { SLIST_FOREACH(l1, &l1_list, l1_link) { @@ -1645,6 +1680,69 @@ } } +/* + * Special case of pmap_demote(), where we know we want to demote a section + * mapping into large pages, except for the concerned page. + */ + +static void +pmap_demote_large(pmap_t pmap, vm_offset_t va) +{ + pd_entry_t *pd; + pt_entry_t *pt; + struct l2_bucket *l2b; + struct l1_ttable *l1; + vm_offset_t va0; + uint16_t l1idx; + vm_paddr_t pa; + int i; + int mode_l = 0, mode_s = 0; + +#ifdef SP_DEBUG + printf("demoting section mapping at %x\n", va); +#endif + l1idx = L1_IDX(va); + pd = &pmap->pm_l1->l1_kva[l1idx]; + va0 = va & L1_S_ADDR_MASK; + if (pmap == pmap_kernel()) + l2b = pmap_get_l2_bucket(pmap, va0); + else + l2b = pmap_alloc_l2_bucket(pmap, va0, M_NOWAIT); + pa = *pd & L1_S_ADDR_MASK; + if (*pd & L1_S_PROT_U) { + mode_l |= L2_L_PROT_U; + mode_s |= L2_S_PROT_U; + } + if (*pd & L1_S_PROT_W) { + mode_l |= L2_L_PROT_W; + mode_s |= L2_S_PROT_W; + } + if ((*pd & pte_l1_s_cache_mask) == pte_l1_s_cache_mode) { + mode_l |= pte_l2_l_cache_mode; + mode_s |= pte_l2_s_cache_mode; + } else { + mode_l |= pte_l2_l_cache_mode_pt; + mode_s |= pte_l2_s_cache_mode_pt; + } + pt = &l2b->l2b_kva[l2pte_index(va0)]; + *pd = l2b->l2b_phys | L1_C_DOM(pmap->pm_domain) | L1_C_PROTO; + l2b->l2b_occupancy += 0x100; + if (pmap == kernel_pmap) { + SLIST_FOREACH(l1, &l1_list, l1_link) { + l1->l1_kva[l1idx] = *pd; + PTE_SYNC(&l1->l1_kva[l1idx]); + } + } + for (i = 0; i < 0x100; i++, pa++) { + if (va0 + i * PAGE_SIZE != va) + pt[i] = (pa & L2_L_FRAME) | mode_l; + else + pt[i] = pa | mode_s; + } + pmap_tlb_flushID(pmap); + +} + static void pmap_demote(pmap_t pmap, vm_offset_t va) { @@ -1657,6 +1755,7 @@ uint16_t demote_size; vm_paddr_t pa; int i; + int cachemode; #ifdef SP_DEBUG printf("demoting %x\n", va); @@ -1675,6 +1774,10 @@ pa |= L2_S_PROT_U; if (*pd & L1_S_PROT_W) pa |= L2_S_PROT_W; + if ((*pd & pte_l1_s_cache_mask) == pte_l1_s_cache_mode) + cachemode = pte_l2_s_cache_mode; + else + cachemode = pte_l2_s_cache_mode_pt; pt = &l2b->l2b_kva[l2pte_index(va0)]; *pd = l2b->l2b_phys | L1_C_DOM(pmap->pm_domain) | L1_C_PROTO; l2b->l2b_occupancy += 0x100; @@ -1696,10 +1799,14 @@ pa |= L2_S_PROT_U; if (*pt & L2_L_PROT_W) pa |= L2_S_PROT_W; + if ((*pt & pte_l2_l_cache_mask) == pte_l2_l_cache_mode) + cachemode = pte_l2_s_cache_mode; + else + cachemode = pte_l2_s_cache_mode_pt; } pa |= L2_S_PROTO; for (i = 0; i < demote_size; i++, pa += PAGE_SIZE) - pt[i] = (pa) | pte_l2_s_cache_mode; + pt[i] = (pa) | cachemode; pmap_tlb_flushID(pmap); } @@ -2661,11 +2768,6 @@ * (physical) address starting relative to 0] */ #define PMAP_STATIC_L2_SIZE 16 -#ifdef ARM_USE_SMALL_ALLOC -extern struct mtx smallalloc_mtx; -extern vm_offset_t alloc_curaddr; -extern vm_offset_t alloc_firstaddr; -#endif void pmap_bootstrap(vm_offset_t firstaddr, vm_offset_t lastaddr, struct pv_addr *l1pt) ==== //depot/projects/superpages/src/sys/arm/include/pmap.h#8 (text+ko) ==== @@ -337,7 +337,7 @@ #define PMAP_NEEDS_PTE_SYNC 1 #define PMAP_INCLUDE_PTE_SYNC #elif (ARM_MMU_SA1 == 0) -#if 1 +#if defined(CPU_ARM9) && !defined(ARM9_CACHE_WRITE_THROUGH) #define PMAP_NEEDS_PTE_SYNC 1 #define PMAP_INCLUDE_PTE_SYNC #else From owner-p4-projects@FreeBSD.ORG Sun Apr 9 20:02:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4044716A405; Sun, 9 Apr 2006 20:02:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 11A2516A403 for ; Sun, 9 Apr 2006 20:02:51 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D36D143D48 for ; Sun, 9 Apr 2006 20:02:50 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39K2o06021804 for ; Sun, 9 Apr 2006 20:02:50 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39K2oub021798 for perforce@freebsd.org; Sun, 9 Apr 2006 20:02:50 GMT (envelope-from cognet@freebsd.org) Date: Sun, 9 Apr 2006 20:02:50 GMT Message-Id: <200604092002.k39K2oub021798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 94864 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 20:02:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=94864 Change 94864 by cognet@cognet on 2006/04/09 20:01:58 Don't write-back the PTEs, if they are mapped write-through for arm9. This was apparently needed only because skyeye has bugs in its cache emulation. Affected files ... .. //depot/projects/arm/src/sys/arm/include/pmap.h#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/include/pmap.h#6 (text+ko) ==== @@ -336,13 +336,8 @@ #define PMAP_NEEDS_PTE_SYNC 1 #define PMAP_INCLUDE_PTE_SYNC #elif (ARM_MMU_SA1 == 0) -#if defined(CPU_ARM9) && !defined(ARM9_CACHE_WRITE_THROUGH) -#define PMAP_NEEDS_PTE_SYNC 1 -#define PMAP_INCLUDE_PTE_SYNC -#else #define PMAP_NEEDS_PTE_SYNC 0 #endif -#endif /* * These macros return various bits based on kernel/user and protection. From owner-p4-projects@FreeBSD.ORG Sun Apr 9 21:00:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0992A16A406; Sun, 9 Apr 2006 21:00:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D354E16A401 for ; Sun, 9 Apr 2006 21:00:04 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7344043D45 for ; Sun, 9 Apr 2006 21:00:04 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39L049d065499 for ; Sun, 9 Apr 2006 21:00:04 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39L03ai065493 for perforce@freebsd.org; Sun, 9 Apr 2006 21:00:03 GMT (envelope-from jmg@freebsd.org) Date: Sun, 9 Apr 2006 21:00:03 GMT Message-Id: <200604092100.k39L03ai065493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94869 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 21:00:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=94869 Change 94869 by jmg@jmg_carbon-60 on 2006/04/09 20:59:06 first attempt at reorginizing the nexus.. this makes devhandle an ivar, instead of having children pull it from RES_MEMORY, and this also sets up all the interrupts as resources from interrupt-map.. They are indexed by rid on the child, and return the parent's interrupt #... vnex will need to be updated, and I'll do this shortly... also teach hv_pci to pass through interrupt's to the layer, this could get pci ints working.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/nexusvar.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#30 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#7 (text+ko) ==== @@ -36,8 +36,7 @@ struct bus_dma_tag hs_dmatag; - struct resource *hs_intr; - void *hs_intrcookie; + struct resource *hs_intr[4]; struct rman hs_pci_intr_rman; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/nexusvar.h#3 (text+ko) ==== @@ -30,6 +30,15 @@ extern struct bus_dma_tag nexus_dmatag; -#endif /* _MACHINE_NEXUSVAR_H_ */ +enum nexus_ivars { + NEXUS_IVAR_DEVHANDLE, +}; + +#define NEXUS_ACCESSOR(var, ivar, type) \ + __BUS_ACCESSOR(nexus, var, NEXUS, ivar, type) +NEXUS_ACCESSOR(devhandle, DEVHANDLE, uint64_t) +#undef NEXUS_ACCESSOR + +#endif /* _MACHINE_NEXUSVAR_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#30 (text+ko) ==== @@ -189,29 +189,12 @@ sc->hs_devhandle = SUN4V_REG_SPEC2CFG_HDL(reg); #endif - rid = 0; - if ((sc->hs_intr = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE)) == NULL) { - device_printf(dev, "couldn't map interrupt\n"); - return ENXIO; - } - - /* XXX - Should this be _CLK since we are redistributing intrs? */ - error = bus_setup_intr(dev, sc->hs_intr, INTR_MPSAFE|INTR_TYPE_MISC, - hvpci_intr, sc, &sc->hs_intrcookie); - if (error) { - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_intr), sc->hs_intr); - device_printf(dev, "bus_setup_intr: %d\n", error); - return error; - } - /* initalize intr resources */ sc->hs_pci_intr_rman.rm_type = RMAN_ARRAY; sc->hs_pci_intr_rman.rm_descr = "HyperVisor PCI Interrupts"; if (rman_init(&sc->hs_pci_intr_rman) != 0 || /* XXX - no clue where this should start or end */ - rman_manage_region(&sc->hs_pci_intr_rman, 0, 10) != 0) + rman_manage_region(&sc->hs_pci_intr_rman, 0, 3) != 0) panic("%s: failed to set up intr rman", __func__); /* Pull in the ra addresses out of OFW */ @@ -417,9 +400,37 @@ hvpci_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) { + struct hvpci_softc *sc; + device_t parent; + int pciintr; - device_printf(dev, "attempted setup_intr: child: %p, ires: %p, flags: %#x, intr: %p, arg: %p, cookiep: %p\n", - child, ires, flags, intr, arg, cookiep); + sc = device_get_softc(dev); + parent = device_get_parent(dev); + + /* we use 0 through 3 for INTx interrupts, while sun uses 1 through 4 */ + pciintr = rman_get_start(ires); + KASSERT(pciintr >= 0 && pciintr <= 3, + ("interrupt out of range")); + rid = pciintr + 1; + if (sc->hs_intr[pciintr] != NULL) + return (EBUSY); + + if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(parent, SYS_RES_IRQ, + &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + device_printf(dev, "couldn't alloc interrupt\n"); + return (ENXIO); + } + + error = bus_setup_intr(parent, sc->hs_intr[pciintr], flags, intr, arg, + cookiep); + if (error) { + bus_release_resource(parent, SYS_RES_IRQ, + rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); + sc->hs_intr[pciintr] = NULL; + device_printf(dev, "bus_setup_intr: %d\n", error); + return (error); + } + return (0); } @@ -427,6 +438,22 @@ hvpci_teardown_intr(device_t dev, device_t child, struct resource *vec, void *cookie) { + struct hvpci_softc *sc; + device_t parent; + int pciintr; + int error; + + sc = device_get_softc(dev); + parent = device_get_parent(dev); + pciintr = rman_get_start(vec); + + error = bus_teardown_intr(parent, sc->hs_intr[pciintr], cookie); + if (error) + return (error); + + bus_release_resource(parent, SYS_RES_IRQ, + rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); + sc->hs_intr[pciintr] = NULL; return (0); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#4 (text+ko) ==== @@ -73,9 +73,7 @@ struct ofw_bus_devinfo ndi_obdinfo; struct resource_list ndi_rl; - /* Some common properties. */ - struct nexus_regs *ndi_reg; - int ndi_nreg; + devhandle_t ndi_devhandle; }; struct nexus_softc { @@ -88,6 +86,7 @@ static bus_print_child_t nexus_print_child; static bus_add_child_t nexus_add_child; static bus_probe_nomatch_t nexus_probe_nomatch; +static bus_read_ivar_t nexus_read_ivar; static bus_setup_intr_t nexus_setup_intr; static bus_teardown_intr_t nexus_teardown_intr; static bus_alloc_resource_t nexus_alloc_resource; @@ -114,7 +113,7 @@ /* Bus interface */ DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_probe_nomatch, nexus_probe_nomatch), - DEVMETHOD(bus_read_ivar, bus_generic_read_ivar), + DEVMETHOD(bus_read_ivar, nexus_read_ivar), DEVMETHOD(bus_write_ivar, bus_generic_write_ivar), DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), @@ -279,6 +278,25 @@ type != NULL ? type : "unknown"); } +static int +nexus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) +{ + struct nexus_devinfo *ndi; + + ndi = device_get_ivars(child); + + switch (which) { + case NEXUS_IVAR_DEVHANDLE: + *(uint64_t *)result = ndi->ndi_devhandle; + break; + + default: + return (ENOENT); + } + + return (0); +} + #ifdef SUN4V @@ -286,29 +304,25 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, driver_intr_t *intr, void *arg, void **cookiep) { + struct nexus_devinfo *ndi; + uint64_t ihdl; + uint64_t ino; + int error, cpuid; - uint64_t reg, nreg; - uint64_t ihdl, cfg; - uint64_t ino, nino; - int error, cpuid; + ndi = device_get_ivars(child); if (res == NULL) panic("%s: NULL interrupt resource!", __func__); printf("dev=%s child=%s\n", ofw_bus_get_name(dev), ofw_bus_get_name(child)); - if ((error = bus_get_resource(child, SYS_RES_MEMORY, 0, ®, &nreg))) - goto fail; - - if ((error = bus_get_resource(child, SYS_RES_IRQ, 0, &ino, &nino))) - goto fail; + ino = rman_get_start(ires); printf("child=%s reg=0x%lx ino=0x%lx\n", ofw_bus_get_name(child), - reg, ino); + ndi->ndi_devhandle, ino); - cfg = SUN4V_REG_SPEC2CFG_HDL(reg); - - if (hvio_intr_devino_to_sysino(cfg, (uint32_t)ino, &ihdl) != H_EOK) { + if (hvio_intr_devino_to_sysino(ndi->ndi_devhandle, (uint32_t)ino, + &ihdl) != H_EOK) { error = ENXIO; goto fail; } @@ -509,9 +523,9 @@ struct nexus_regs *reg; bus_addr_t phys; bus_size_t size; - uint32_t ign; + uint32_t ign, naddrcell, nintrcell; uint32_t *intr; - int i; + int i, rid; int nintr; int nreg; @@ -528,44 +542,39 @@ } resource_list_init(&ndi->ndi_rl); nreg = OF_getprop_alloc(node, "reg", sizeof(*reg), (void **)®); - if (nreg == -1) { - device_printf(dev, "<%s>: incomplete\n", - ndi->ndi_obdinfo.obd_name); + if (nreg != 1) { + device_printf(dev, "<%s>: incomplete: %d\n", + ndi->ndi_obdinfo.obd_name, nreg); nexus_destroy_dinfo(ndi); return (NULL); } - for (i = 0; i < nreg; i++) { - phys = NEXUS_REG_PHYS(®[i]); - size = NEXUS_REG_SIZE(®[i]); - resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, i, phys, - phys + size - 1, size); - } + phys = NEXUS_REG_PHYS(®[0]); + ndi->ndi_devhandle = SUN4V_REG_SPEC2CFG_HDL(phys); free(reg, M_OFWPROP); - nintr = OF_getprop_alloc(node, "interrupts", sizeof(*intr), + if (OF_getprop(node, "#address-cells", &naddrcell, + sizeof *naddrcell) != sizeof *naddrcell || OF_getprop(node, + "#interrupt-cells", &nintrcell, sizeof *nintrcell) != + sizeof *nintrcell || nintrcell != 1) + panic("can't get cell sizes"); /* or invalid intr cell size */ + + nintr = OF_getprop_alloc(node, "interrupt-map", sizeof(*intr), (void **)&intr); - if (nintr > 0) { -#ifndef SUN4V - if (OF_getprop(node, cpu_impl < CPU_IMPL_ULTRASPARCIII ? - "upa-portid" : "portid", &ign, sizeof(ign)) <= 0) { - device_printf(dev, "<%s>: could not determine portid\n", - ndi->ndi_obdinfo.obd_name); - nexus_destroy_dinfo(ndi); - return (NULL); - } - - /* XXX Starfire */ - ign = (ign << INTMAP_IGN_SHIFT) & INTMAP_IGN_MASK; -#else - ign = 0; -#endif - for (i = 0; i < nintr; i++) { - intr[i] |= ign; - resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, i, intr[i], - intr[i], 1); - } - free(intr, M_OFWPROP); + for (i = 0; i < nintr; rid++, i += naddrcell + nintrcell + 2) { + /* + * interrupt-map is: + * addr,intr,phandle,parent's intr + */ + rid = intr[i + naddrcell]; + * XXX - technically, we need to pull the parent's + * #interrupt-cells, but we'll assume it's 1 like we enforce + * nintercell to be above. + */ + resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, rid, + intr[i + naddrcell + nintercell + 1], + intr[i + naddrcell + nintercell + 1], 1); } + free(intr, M_OFWPROP); return (ndi); } From owner-p4-projects@FreeBSD.ORG Sun Apr 9 21:06:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D772516A405; Sun, 9 Apr 2006 21:06:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9904816A400 for ; Sun, 9 Apr 2006 21:06:12 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4841F43D48 for ; Sun, 9 Apr 2006 21:06:12 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39L6CPN069620 for ; Sun, 9 Apr 2006 21:06:12 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39L6CRh069617 for perforce@freebsd.org; Sun, 9 Apr 2006 21:06:12 GMT (envelope-from jmg@freebsd.org) Date: Sun, 9 Apr 2006 21:06:12 GMT Message-Id: <200604092106.k39L6CRh069617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94870 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 21:06:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=94870 Change 94870 by jmg@jmg_arlene on 2006/04/09 21:05:55 make compile.. drop hvpci_intr since we just directly register the child's intr w/ the parent... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#31 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#31 (text+ko) ==== @@ -126,16 +126,6 @@ DRIVER_MODULE(hvpci, nexus, hvpci_driver, hvpci_devclass, 0, 0); -static void -hvpci_intr(void *v) -{ - struct hvpci_softc *sc; - - sc = (struct hvpci_softc *)v; - - printf("%s: intr, sc: %p\n", __func__, sc); -} - static int hvpci_probe(device_t dev) { @@ -162,8 +152,8 @@ uint64_t reg, nreg; uint32_t *dvma; int br[2]; - int n, type, error; - int i, nrange, rid; + int n, type; + int i, nrange; sc = device_get_softc(dev); @@ -402,7 +392,8 @@ { struct hvpci_softc *sc; device_t parent; - int pciintr; + int pciintr, rid; + int error; sc = device_get_softc(dev); parent = device_get_parent(dev); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#5 (text+ko) ==== @@ -316,7 +316,7 @@ printf("dev=%s child=%s\n", ofw_bus_get_name(dev), ofw_bus_get_name(child)); - ino = rman_get_start(ires); + ino = rman_get_start(res); printf("child=%s reg=0x%lx ino=0x%lx\n", ofw_bus_get_name(child), ndi->ndi_devhandle, ino); @@ -522,8 +522,7 @@ struct nexus_devinfo *ndi; struct nexus_regs *reg; bus_addr_t phys; - bus_size_t size; - uint32_t ign, naddrcell, nintrcell; + uint32_t naddrcell, nintrcell; uint32_t *intr; int i, rid; int nintr; @@ -553,9 +552,9 @@ free(reg, M_OFWPROP); if (OF_getprop(node, "#address-cells", &naddrcell, - sizeof *naddrcell) != sizeof *naddrcell || OF_getprop(node, - "#interrupt-cells", &nintrcell, sizeof *nintrcell) != - sizeof *nintrcell || nintrcell != 1) + sizeof naddrcell) != sizeof naddrcell || OF_getprop(node, + "#interrupt-cells", &nintrcell, sizeof nintrcell) != + sizeof nintrcell || nintrcell != 1) panic("can't get cell sizes"); /* or invalid intr cell size */ nintr = OF_getprop_alloc(node, "interrupt-map", sizeof(*intr), @@ -566,13 +565,13 @@ * addr,intr,phandle,parent's intr */ rid = intr[i + naddrcell]; - * XXX - technically, we need to pull the parent's + /* XXX - technically, we need to pull the parent's * #interrupt-cells, but we'll assume it's 1 like we enforce * nintercell to be above. */ resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, rid, - intr[i + naddrcell + nintercell + 1], - intr[i + naddrcell + nintercell + 1], 1); + intr[i + naddrcell + nintrcell + 1], + intr[i + naddrcell + nintrcell + 1], 1); } free(intr, M_OFWPROP); From owner-p4-projects@FreeBSD.ORG Sun Apr 9 21:29:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A09E016A402; Sun, 9 Apr 2006 21:29:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F31216A400 for ; Sun, 9 Apr 2006 21:29:41 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A0E043D69 for ; Sun, 9 Apr 2006 21:29:41 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39LTfte080366 for ; Sun, 9 Apr 2006 21:29:41 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39LTe53080363 for perforce@freebsd.org; Sun, 9 Apr 2006 21:29:40 GMT (envelope-from jmg@freebsd.org) Date: Sun, 9 Apr 2006 21:29:40 GMT Message-Id: <200604092129.k39LTe53080363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94872 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 21:29:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=94872 Change 94872 by jmg@jmg_arlene on 2006/04/09 21:29:18 use the ivar to properly set devhandle.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#32 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#32 (text+ko) ==== @@ -55,10 +55,10 @@ #include #include #include +#include #include "pcib_if.h" -#define SUN4V_REG_SPEC2CFG_HDL(x) ((x >> 32) & ~(0xfull << 28)) /* * XXX - should get this through the bus, but Sun overloaded the reg OFW * property, so there isn't normal resources associated w/ this device. @@ -146,10 +146,6 @@ struct hviommu *himp; bus_space_tag_t *btp; phandle_t node; -#if 0 - uint32_t cell; -#endif - uint64_t reg, nreg; uint32_t *dvma; int br[2]; int n, type; @@ -170,14 +166,7 @@ sc->hs_busnum = br[0]; /* Setup the HyperVisor devhandle for this bus */ -#if 0 - if (OF_getprop(node, "reg", &cell, sizeof cell) == -1) - panic("%s: OF_getprop failed.", __func__); - sc->hs_devhandle = cell & 0xfffffff; -#else - bus_get_resource(dev, SYS_RES_MEMORY, 0, ®, &nreg); - sc->hs_devhandle = SUN4V_REG_SPEC2CFG_HDL(reg); -#endif + sc->hs_devhandle = nexus_get_devhandle(dev); /* initalize intr resources */ sc->hs_pci_intr_rman.rm_type = RMAN_ARRAY; From owner-p4-projects@FreeBSD.ORG Sun Apr 9 21:41:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB31516A404; Sun, 9 Apr 2006 21:41:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D04A16A407 for ; Sun, 9 Apr 2006 21:41:57 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EAC243D55 for ; Sun, 9 Apr 2006 21:41:56 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39LfuA1090857 for ; Sun, 9 Apr 2006 21:41:56 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39LfuuG090850 for perforce@freebsd.org; Sun, 9 Apr 2006 21:41:56 GMT (envelope-from jmg@freebsd.org) Date: Sun, 9 Apr 2006 21:41:56 GMT Message-Id: <200604092141.k39LfuuG090850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 21:41:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=94873 Change 94873 by jmg@jmg_arlene on 2006/04/09 21:41:32 remeber, you rarely need to call device_get_parent(), as all the bus_* calls take yourself, and automaticly call your parent's routine w/ your device_t.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#33 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#33 (text+ko) ==== @@ -380,12 +380,10 @@ int flags, driver_intr_t *intr, void *arg, void **cookiep) { struct hvpci_softc *sc; - device_t parent; int pciintr, rid; int error; sc = device_get_softc(dev); - parent = device_get_parent(dev); /* we use 0 through 3 for INTx interrupts, while sun uses 1 through 4 */ pciintr = rman_get_start(ires); @@ -395,16 +393,16 @@ if (sc->hs_intr[pciintr] != NULL) return (EBUSY); - if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(parent, SYS_RES_IRQ, + if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "couldn't alloc interrupt\n"); return (ENXIO); } - error = bus_setup_intr(parent, sc->hs_intr[pciintr], flags, intr, arg, + error = bus_setup_intr(dev, sc->hs_intr[pciintr], flags, intr, arg, cookiep); if (error) { - bus_release_resource(parent, SYS_RES_IRQ, + bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); sc->hs_intr[pciintr] = NULL; device_printf(dev, "bus_setup_intr: %d\n", error); @@ -419,19 +417,17 @@ void *cookie) { struct hvpci_softc *sc; - device_t parent; int pciintr; int error; sc = device_get_softc(dev); - parent = device_get_parent(dev); pciintr = rman_get_start(vec); - error = bus_teardown_intr(parent, sc->hs_intr[pciintr], cookie); + error = bus_teardown_intr(dev, sc->hs_intr[pciintr], cookie); if (error) return (error); - bus_release_resource(parent, SYS_RES_IRQ, + bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); sc->hs_intr[pciintr] = NULL; From owner-p4-projects@FreeBSD.ORG Sun Apr 9 21:52:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3C5316A403; Sun, 9 Apr 2006 21:52:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE07C16A400 for ; Sun, 9 Apr 2006 21:52:09 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FFA243D45 for ; Sun, 9 Apr 2006 21:52:09 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39Lq9k9094295 for ; Sun, 9 Apr 2006 21:52:09 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39Lq915094285 for perforce@freebsd.org; Sun, 9 Apr 2006 21:52:09 GMT (envelope-from jmg@freebsd.org) Date: Sun, 9 Apr 2006 21:52:09 GMT Message-Id: <200604092152.k39Lq915094285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 21:52:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=94874 Change 94874 by jmg@jmg_arlene on 2006/04/09 21:51:31 add intr refcnt so that we know when to deallocate the intr resource... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#34 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#8 (text+ko) ==== @@ -37,6 +37,7 @@ struct bus_dma_tag hs_dmatag; struct resource *hs_intr[4]; + int hs_intrrefcnt[4]; struct rman hs_pci_intr_rman; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#34 (text+ko) ==== @@ -390,21 +390,26 @@ KASSERT(pciintr >= 0 && pciintr <= 3, ("interrupt out of range")); rid = pciintr + 1; - if (sc->hs_intr[pciintr] != NULL) - return (EBUSY); + if (sc->hs_intr[pciintr] == NULL) { + if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, + SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + device_printf(dev, "couldn't alloc interrupt\n"); + return (ENXIO); + } + sc->hs_intrrefcnt[pciintr] = 1; + } else + sc->hs_intrrefcnt[pciintr]++; - if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, SYS_RES_IRQ, - &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { - device_printf(dev, "couldn't alloc interrupt\n"); - return (ENXIO); - } - error = bus_setup_intr(dev, sc->hs_intr[pciintr], flags, intr, arg, cookiep); if (error) { - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); - sc->hs_intr[pciintr] = NULL; + sc->hs_intrrefcnt[pciintr]--; + if (sc->hs_intrrefcnt[pciintr] == 0) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->hs_intr[pciintr]), + sc->hs_intr[pciintr]); + sc->hs_intr[pciintr] = NULL; + } device_printf(dev, "bus_setup_intr: %d\n", error); return (error); } @@ -427,9 +432,12 @@ if (error) return (error); - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); - sc->hs_intr[pciintr] = NULL; + sc->hs_intrrefcnt[pciintr]--; + if (sc->hs_intrrefcnt[pciintr] == 0) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); + sc->hs_intr[pciintr] = NULL; + } return (0); } From owner-p4-projects@FreeBSD.ORG Sun Apr 9 23:06:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BE9D16A404; Sun, 9 Apr 2006 23:06:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A19216A403 for ; Sun, 9 Apr 2006 23:06:39 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B356B43D53 for ; Sun, 9 Apr 2006 23:06:38 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39N6cZ8038119 for ; Sun, 9 Apr 2006 23:06:38 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39N6cJF038116 for perforce@freebsd.org; Sun, 9 Apr 2006 23:06:38 GMT (envelope-from cognet@freebsd.org) Date: Sun, 9 Apr 2006 23:06:38 GMT Message-Id: <200604092306.k39N6cJF038116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 94875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 23:06:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=94875 Change 94875 by cognet@cognet on 2006/04/09 23:06:11 Use CPU_CONTROL_ROUNDROBIN for arm9, it seems to give marginally better performances. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/cpufunc.c#6 (text+ko) ==== @@ -1530,7 +1530,8 @@ cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE - | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE; + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE | + CPU_CONTROL_ROUNDROBIN; cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE From owner-p4-projects@FreeBSD.ORG Sun Apr 9 23:11:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0423C16A40B; Sun, 9 Apr 2006 23:11:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D48C116A407 for ; Sun, 9 Apr 2006 23:11:45 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A27CC43D48 for ; Sun, 9 Apr 2006 23:11:45 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39NBjH6039568 for ; Sun, 9 Apr 2006 23:11:45 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39NBjso039560 for perforce@freebsd.org; Sun, 9 Apr 2006 23:11:45 GMT (envelope-from cognet@freebsd.org) Date: Sun, 9 Apr 2006 23:11:45 GMT Message-Id: <200604092311.k39NBjso039560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 94877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 23:11:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=94877 Change 94877 by cognet@cognet on 2006/04/09 23:11:08 Disable the inclusion of KB920X.hints until it's actually there. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#26 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#26 (text+ko) ==== @@ -29,7 +29,7 @@ include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. -hints "KB920X.hints" #Default places to look for devices. +#hints "KB920X.hints" #Default places to look for devices. #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=arm9 From owner-p4-projects@FreeBSD.ORG Sun Apr 9 23:29:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8590516A404; Sun, 9 Apr 2006 23:29:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F72D16A400 for ; Sun, 9 Apr 2006 23:29:07 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14B1C43D46 for ; Sun, 9 Apr 2006 23:29:07 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39NT636048797 for ; Sun, 9 Apr 2006 23:29:06 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39NT67Q048794 for perforce@freebsd.org; Sun, 9 Apr 2006 23:29:06 GMT (envelope-from jmg@freebsd.org) Date: Sun, 9 Apr 2006 23:29:06 GMT Message-Id: <200604092329.k39NT67Q048794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 23:29:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=94878 Change 94878 by jmg@jmg_arlene on 2006/04/09 23:28:51 return _INVALID_IRQ when requesting an interrupt, we might want to expand this value to anything outside 1 through 4... in route_interrupt, just return the pin... no more routing to do.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#35 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#35 (text+ko) ==== @@ -81,9 +81,7 @@ static pcib_maxslots_t hvpci_maxslots; static pcib_read_config_t hvpci_read_config; static pcib_write_config_t hvpci_write_config; -#ifdef notyet static pcib_route_interrupt_t hvpci_route_interrupt; -#endif static device_method_t hv_pcib_methods[] = { /* Device interface */ @@ -109,9 +107,7 @@ DEVMETHOD(pcib_maxslots, hvpci_maxslots), DEVMETHOD(pcib_read_config, hvpci_read_config), DEVMETHOD(pcib_write_config, hvpci_write_config), -#if 0 DEVMETHOD(pcib_route_interrupt, hvpci_route_interrupt), -#endif { 0, 0 } }; @@ -273,6 +269,8 @@ switch (width) { case 1: ret = data & 0xff; + if (ret == 0 && reg == PCIR_INTLINE) + ret = PCI_INVALID_IRQ; #if 0 printf("%ld = read_config(%#lx, %#x, %d, %d) = %#x\n", r, sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, width, ret); @@ -337,12 +335,12 @@ printf("put failed with: %ld\n", r); } -#ifdef notyet static int hvpci_route_interrupt(device_t bridge, device_t dev, int pin) { + + return (pin); } -#endif static int hvpci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) @@ -385,11 +383,11 @@ sc = device_get_softc(dev); - /* we use 0 through 3 for INTx interrupts, while sun uses 1 through 4 */ + /* sun4v uses 1 through 4 interrupts */ pciintr = rman_get_start(ires); - KASSERT(pciintr >= 0 && pciintr <= 3, + KASSERT(pciintr >= 1 && pciintr <= 4, ("interrupt out of range")); - rid = pciintr + 1; + rid = pciintr; if (sc->hs_intr[pciintr] == NULL) { if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { From owner-p4-projects@FreeBSD.ORG Sun Apr 9 23:39:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C2B516A408; Sun, 9 Apr 2006 23:39:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05C4316A406 for ; Sun, 9 Apr 2006 23:39:46 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98BCC43D55 for ; Sun, 9 Apr 2006 23:39:45 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k39Ndjws056557 for ; Sun, 9 Apr 2006 23:39:45 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k39NdjiM056551 for perforce@freebsd.org; Sun, 9 Apr 2006 23:39:45 GMT (envelope-from jmg@freebsd.org) Date: Sun, 9 Apr 2006 23:39:45 GMT Message-Id: <200604092339.k39NdjiM056551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94880 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 23:39:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=94880 Change 94880 by jmg@jmg_arlene on 2006/04/09 23:38:44 move comment to be w/ the assert.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#36 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#36 (text+ko) ==== @@ -383,8 +383,8 @@ sc = device_get_softc(dev); + pciintr = rman_get_start(ires); /* sun4v uses 1 through 4 interrupts */ - pciintr = rman_get_start(ires); KASSERT(pciintr >= 1 && pciintr <= 4, ("interrupt out of range")); rid = pciintr; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:02:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ED3316A404; Mon, 10 Apr 2006 03:02:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1439516A401 for ; Mon, 10 Apr 2006 03:02:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 922E243D48 for ; Mon, 10 Apr 2006 03:02:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A32n1w076670 for ; Mon, 10 Apr 2006 03:02:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A32mZD076664 for perforce@freebsd.org; Mon, 10 Apr 2006 03:02:48 GMT (envelope-from jb@freebsd.org) Date: Mon, 10 Apr 2006 03:02:48 GMT Message-Id: <200604100302.k3A32mZD076664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 94881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:02:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=94881 Change 94881 by jb@jb_freebsd2 on 2006/04/10 03:02:47 Add a kernel option to enable Dtrace. Affected files ... .. //depot/projects/dtrace/src/sys/conf/options#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/options#2 (text+ko) ==== @@ -599,6 +599,7 @@ PCFCLOCK_VERBOSE opt_pcfclock.h PCFCLOCK_MAX_RETRIES opt_pcfclock.h +DTRACE opt_dtrace.h KTR opt_global.h KTR_ALQ opt_ktr.h KTR_MASK opt_ktr.h From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:09:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CCAF16A403; Mon, 10 Apr 2006 03:09:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28FFC16A401 for ; Mon, 10 Apr 2006 03:09:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A658B43D45 for ; Mon, 10 Apr 2006 03:09:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A39wLw078551 for ; Mon, 10 Apr 2006 03:09:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A39wPg078548 for perforce@freebsd.org; Mon, 10 Apr 2006 03:09:58 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 03:09:58 GMT Message-Id: <200604100309.k3A39wPg078548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:10:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=94882 Change 94882 by imp@imp_hammer on 2006/04/10 03:09:00 I've rewritten this one from scratch. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#3 (text+ko) ==== @@ -1,47 +1,39 @@ -/******************************************************************************* +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. * - * Filename: main.c + * 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. * - * Basic entry points for top-level functions - * - * Revision information: - * - * 20AUG2004 kb_admin initial creation - * 12JAN2005 kb_admin cosmetic changes - * 29APR2005 kb_admin modified boot delay - * - * BEGIN_KBDD_BLOCK - * No warranty, expressed or implied, is included with this software. It is - * provided "AS IS" and no warranty of any kind including statutory or aspects - * relating to merchantability or fitness for any purpose is provided. All - * intellectual property rights of others is maintained with the respective - * owners. This software is not copyrighted and is intended for reference - * only. - * END_BLOCK - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 "debug_io.h" -#include "at91rm9200_lowlevel.h" #include "AT91RM9200.h" typedef void fn_t(void); -/* - * .KB_C_FN_DEFINITION_START - * int main(void) - * This global function waits at least one second, but not more than two - * seconds, for input from the serial port. If no response is recognized, - * it acts according to the parameters specified by the environment. For - * example, the function might boot an operating system. Do not return - * from this function. - * .KB_C_FN_DEFINITION_END - */ int main(void) { char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ fn_t *fn = (fn_t *)addr; + DebugPrint("FreeBSD AT91 serial bootstrap. XModem download.\r\n"); AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC10; xmodem_rx(addr); AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:10:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E5D616A404; Mon, 10 Apr 2006 03:10:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C66E16A465 for ; Mon, 10 Apr 2006 03:10:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 291F343D49 for ; Mon, 10 Apr 2006 03:09:59 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A39wiv078557 for ; Mon, 10 Apr 2006 03:09:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A39wrJ078554 for perforce@freebsd.org; Mon, 10 Apr 2006 03:09:58 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 03:09:58 GMT Message-Id: <200604100309.k3A39wrJ078554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:10:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=94883 Change 94883 by imp@imp_hammer on 2006/04/10 03:09:30 Simplify. This bums us 22 more bytes. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#2 (text+ko) ==== @@ -24,6 +24,8 @@ #include "at91rm9200_lowlevel.h" #include "debug_io.h" +#define BAUD 115200 + /* ****************************** GLOBALS *************************************/ @@ -31,59 +33,6 @@ #define AT91C_US_ASYNC_MODE (AT91C_US_USMODE_NORMAL + AT91C_US_NBSTOP_1_BIT + AT91C_US_PAR_NONE + AT91C_US_CHRL_8_BITS + AT91C_US_CLKS_CLOCK) - -/* - * .KB_C_FN_DEFINITION_START - * void Enable_Debug_USART(AT91PS_USART pUSART) - * This private function enables and configures the debug uart. - * .KB_C_FN_DEFINITION_END - */ -/* -static void Enable_Debug_USART(AT91PS_USART pUSART) { - - AT91PS_PDC pPDC = (AT91PS_PDC)&(pUSART->US_RPR); - AT91PS_PIO pPio = (AT91PS_PIO)AT91C_BASE_PIOA; - - pPio->PIO_ASR = - ((unsigned)AT91C_PA31_DTXD) | ((unsigned)AT91C_PA30_DRXD); - pPio->PIO_BSR = 0; - pPio->PIO_PDR = - ((unsigned)AT91C_PA31_DTXD) | ((unsigned)AT91C_PA30_DRXD); - - pUSART->US_IDR = (unsigned int) -1; - - pUSART->US_CR = - AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS; - - pUSART->US_BRGR = ((((AT91C_MASTER_CLOCK*10)/(115200*16))+5)/10); - - pUSART->US_TTGR = 0; - - pPDC->PDC_PTCR = AT91C_PDC_RXTDIS; - pPDC->PDC_PTCR = AT91C_PDC_TXTDIS; - - pPDC->PDC_TNPR = 0; - pPDC->PDC_TNCR = 0; - - pPDC->PDC_RNPR = 0; - pPDC->PDC_RNCR = 0; - - pPDC->PDC_TPR = 0; - pPDC->PDC_TCR = 0; - - pPDC->PDC_RPR = 0; - pPDC->PDC_RCR = 0; - - pPDC->PDC_PTCR = AT91C_PDC_RXTEN; - pPDC->PDC_PTCR = AT91C_PDC_TXTEN; - - pUSART->US_MR = AT91C_US_ASYNC_MODE; - - pUSART->US_CR = AT91C_US_TXEN; - pUSART->US_CR = AT91C_US_RXEN; -} -*/ - /* ************************** GLOBAL FUNCTIONS ********************************/ @@ -93,8 +42,9 @@ * Returns a value read from the RTC for use as a rough seconds counter. * .KB_C_FN_DEFINITION_END */ -unsigned GetSeconds(void) { - return (((AT91PS_RTC)AT91C_BASE_RTC)->RTC_TIMR & AT91C_RTC_SEC); +unsigned GetSeconds(void) +{ + return (AT91C_BASE_RTC->RTC_TIMR & AT91C_RTC_SEC); } @@ -104,7 +54,12 @@ * If no system config info is found, config the board for default parameters. * .KB_C_FN_DEFINITION_END */ -void DefaultSystemInit(void) { +void DefaultSystemInit(void) +{ + AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; + AT91PS_PDC pPDC = (AT91PS_PDC)&(pUSART->US_RPR); + AT91PS_PIO pPio = AT91C_BASE_PIOA; + register unsigned value; int i; @@ -121,7 +76,7 @@ // set PLLA = 180MHz // assume main osc = 10Mhz // div = 5 , out = 2 (150MHz = 240MHz) - value = ((AT91PS_CKGR)AT91C_BASE_CKGR)->CKGR_PLLAR; + value = AT91C_BASE_CKGR->CKGR_PLLAR; value &= ~AT91C_CKGR_DIVA; value &= ~AT91C_CKGR_OUTA; #ifdef USE_80P_20M_CLOCKS @@ -130,23 +85,23 @@ value |= (OSC_MAIN_FREQ_DIV | AT91C_CKGR_OUTA_2); #endif value |= AT91C_CKGR_SRCA; - ((AT91PS_CKGR)AT91C_BASE_CKGR)->CKGR_PLLAR = value; + AT91C_BASE_CKGR->CKGR_PLLAR = value; // mul = 90 - value = ((AT91PS_CKGR)AT91C_BASE_CKGR)->CKGR_PLLAR; + value = AT91C_BASE_CKGR->CKGR_PLLAR; value &= ~AT91C_CKGR_MULA; #ifdef USE_80P_20M_CLOCKS value |= (39 << 16); #else value |= (89 << 16); #endif - ((AT91PS_CKGR)AT91C_BASE_CKGR)->CKGR_PLLAR = value; + AT91C_BASE_CKGR->CKGR_PLLAR = value; // wait for lock - while (!((((AT91PS_PMC)AT91C_BASE_PMC)->PMC_SR) & AT91C_PMC_LOCKA)) ; + while (!((AT91C_BASE_PMC->PMC_SR) & AT91C_PMC_LOCKA)) ; // change divider = 3, pres = 1 - value = ((AT91PS_PMC)AT91C_BASE_PMC)->PMC_MCKR; + value = AT91C_BASE_PMC->PMC_MCKR; value &= ~AT91C_PMC_MDIV; #ifdef USE_80P_20M_CLOCKS value |= AT91C_PMC_MDIV_4; @@ -155,28 +110,18 @@ #endif value &= ~AT91C_PMC_PRES; value |= AT91C_PMC_PRES_CLK; - ((AT91PS_PMC)AT91C_BASE_PMC)->PMC_MCKR = value; + AT91C_BASE_PMC->PMC_MCKR = value; // wait for update - while (!((((AT91PS_PMC)AT91C_BASE_PMC)->PMC_SR) & AT91C_PMC_MCKRDY)) ; + while (!((AT91C_BASE_PMC->PMC_SR) & AT91C_PMC_MCKRDY)) ; // change CSS = PLLA value &= ~AT91C_PMC_CSS; value |= AT91C_PMC_CSS_PLLA_CLK; - ((AT91PS_PMC)AT91C_BASE_PMC)->PMC_MCKR = value; + AT91C_BASE_PMC->PMC_MCKR = value; // wait for update - while (!((((AT91PS_PMC)AT91C_BASE_PMC)->PMC_SR) & AT91C_PMC_MCKRDY)) ; - - // setup flash access (allow ample margin) - // 9 wait states, 1 setup, 1 hold, 1 float for 8-bit device - ((AT91PS_SMC2)AT91C_BASE_SMC2)->SMC2_CSR[0] = - AT91C_SMC2_WSEN | - (9 & AT91C_SMC2_NWS) | - ((1 << 8) & AT91C_SMC2_TDF) | - AT91C_SMC2_DBW_8 | - ((1 << 24) & AT91C_SMC2_RWSETUP) | - ((1 << 29) & AT91C_SMC2_RWHOLD); + while (!((AT91C_BASE_PMC->PMC_SR) & AT91C_PMC_MCKRDY)) ; // setup SDRAM access // EBI chip-select register (CS1 = SDRAM controller) @@ -190,9 +135,9 @@ value = ((AT91PS_EBI)AT91C_BASE_EBI)->EBI_CSA; value &= ~AT91C_EBI_CS1A; value |= AT91C_EBI_CS1A_SDRAMC; - ((AT91PS_EBI)AT91C_BASE_EBI)->EBI_CSA = value; + AT91C_BASE_EBI->EBI_CSA = value; - ((AT91PS_SDRC)AT91C_BASE_SDRC)->SDRC_CR = + AT91C_BASE_SDRC->SDRC_CR = AT91C_SDRC_NC_9 | AT91C_SDRC_NR_13 | AT91C_SDRC_NB_4_BANKS | @@ -205,11 +150,11 @@ ((6 << 27) & AT91C_SDRC_TXSR); - ((AT91PS_SDRC)AT91C_BASE_SDRC)->SDRC_MR = + AT91C_BASE_SDRC->SDRC_MR = AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_PRCGALL_CMD; *(unsigned short*)SDRAM_BASE = 0; - ((AT91PS_SDRC)AT91C_BASE_SDRC)->SDRC_MR = + AT91C_BASE_SDRC->SDRC_MR = AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_RFSH_CMD; *(unsigned short*)SDRAM_BASE = 0; *(unsigned short*)SDRAM_BASE = 0; @@ -220,64 +165,45 @@ *(unsigned short*)SDRAM_BASE = 0; *(unsigned short*)SDRAM_BASE = 0; - ((AT91PS_SDRC)AT91C_BASE_SDRC)->SDRC_MR = + AT91C_BASE_SDRC->SDRC_MR = AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_LMR_CMD; *(unsigned short*)SDRAM_BASE = 0; - ((AT91PS_SDRC)AT91C_BASE_SDRC)->SDRC_TR = - 7 * AT91C_MASTER_CLOCK / 1000000; + AT91C_BASE_SDRC->SDRC_TR = 7 * AT91C_MASTER_CLOCK / 1000000; *(unsigned short*)SDRAM_BASE = 0; - ((AT91PS_SDRC)AT91C_BASE_SDRC)->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_NORMAL_CMD; + AT91C_BASE_SDRC->SDRC_MR = + AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_NORMAL_CMD; *(unsigned short*)SDRAM_BASE = 0; // Configure DBGU -use local routine optimized for space - // Enable_Debug_USART((AT91PS_USART)AT91C_BASE_DBGU); - { - AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; - AT91PS_PDC pPDC = (AT91PS_PDC)&(pUSART->US_RPR); - AT91PS_PIO pPio = (AT91PS_PIO)AT91C_BASE_PIOA; + pPio->PIO_ASR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; + pPio->PIO_BSR = 0; + pPio->PIO_PDR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; + pUSART->US_IDR = (unsigned int) -1; + pUSART->US_CR = + AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS; + pUSART->US_BRGR = ((((AT91C_MASTER_CLOCK*10)/(BAUD*16))+5)/10); + pUSART->US_TTGR = 0; + pPDC->PDC_PTCR = AT91C_PDC_RXTDIS; + pPDC->PDC_PTCR = AT91C_PDC_TXTDIS; + pPDC->PDC_TNPR = 0; + pPDC->PDC_TNCR = 0; - pPio->PIO_ASR = - ((unsigned)AT91C_PA31_DTXD) | ((unsigned)AT91C_PA30_DRXD); - pPio->PIO_BSR = 0; - pPio->PIO_PDR = - ((unsigned)AT91C_PA31_DTXD) | ((unsigned)AT91C_PA30_DRXD); + pPDC->PDC_RNPR = 0; + pPDC->PDC_RNCR = 0; - pUSART->US_IDR = (unsigned int) -1; + pPDC->PDC_TPR = 0; + pPDC->PDC_TCR = 0; - pUSART->US_CR = - AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS; + pPDC->PDC_RPR = 0; + pPDC->PDC_RCR = 0; - pUSART->US_BRGR = ((((AT91C_MASTER_CLOCK*10)/(115200*16))+5)/10); + pPDC->PDC_PTCR = AT91C_PDC_RXTEN; + pPDC->PDC_PTCR = AT91C_PDC_TXTEN; - pUSART->US_TTGR = 0; - - pPDC->PDC_PTCR = AT91C_PDC_RXTDIS; - pPDC->PDC_PTCR = AT91C_PDC_TXTDIS; - - pPDC->PDC_TNPR = 0; - pPDC->PDC_TNCR = 0; - - pPDC->PDC_RNPR = 0; - pPDC->PDC_RNCR = 0; - - pPDC->PDC_TPR = 0; - pPDC->PDC_TCR = 0; - - pPDC->PDC_RPR = 0; - pPDC->PDC_RCR = 0; - - pPDC->PDC_PTCR = AT91C_PDC_RXTEN; - pPDC->PDC_PTCR = AT91C_PDC_TXTEN; - - pUSART->US_MR = AT91C_US_ASYNC_MODE; - - pUSART->US_CR = AT91C_US_TXEN; - pUSART->US_CR = AT91C_US_RXEN; - } - while (1) - DebugPutc('C'); + pUSART->US_MR = AT91C_US_ASYNC_MODE; + pUSART->US_CR = AT91C_US_TXEN; + pUSART->US_CR = AT91C_US_RXEN; } From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:12:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A62AF16A402; Mon, 10 Apr 2006 03:12:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5804716A400 for ; Mon, 10 Apr 2006 03:12:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F62643D46 for ; Mon, 10 Apr 2006 03:12:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A3C1H2080013 for ; Mon, 10 Apr 2006 03:12:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A3C18s080005 for perforce@freebsd.org; Mon, 10 Apr 2006 03:12:01 GMT (envelope-from jb@freebsd.org) Date: Mon, 10 Apr 2006 03:12:01 GMT Message-Id: <200604100312.k3A3C18s080005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 94884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=94884 Change 94884 by jb@jb_freebsd2 on 2006/04/10 03:11:38 Build the /usr/src/cddl libs and programs unless the NO_CDDL build option is defined. Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#2 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#2 (text+ko) ==== @@ -37,6 +37,9 @@ # We must do etc last for install/distribute to work. # SUBDIR= share/info include lib libexec bin +.if !defined(NO_CDDL) +SUBDIR+=cddl +.endif .if ${MK_GAMES} != "no" SUBDIR+=games .endif From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:16:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB77B16A405; Mon, 10 Apr 2006 03:16:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A27E116A403 for ; Mon, 10 Apr 2006 03:16:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7120943D45 for ; Mon, 10 Apr 2006 03:16:07 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A3G7Lh083586 for ; Mon, 10 Apr 2006 03:16:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A3G7s8083580 for perforce@freebsd.org; Mon, 10 Apr 2006 03:16:07 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 03:16:07 GMT Message-Id: <200604100316.k3A3G7s8083580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:16:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=94885 Change 94885 by imp@imp_hammer on 2006/04/10 03:15:56 The boot loader strings aren't needed for this application. This saves 256 bytes! Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/arm_init.s#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/arm_init.s#2 (text+ko) ==== @@ -80,11 +80,6 @@ bl DefaultSystemInit -/* - ldr r1, = SVC_STACK_USE - mov sp, r1 @ ; Move the stack to SDRAM - */ - /* Start execution at main */ .extern main @@ -96,15 +91,3 @@ infiniteLoop: b infiniteLoop - -/* the following section is used to store boot commands in */ -/* non-volatile memory. */ - - .global BootCommandSection -BootCommandSection: - .string "Bootloader for KB9202 Evaluation Board." - .string "c 0x20210000 0x10100000 0x80000 " - .string "m 0 0 0 0 0 0 " - .string "t 0x20000100 console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933" - .string "e 0x10000000 " - .string " " From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:20:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A58A16A410; Mon, 10 Apr 2006 03:20:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD14416A408 for ; Mon, 10 Apr 2006 03:20:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0C6E43D5A for ; Mon, 10 Apr 2006 03:20:12 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A3KCC2086385 for ; Mon, 10 Apr 2006 03:20:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A3KCoA086379 for perforce@freebsd.org; Mon, 10 Apr 2006 03:20:12 GMT (envelope-from jb@freebsd.org) Date: Mon, 10 Apr 2006 03:20:12 GMT Message-Id: <200604100320.k3A3KCoA086379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 94886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=94886 Change 94886 by jb@jb_freebsd2 on 2006/04/10 03:19:24 Add a cddl directory for code covered by Sun's CDDL like we handle GPL'd kernel code. This should probably only be added to the CSCOPEDIRS if the cddl directory exists. If someone building a kernel doesn't want CDDL code included they could just leave out the cddl /usr/src/sys/cddl directory. I wonder why we don't do this for the /usr/src/sys/gnu directory? Hmmm. Affected files ... .. //depot/projects/dtrace/src/sys/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/Makefile#2 (text+ko) ==== @@ -10,7 +10,7 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ +CSCOPEDIRS= cddl coda compat conf contrib crypto ddb dev fs gnu i4b isa \ isofs kern libkern modules net netatalk netatm netgraph \ netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ nfsclient nfs4client rpc pccard pci posix4 sys ufs vm \ From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:20:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 369AD16A44C; Mon, 10 Apr 2006 03:20:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEF9416A409 for ; Mon, 10 Apr 2006 03:20:16 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 160ED43D5C for ; Mon, 10 Apr 2006 03:20:13 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A3KC3c086394 for ; Mon, 10 Apr 2006 03:20:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A3KCDH086388 for perforce@freebsd.org; Mon, 10 Apr 2006 03:20:12 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 03:20:12 GMT Message-Id: <200604100320.k3A3KCDH086388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=94887 Change 94887 by imp@imp_hammer on 2006/04/10 03:19:58 Shave a bit more. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/debug_io.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/debug_io.c#2 (text+ko) ==== @@ -36,23 +36,6 @@ pUSART->US_THR = (cValue & 0x1FF); } - -/* - * .KB_C_FN_DEFINITION_START - * void DebugPrint(char *) - * This global function writes a string to the debug uart port. - * .KB_C_FN_DEFINITION_END - */ -void DebugPrint(char *buffer) { - - if (!buffer) return; - - while(*buffer != '\0') { - DebugPutc(*buffer++); - } -} - - /* * .KB_C_FN_DEFINITION_START * int DebugGetchar(char *) ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ fn_t *fn = (fn_t *)addr; - DebugPrint("FreeBSD AT91 serial bootstrap. XModem download.\r\n"); AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC10; xmodem_rx(addr); AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:30:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 869E816A405; Mon, 10 Apr 2006 03:30:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6421816A401 for ; Mon, 10 Apr 2006 03:30:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C65DD43D48 for ; Mon, 10 Apr 2006 03:30:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A3UPl6089627 for ; Mon, 10 Apr 2006 03:30:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A3UPtm089621 for perforce@freebsd.org; Mon, 10 Apr 2006 03:30:25 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 03:30:25 GMT Message-Id: <200604100330.k3A3UPtm089621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=94888 Change 94888 by imp@imp_hammer on 2006/04/10 03:29:42 bum a few more bytes by making GetSeconds() inline. We're down to 1236 bytes. This should allow us to grow a bit for automatic Master Clock detection. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#3 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#2 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/debug_io.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#3 (text+ko) ==== @@ -38,18 +38,6 @@ /* * .KB_C_FN_DEFINITION_START - * unsigned GetSeconds(void) - * Returns a value read from the RTC for use as a rough seconds counter. - * .KB_C_FN_DEFINITION_END - */ -unsigned GetSeconds(void) -{ - return (AT91C_BASE_RTC->RTC_TIMR & AT91C_RTC_SEC); -} - - -/* - * .KB_C_FN_DEFINITION_START * void DefaultSystemInit(void) * If no system config info is found, config the board for default parameters. * .KB_C_FN_DEFINITION_END ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#2 (text+ko) ==== @@ -42,8 +42,8 @@ #endif +#define GetSeconds() (AT91C_BASE_RTC->RTC_TIMR & AT91C_RTC_SEC) -extern unsigned GetSeconds(void); extern void DefaultSystemInit(void); #endif /* _AT91RM9200_LOWLEVEL_H_ */ ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/debug_io.c#3 (text+ko) ==== @@ -19,6 +19,7 @@ ******************************************************************************/ #include "AT91RM9200.h" +#include "at91rm9200_lowlevel.h" /* * .KB_C_FN_DEFINITION_START @@ -27,11 +28,14 @@ * as it is ready to send another character. * .KB_C_FN_DEFINITION_END */ -void DebugPutc(char cValue) { +void +DebugPutc(char cValue) +{ AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; - while (!(pUSART->US_CSR & AT91C_US_TXRDY)) ; + while (!(pUSART->US_CSR & AT91C_US_TXRDY)) + continue; pUSART->US_THR = (cValue & 0x1FF); } @@ -44,8 +48,9 @@ * the function returns 0 if not character was available. * .KB_C_FN_DEFINITION_END */ -int DebugGetchar(char *retChar) { - +int +DebugGetchar(char *retChar) +{ AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; if ((pUSART->US_CSR & AT91C_US_RXRDY)) { @@ -64,17 +69,17 @@ * the pointer. Otherwise, the function returns 0. * .KB_C_FN_DEFINITION_END */ -int WaitForChar(char *cPtr, int seconds) { - +int +WaitForChar(char *cPtr, int seconds) +{ unsigned thisSecond; ++seconds; thisSecond = GetSeconds(); while (seconds) { - if (DebugGetchar(cPtr)) { + if (DebugGetchar(cPtr)) return (1); - } if (GetSeconds() != thisSecond) { --seconds; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:42:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DC0D16A403; Mon, 10 Apr 2006 03:42:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD7D716A401 for ; Mon, 10 Apr 2006 03:42:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACA7543D45 for ; Mon, 10 Apr 2006 03:42:42 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A3gg9n099523 for ; Mon, 10 Apr 2006 03:42:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A3ggNY099517 for perforce@freebsd.org; Mon, 10 Apr 2006 03:42:42 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 03:42:42 GMT Message-Id: <200604100342.k3A3ggNY099517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:42:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=94892 Change 94892 by imp@imp_hammer on 2006/04/10 03:41:49 Fix the makefile Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#2 (text+ko) ==== @@ -27,10 +27,12 @@ OBJCOPY=objcopy LD=ld CFLAGS=-O2 -mcpu=arm9 -ffreestanding +PROG=boot0 -bootloader: ${CFILES} ${ASFILES} - ${LD} -e 0 -o bootloader.out -T linker.cfg ${ASFILES} ${CFILES} - ${OBJCOPY} -O binary bootloader.out bootloader.bin +${PROG}.bin: ${PROG}.out + ${OBJCOPY} -O binary ${PROG}.out ${PROG}.bin +${PROG}.out: ${CFILES} ${ASFILES} + ${LD} -e 0 -o ${PROG}.out -T linker.cfg ${ASFILES} ${CFILES} clean: - rm -f *.o + rm -f ${CFILES} ${ASFILES} ${PROG}.out ${PROG}.bin From owner-p4-projects@FreeBSD.ORG Mon Apr 10 03:48:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A342516A40D; Mon, 10 Apr 2006 03:48:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8216916A402 for ; Mon, 10 Apr 2006 03:48:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8347D43D5C for ; Mon, 10 Apr 2006 03:48:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A3moZ8099951 for ; Mon, 10 Apr 2006 03:48:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A3mo3Z099948 for perforce@freebsd.org; Mon, 10 Apr 2006 03:48:50 GMT (envelope-from jb@freebsd.org) Date: Mon, 10 Apr 2006 03:48:50 GMT Message-Id: <200604100348.k3A3mo3Z099948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 94893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 03:48:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=94893 Change 94893 by jb@jb_freebsd2 on 2006/04/10 03:48:26 Dtrace has a super-user utility too. It's called... wait for it... dtrace. Fancy that! Wonders never cease. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= lib usr.bin +SUBDIR= lib usr.bin usr.sbin .include From owner-p4-projects@FreeBSD.ORG Mon Apr 10 04:17:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E881D16A404; Mon, 10 Apr 2006 04:17:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9386D16A402 for ; Mon, 10 Apr 2006 04:17:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B85343D48 for ; Mon, 10 Apr 2006 04:17:26 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A4HQGk018071 for ; Mon, 10 Apr 2006 04:17:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A4HQ04018063 for perforce@freebsd.org; Mon, 10 Apr 2006 04:17:26 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 04:17:26 GMT Message-Id: <200604100417.k3A4HQ04018063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 04:17:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=94896 Change 94896 by imp@imp_hammer on 2006/04/10 04:16:57 You don't need a complicated state machine for xmodem, at least the limited subset we're doing. Optimize things a bit. This gets us another 50 bytes: 1164 bytes. 1024 in striking distance, but those last 140 bytes are going to be very hard. Good think we have about 11k to run in :-). Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.c#2 (text+ko) ==== @@ -43,11 +43,6 @@ SEND_NAK }; -static char packetNumber; - -#define TransitionState(x, y) (x = y) - - /* * .KB_C_FN_DEFINITION_START * int GetRecord(char , char *) @@ -55,25 +50,27 @@ * returns non-zero on success. * .KB_C_FN_DEFINITION_END */ -static int GetRecord(char blocknum, char *dest) { +static int +GetRecord(char blocknum, char *dest) +{ int size; char nextChar; unsigned chk, j; chk = 0; - if (!WaitForChar(&nextChar, 1)) { - return (0); - } - - if ((char)nextChar != (char)~blocknum) { - return (0); - } - + if (!WaitForChar(&nextChar, 1)) + goto err; + if (nextChar != blocknum) + goto err; + if (!WaitForChar(&nextChar, 1)) + goto err; + if ((char)nextChar != (char)~blocknum) + goto err; + for (size = 0; size < PACKET_SIZE; ++size) { - if (!WaitForChar(&nextChar, 1)) { - return (0); - } + if (!WaitForChar(&nextChar, 1)) + goto err; chk = chk ^(int)nextChar << 8; for (j = 0; j < 8; ++j) { if (chk & 0x8000) @@ -86,17 +83,17 @@ chk &= 0xFFFF; - if ((!WaitForChar(&nextChar, 1)) || (nextChar != ((chk >> 8) & 0xFF))) { - return (0); - } - - if ((!WaitForChar(&nextChar, 1)) || (nextChar != (chk & 0xFF))) { - return (0); - } - + if ((!WaitForChar(&nextChar, 1)) || (nextChar != ((chk >> 8) & 0xFF))) + goto err; + if ((!WaitForChar(&nextChar, 1)) || (nextChar != (chk & 0xFF))) + goto err; DebugPutc(ACK); return (1); +err:; + DebugPutc(NAK); + // We should allow for resend, but we don't. + return (0); } @@ -111,60 +108,31 @@ * -1 on error. * .KB_C_FN_DEFINITION_END */ -int xmodem_rx(char *dest) { +int +xmodem_rx(char *dest) +{ + int starting; + char packetNumber, nextChar, *startAddress = dest; - int state; - char nextChar, *startAddress = dest; - packetNumber = 1; - state = WAITING_START; + starting = 1; while (1) { - - if (state == WAITING_START) { + if (starting) DebugPutc('C'); - if (WaitForChar(&nextChar, 1)) { - if (nextChar == SOH) { - TransitionState(state, RX_PACKET); - } - } + if (!WaitForChar(&nextChar, 1) || + (nextChar != SOH && nextChar != EOT)) + continue; + if (nextChar == EOT) { + DebugPutc(ACK); + return (dest - startAddress); } - - if (state == WAIT_SOH) { - if (!WaitForChar(&nextChar, 1)) { - return (-1); - } - - if (nextChar == SOH) { - TransitionState(state, RX_PACKET); - } - - if (nextChar == EOT) { - // TransitionState(state, RX_EOT); - DebugPutc(ACK); - return (dest - startAddress); - } - } - - if (state == RX_PACKET) { - if (!WaitForChar(&nextChar, 1)) { - return (-1); - } - - if (nextChar != packetNumber) { - // TransitionState(state, SEND_NAK); - DebugPutc(NAK); - return (-1); - } - - if (GetRecord(packetNumber, dest)) { - dest += PACKET_SIZE; - ++packetNumber; - TransitionState(state, WAIT_SOH); - } else { - return (-1); - } - } + starting = 0; + // Xmodem packets: SOH PKT# ~PKT# 128-bytes CRC16 + if (!GetRecord(packetNumber, dest)) + return (-1); + dest += PACKET_SIZE; + packetNumber++; } // the loop above should return in all cases From owner-p4-projects@FreeBSD.ORG Mon Apr 10 04:38:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2540D16A404; Mon, 10 Apr 2006 04:38:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D677516A400 for ; Mon, 10 Apr 2006 04:38:52 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A48B443D58 for ; Mon, 10 Apr 2006 04:38:52 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A4cq1N029775 for ; Mon, 10 Apr 2006 04:38:52 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A4cqMx029772 for perforce@freebsd.org; Mon, 10 Apr 2006 04:38:52 GMT (envelope-from jmg@freebsd.org) Date: Mon, 10 Apr 2006 04:38:52 GMT Message-Id: <200604100438.k3A4cqMx029772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 04:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=94897 Change 94897 by jmg@jmg_arlene on 2006/04/10 04:38:07 don't put the end too far out.. forgot to divide by the IO_PAGE_SIZE.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#6 (text+ko) ==== @@ -220,7 +220,7 @@ end = him->him_dvmabase + him->him_dvmasize - 1; if (rman_init(&him->him_rman) != 0 || rman_manage_region(&him->him_rman, him->him_dvmabase >> - IO_PAGE_SHIFT, end) != 0) + IO_PAGE_SHIFT, end >> IO_PAGE_SHIFT) != 0) panic("%s: can't initalize rman", __func__); return him; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 04:59:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 739BD16A405; Mon, 10 Apr 2006 04:59:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3271516A403 for ; Mon, 10 Apr 2006 04:59:18 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9EDD43D73 for ; Mon, 10 Apr 2006 04:59:17 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A4xHM1048041 for ; Mon, 10 Apr 2006 04:59:17 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A4xHqv048035 for perforce@freebsd.org; Mon, 10 Apr 2006 04:59:17 GMT (envelope-from jmg@freebsd.org) Date: Mon, 10 Apr 2006 04:59:17 GMT Message-Id: <200604100459.k3A4xHqv048035@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 04:59:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=94899 Change 94899 by jmg@jmg_carbon-60 on 2006/04/10 04:59:05 move interrupts to per devhandle as the uniqueness is devhandle+devino and not just devino.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#6 (text+ko) ==== @@ -72,12 +72,12 @@ struct nexus_devinfo { struct ofw_bus_devinfo ndi_obdinfo; struct resource_list ndi_rl; + struct rman ndi_intr_rman; - devhandle_t ndi_devhandle; + devhandle_t ndi_devhandle; }; struct nexus_softc { - struct rman sc_intr_rman; struct rman sc_mem_rman; }; @@ -203,13 +203,9 @@ panic("%s: OF_peer failed.", __func__); sc = device_get_softc(dev); - sc->sc_intr_rman.rm_type = RMAN_ARRAY; - sc->sc_intr_rman.rm_descr = "Interrupts"; sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "Device Memory"; - if (rman_init(&sc->sc_intr_rman) != 0 || - rman_init(&sc->sc_mem_rman) != 0 || - rman_manage_region(&sc->sc_intr_rman, 0, IV_MAX - 1) != 0 || + if (rman_init(&sc->sc_mem_rman) != 0 || rman_manage_region(&sc->sc_mem_rman, 0ULL, ~0ULL) != 0) panic("%s: failed to set up rmans.", __func__); @@ -408,6 +404,7 @@ u_long start, u_long end, u_long count, u_int flags) { struct nexus_softc *sc; + struct nexus_devinfo *ndi; struct rman *rm; struct resource *rv; struct resource_list_entry *rle; @@ -417,6 +414,7 @@ needactivate = flags & RF_ACTIVE; passthrough = (device_get_parent(child) != bus); sc = device_get_softc(bus); + ndi = device_get_ivars(child); rle = NULL; if (!passthrough) { @@ -435,7 +433,7 @@ switch (type) { case SYS_RES_IRQ: - rm = &sc->sc_intr_rman; + rm = &ndi->ndi_intr_rman; break; case SYS_RES_MEMORY: rm = &sc->sc_mem_rman; @@ -575,6 +573,12 @@ } free(intr, M_OFWPROP); + ndi->ndi_intr_rman.rm_type = RMAN_ARRAY; + ndi->ndi_intr_rman.rm_descr = "Interrupts"; + if (rman_init(&ndi->ndi_intr_rman) != 0 || + rman_manage_region(&ndi->ndi_intr_rman, 0, IV_MAX - 1) != 0 || + panic("%s: failed to set up rmans.", __func__); + return (ndi); } From owner-p4-projects@FreeBSD.ORG Mon Apr 10 05:48:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D1A616A405; Mon, 10 Apr 2006 05:48:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4839716A401 for ; Mon, 10 Apr 2006 05:48:25 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 150E443D4C for ; Mon, 10 Apr 2006 05:48:25 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A5mOQ2073872 for ; Mon, 10 Apr 2006 05:48:24 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A5mOVa073869 for perforce@freebsd.org; Mon, 10 Apr 2006 05:48:24 GMT (envelope-from jmg@freebsd.org) Date: Mon, 10 Apr 2006 05:48:24 GMT Message-Id: <200604100548.k3A5mOVa073869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 05:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=94902 Change 94902 by jmg@jmg_carbon-60 on 2006/04/10 05:47:57 get the immediate subordinant device.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#7 (text+ko) ==== @@ -404,7 +404,6 @@ u_long start, u_long end, u_long count, u_int flags) { struct nexus_softc *sc; - struct nexus_devinfo *ndi; struct rman *rm; struct resource *rv; struct resource_list_entry *rle; @@ -414,7 +413,6 @@ needactivate = flags & RF_ACTIVE; passthrough = (device_get_parent(child) != bus); sc = device_get_softc(bus); - ndi = device_get_ivars(child); rle = NULL; if (!passthrough) { @@ -433,6 +431,14 @@ switch (type) { case SYS_RES_IRQ: + /* find the immediate subordinate */ + struct nexus_devinfo *ndi; + device_t subord; + + subord = child; + while (device_get_parent(subord) != bus) + subord = device_get_parent(subord); + ndi = device_get_ivars(subord); rm = &ndi->ndi_intr_rman; break; case SYS_RES_MEMORY: From owner-p4-projects@FreeBSD.ORG Mon Apr 10 05:50:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EC7916A405; Mon, 10 Apr 2006 05:50:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D00416A400 for ; Mon, 10 Apr 2006 05:50:28 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08B8E43D53 for ; Mon, 10 Apr 2006 05:50:28 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A5oRtY074091 for ; Mon, 10 Apr 2006 05:50:27 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A5oRPs074085 for perforce@freebsd.org; Mon, 10 Apr 2006 05:50:27 GMT (envelope-from jmg@freebsd.org) Date: Mon, 10 Apr 2006 05:50:27 GMT Message-Id: <200604100550.k3A5oRPs074085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 05:50:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=94903 Change 94903 by jmg@jmg_arlene on 2006/04/10 05:50:10 make compile.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#8 (text+ko) ==== @@ -306,14 +306,14 @@ int error, cpuid; ndi = device_get_ivars(child); - + if (res == NULL) panic("%s: NULL interrupt resource!", __func__); printf("dev=%s child=%s\n", ofw_bus_get_name(dev), ofw_bus_get_name(child)); ino = rman_get_start(res); - + printf("child=%s reg=0x%lx ino=0x%lx\n", ofw_bus_get_name(child), ndi->ndi_devhandle, ino); @@ -339,7 +339,7 @@ error = ENXIO; goto fail; } - + if ((rman_get_flags(res) & RF_SHAREABLE) == 0) flags |= INTR_EXCL; @@ -407,6 +407,8 @@ struct rman *rm; struct resource *rv; struct resource_list_entry *rle; + struct nexus_devinfo *ndi; + device_t subord; int isdefault, needactivate, passthrough; isdefault = (start == 0UL && end == ~0UL); @@ -432,9 +434,6 @@ switch (type) { case SYS_RES_IRQ: /* find the immediate subordinate */ - struct nexus_devinfo *ndi; - device_t subord; - subord = child; while (device_get_parent(subord) != bus) subord = device_get_parent(subord); @@ -582,7 +581,7 @@ ndi->ndi_intr_rman.rm_type = RMAN_ARRAY; ndi->ndi_intr_rman.rm_descr = "Interrupts"; if (rman_init(&ndi->ndi_intr_rman) != 0 || - rman_manage_region(&ndi->ndi_intr_rman, 0, IV_MAX - 1) != 0 || + rman_manage_region(&ndi->ndi_intr_rman, 0, IV_MAX - 1) != 0) panic("%s: failed to set up rmans.", __func__); return (ndi); From owner-p4-projects@FreeBSD.ORG Mon Apr 10 08:14:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F20E616A405; Mon, 10 Apr 2006 08:13:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C30B516A400 for ; Mon, 10 Apr 2006 08:13:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A94143D4C for ; Mon, 10 Apr 2006 08:13:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A8DwPX054604 for ; Mon, 10 Apr 2006 08:13:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3A8DwQV054567 for perforce@freebsd.org; Mon, 10 Apr 2006 08:13:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 10 Apr 2006 08:13:58 GMT Message-Id: <200604100813.k3A8DwQV054567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 94907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 08:14:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=94907 Change 94907 by rwatson@rwatson_sesame on 2006/04/10 08:12:57 Integrate trustedbsd_acl_nfsv4. Affected files ... .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.arm#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/README#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_slice.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/i386/isa/npx.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/kern/uipc_proto.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/posix4/ksched.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/sys/mac.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/sys/mac_policy.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -89,6 +89,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -207,9 +208,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -226,9 +225,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -313,6 +310,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/cpufunc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.9 2005/05/25 13:46:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.10 2006/04/09 23:07:31 cognet Exp $"); #include @@ -1530,7 +1530,8 @@ cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE - | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE; + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE | + CPU_CONTROL_ROUNDROBIN; cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/swtch.S#3 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.18 2005/10/04 20:47:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.19 2006/04/09 20:16:47 cognet Exp $"); /* @@ -467,7 +467,7 @@ bl _C_LABEL(fork_exit) /* Kill irq"s */ mrs r0, cpsr - orr r0, r0, #(I32_bit) + orr r0, r0, #(I32_bit|F32_bit) msr cpsr_c, r0 DO_AST PULLFRAME ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/trap.c#3 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.23 2006/03/01 20:43:51 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.24 2006/04/09 20:16:47 cognet Exp $"); #include @@ -271,9 +271,13 @@ /* Grab the current pcb */ pcb = td->td_pcb; /* Re-enable interrupts if they were enabled previously */ - if (td->td_md.md_spinlock_count == 0 && - __predict_true(tf->tf_spsr & I32_bit) == 0) - enable_interrupts(I32_bit); + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(tf->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(tf->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + /* Invoke the appropriate handler, if necessary */ if (__predict_false(data_aborts[fsr & FAULT_TYPE_MASK].func != NULL)) { @@ -487,6 +491,7 @@ mode = TRAP_USERMODE(tf) ? "user" : "kernel"; + disable_interrupts(I32_bit|F32_bit); if (td != NULL) { printf("Fatal %s mode data abort: '%s'\n", mode, data_aborts[fsr & FAULT_TYPE_MASK].desc); @@ -730,9 +735,13 @@ thread_user_enter(td); } fault_pc = tf->tf_pc; - if (td->td_md.md_spinlock_count == 0 && - __predict_true((tf->tf_spsr & I32_bit) == 0)) - enable_interrupts(I32_bit); + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(tf->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(tf->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + /* See if the cpu state needs to be fixed up */ @@ -1012,9 +1021,13 @@ * Since all syscalls *should* come from user mode it will always * be safe to enable them, but check anyway. */ - if (td->td_md.md_spinlock_count == 0 && !(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); - + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(frame->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(frame->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + syscall(td, frame, insn); } ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/undefined.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.12 2006/03/01 18:33:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.13 2006/04/09 20:16:47 cognet Exp $"); #include #include @@ -189,7 +189,7 @@ /* Enable interrupts if they were enabled before the exception. */ if (!(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); + enable_interrupts(I32_bit|F32_bit); frame->tf_pc -= INSN_SIZE; PCPU_LAZY_INC(cnt.v_trap); ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.3 2006/03/18 01:35:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.4 2006/04/06 04:32:29 imp Exp $"); #include #include @@ -201,11 +201,14 @@ struct at91_ivar *ivar; kid = device_add_child_ordered(dev, prio, name, unit); - if (kid == NULL) - return; + if (kid == NULL) { + printf("Can't add child %s%d ordered\n", name, unit); + return; + } ivar = malloc(sizeof(*ivar), M_DEVBUF, M_WAITOK | M_ZERO); if (ivar == NULL) { device_delete_child(dev, kid); + printf("Can't add alloc ivar\n"); return; } device_set_ivars(kid, ivar); ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.2 2006/04/06 04:31:19 imp Exp $"); #include #include @@ -40,7 +40,10 @@ #include #include -#include + +#include +#include +#include "iicbus_if.h" struct at91_twi_softc { @@ -50,13 +53,12 @@ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ int flags; -#define XFER_PENDING 1 /* true when transfer taking place */ -#define OPENED 2 /* Device opened */ #define RXRDY 4 -#define TXCOMP 8 #define TXRDY 0x10 - struct cdev *cdev; uint32_t cwgr; + int sc_started; + int twi_addr; + device_t iicbus; }; static inline uint32_t @@ -79,7 +81,6 @@ #define AT91_TWI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define AT91_TWI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define AT91_TWI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); -#define CDEV2SOFTC(dev) ((dev)->si_drv1) #define TWI_DEF_CLK 100000 static devclass_t at91_twi_devclass; @@ -95,19 +96,6 @@ static int at91_twi_activate(device_t dev); static void at91_twi_deactivate(device_t dev); -/* cdev routines */ -static d_open_t at91_twi_open; -static d_close_t at91_twi_close; -static d_ioctl_t at91_twi_ioctl; - -static struct cdevsw at91_twi_cdevsw = -{ - .d_version = D_VERSION, - .d_open = at91_twi_open, - .d_close = at91_twi_close, - .d_ioctl = at91_twi_ioctl -}; - static int at91_twi_probe(device_t dev) { @@ -137,20 +125,23 @@ AT91_TWI_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_twi_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "twi%d", device_get_unit(dev)); - if (sc->cdev == NULL) { - err = ENOMEM; - goto out; - } - sc->cdev->si_drv1 = sc; - sc->cwgr = TWI_CWGR_CKDIV(1) | + sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); + + WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | + TWI_SR_NACK); + + if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) + device_printf(dev, "could not allocate iicbus instance\n"); + + /* probe and attach the iicbus */ + bus_generic_attach(dev); + out:; if (err) at91_twi_deactivate(dev); @@ -160,7 +151,15 @@ static int at91_twi_detach(device_t dev) { - return (EBUSY); /* XXX */ + struct at91_twi_softc *sc; + int rv; + + sc = device_get_softc(dev); + at91_twi_deactivate(dev); + if (sc->iicbus && (rv = device_delete_child(dev, sc->iicbus)) != 0) + return (rv); + + return (0); } static int @@ -215,13 +214,12 @@ /* Reading the status also clears the interrupt */ status = RD4(sc, TWI_SR); + printf("status %x\n", status); if (status == 0) return; AT91_TWI_LOCK(sc); if (status & TWI_SR_RXRDY) sc->flags |= RXRDY; - if (status & TWI_SR_TXCOMP) - sc->flags |= TXCOMP; if (status & TWI_SR_TXRDY) sc->flags |= TXRDY; AT91_TWI_UNLOCK(sc); @@ -229,191 +227,196 @@ return; } -static int -at91_twi_open(struct cdev *dev, int oflags, int devtype, struct thread *td) +static int +at91_twi_wait_stop_done(struct at91_twi_softc *sc) +{ + int err = 0; + + while (!(RD4(sc, TWI_SR) & TWI_SR_TXCOMP)) + continue; + return (err); +} + +/* + * Stop the transfer by entering a STOP state on the iic bus. For read + * operations, we've already entered the STOP state, since we need to do + * that to read the last character. For write operations, we need to + * wait for the TXCOMP bit to turn on before returning. + */ +static int +at91_twi_stop(device_t dev) { struct at91_twi_softc *sc; + int err = 0; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - if (!(sc->flags & OPENED)) { - sc->flags |= OPENED; - WR4(sc, TWI_IER, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); + sc = device_get_softc(dev); + if (sc->sc_started) { + WR4(sc, TWI_CR, TWI_CR_STOP); + err = at91_twi_wait_stop_done(sc); } - AT91_TWI_UNLOCK(sc); - return (0); + return (err); } +/* + * enter a START condition without requiring the device to be in a STOP + * state. + */ static int -at91_twi_close(struct cdev *dev, int fflag, int devtype, struct thread *td) +at91_twi_repeated_start(device_t dev, u_char slave, int timeout) { struct at91_twi_softc *sc; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - sc->flags &= ~OPENED; - WR4(sc, TWI_IDR, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); - AT91_TWI_UNLOCK(sc); + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_DADR(slave)); + WR4(sc, TWI_CR, TWI_CR_START); + sc->sc_started = 1; return (0); } - +/* + * enter a START condition from an idle state. + */ static int -at91_twi_read_master(struct at91_twi_softc *sc, struct at91_twi_io *xfr) +at91_twi_start(device_t dev, u_char slave, int timeout) { - uint8_t *walker; - uint8_t buffer[256]; - size_t len; - int err = 0; + struct at91_twi_softc *sc; - if (xfr->xfer_len > sizeof(buffer)) - return (EINVAL); - walker = buffer; - len = xfr->xfer_len; - RD4(sc, TWI_RHR); - // Master mode, with the right address and interal addr size - WR4(sc, TWI_MMR, TWI_MMR_IADRSZ(xfr->iadrsz) | TWI_MMR_MREAD | - TWI_MMR_DADR(xfr->dadr)); - WR4(sc, TWI_IADR, xfr->iadr); + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_DADR(slave)); WR4(sc, TWI_CR, TWI_CR_START); - while (len-- > 1) { - while (!(sc->flags & RXRDY)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird", - 0); - if (err) - return (err); - } - sc->flags &= ~RXRDY; - *walker++ = RD4(sc, TWI_RHR) & 0xff; - } - WR4(sc, TWI_CR, TWI_CR_STOP); - while (!(sc->flags & TXCOMP)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird2", 0); - if (err) - return (err); - } - sc->flags &= ~TXCOMP; - *walker = RD4(sc, TWI_RHR) & 0xff; - if (xfr->xfer_buf) { - AT91_TWI_UNLOCK(sc); - err = copyout(buffer, xfr->xfer_buf, xfr->xfer_len); - AT91_TWI_LOCK(sc); - } - return (err); + sc->sc_started = 1; + return (0); } static int -at91_twi_write_master(struct at91_twi_softc *sc, struct at91_twi_io *xfr) +at91_twi_write(device_t dev, char *buf, int len, int *sent, int timeout /* us */) { + struct at91_twi_softc *sc; uint8_t *walker; - uint8_t buffer[256]; - size_t len; - int err; + int err = 0; - if (xfr->xfer_len > sizeof(buffer)) - return (EINVAL); - walker = buffer; - len = xfr->xfer_len; - AT91_TWI_UNLOCK(sc); - err = copyin(xfr->xfer_buf, buffer, xfr->xfer_len); + walker = buf; + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_MWRITE | RD4(sc, TWI_MMR)); AT91_TWI_LOCK(sc); - if (err) - return (err); - /* Setup the xfr for later readback */ - xfr->xfer_buf = 0; - xfr->xfer_len = 1; + WR4(sc, TWI_IER, TWI_SR_TXRDY); while (len--) { - WR4(sc, TWI_MMR, TWI_MMR_IADRSZ(xfr->iadrsz) | TWI_MMR_MWRITE | - TWI_MMR_DADR(xfr->dadr)); - WR4(sc, TWI_IADR, xfr->iadr++); WR4(sc, TWI_THR, *walker++); - WR4(sc, TWI_CR, TWI_CR_START); - /* - * If we get signal while waiting for TXRDY, make sure we - * try to stop this device - */ while (!(sc->flags & TXRDY)) { err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr", 0); if (err) - break; + goto errout; } - WR4(sc, TWI_CR, TWI_CR_STOP); - if (err) - return (err); - while (!(sc->flags & TXCOMP)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr2", + } +errout:; + WR4(sc, TWI_IDR, TWI_SR_TXRDY); + AT91_TWI_UNLOCK(sc); + return (err); +} + +static int +at91_twi_read(device_t dev, char *buf, int len, int *read, int last, + int delay /* us */) +{ + struct at91_twi_softc *sc; + char *walker; + int err = 0; + + walker = buf; + sc = device_get_softc(dev); + AT91_TWI_LOCK(sc); + WR4(sc, TWI_MMR, ~TWI_MMR_MWRITE & RD4(sc, TWI_MMR)); + WR4(sc, TWI_IER, TWI_SR_RXRDY); + while (len-- > 0) { + err = 0; + while (!(sc->flags & RXRDY)) { + err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird", 0); if (err) - return (err); + goto errout; } - /* Readback */ - at91_twi_read_master(sc, xfr); + sc->flags &= ~RXRDY; + *walker++ = RD4(sc, TWI_RHR) & 0xff; + if (len == 1 && last) + break; } + if (!last) + goto errout; + WR4(sc, TWI_CR, TWI_CR_STOP); + err = at91_twi_wait_stop_done(sc); + *walker = RD4(sc, TWI_RHR) & 0xff; + if (read) + *read = walker - buf; + sc->sc_started = 0; +errout:; + WR4(sc, TWI_IDR, TWI_SR_RXRDY); + AT91_TWI_UNLOCK(sc); return (err); } static int -at91_twi_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, - struct thread *td) +at91_twi_rst_card(device_t dev, u_char speed, u_char addr, u_char *oldaddr) { - int err = 0; struct at91_twi_softc *sc; + int ckdiv, rate; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - while (sc->flags & XFER_PENDING) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, - "twiwait", 0); - if (err) { - AT91_TWI_UNLOCK(sc); - return (err); - } - } - sc->flags |= XFER_PENDING; + sc = device_get_softc(dev); + if (oldaddr) + *oldaddr = sc->twi_addr; + if (addr != 0) + sc->twi_addr = 0; + else + sc->twi_addr = addr; + + rate = 1; + + /* + * 8 * is because "rate == 1" -> 4 clocks down, 4 clocks up. The + * speeds are for 1.5kb/s, 45kb/s and 90kb/s. + */ + switch (speed) { + case IIC_SLOW: + ckdiv = 8 * AT91C_MASTER_CLOCK / 1500; + break; + + case IIC_FAST: + ckdiv = 8 * AT91C_MASTER_CLOCK / 45000; + break; - switch (cmd) - { - case TWIIOCXFER: - { - struct at91_twi_io *xfr = (struct at91_twi_io *)data; - switch (xfr->type) - { - case TWI_IO_READ_MASTER: - err = at91_twi_read_master(sc, xfr); - break; - case TWI_IO_WRITE_MASTER: - err = at91_twi_write_master(sc, xfr); - break; - default: - err = EINVAL; - break; - } + case IIC_UNKNOWN: + case IIC_FASTEST: + default: + ckdiv = 8 * AT91C_MASTER_CLOCK / 90000; break; } - case TWIIOCSETCLOCK: - { - struct at91_twi_clock *twick = (struct at91_twi_clock *)data; + sc->cwgr = TWI_CWGR_CKDIV(ckdiv) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(rate)) | + TWI_CWGR_CLDIV(TWI_CWGR_DIV(rate)); + WR4(sc, TWI_CR, TWI_CR_SWRST); + WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); + WR4(sc, TWI_CWGR, sc->cwgr); + + return EIO; +} + +static int +at91_twi_callback(device_t dev, int index, caddr_t *data) +{ + int error = 0; + + switch (index) { + case IIC_REQUEST_BUS: + break; - sc->cwgr = TWI_CWGR_CKDIV(twick->ckdiv) | - TWI_CWGR_CHDIV(TWI_CWGR_DIV(twick->high_rate)) | - TWI_CWGR_CLDIV(TWI_CWGR_DIV(twick->low_rate)); - WR4(sc, TWI_CR, TWI_CR_SWRST); - WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); - WR4(sc, TWI_CWGR, sc->cwgr); + case IIC_RELEASE_BUS: break; - } + default: - err = ENOTTY; - break; + error = EINVAL; } - sc->flags &= ~XFER_PENDING; - AT91_TWI_UNLOCK(sc); - wakeup(sc); - return err; + + return (error); } static device_method_t at91_twi_methods[] = { @@ -422,6 +425,14 @@ DEVMETHOD(device_attach, at91_twi_attach), DEVMETHOD(device_detach, at91_twi_detach), + /* iicbus interface */ + DEVMETHOD(iicbus_callback, at91_twi_callback), + DEVMETHOD(iicbus_repeated_start, at91_twi_repeated_start), + DEVMETHOD(iicbus_start, at91_twi_start), + DEVMETHOD(iicbus_stop, at91_twi_stop), + DEVMETHOD(iicbus_write, at91_twi_write), + DEVMETHOD(iicbus_read, at91_twi_read), + DEVMETHOD(iicbus_reset, at91_twi_rst_card), { 0, 0 } }; ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_usartreg.h#2 (text) ==== @@ -22,30 +22,30 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.2 2006/04/06 04:29:24 imp Exp $ */ #ifndef AT91USARTREG_H_ #define AT91USARTREG_H_ #define USART_CR 0x00 /* Control register */ -#define USART_CR_RSTRX (1 << 2) /* Reset Receiver */ -#define USART_CR_RSTTX (1 << 3) /* Reset Transmitter */ -#define USART_CR_RXEN (1 << 4) /* Receiver Enable */ -#define USART_CR_RXDIS (1 << 5) /* Receiver Disable */ -#define USART_CR_TXEN (1 << 6) /* Transmitter Enable */ -#define USART_CR_TXDIS (1 << 7) /* Transmitter Disable */ -#define USART_CR_RSTSTA (1 << 8) /* Reset Status Bits */ -#define USART_CR_STTBRK (1 << 9) /* Start Break */ -#define USART_CR_STPBRK (1 << 10) /* Stop Break */ -#define USART_CR_STTTO (1 << 11) /* Start Time-out */ -#define USART_CR_SENDA (1 << 12) /* Send Address */ -#define USART_CR_RSTIT (1 << 13) /* Reset Iterations */ -#define USART_CR_RSTNACK (1 << 14) /* Reset Non Acknowledge */ -#define USART_CR_RETTO (1 << 15) /* Rearm Time-out */ -#define USART_CR_DTREN (1 << 16) /* Data Terminal ready Enable */ -#define USART_CR_DTRDIS (1 << 17) /* Data Terminal ready Disable */ -#define USART_CR_RTSEN (1 << 18) /* Request to Send enable */ -#define USART_CR_RTSDIS (1 << 19) /* Request to Send Disable */ +#define USART_CR_RSTRX (1UL << 2) /* Reset Receiver */ +#define USART_CR_RSTTX (1UL << 3) /* Reset Transmitter */ +#define USART_CR_RXEN (1UL << 4) /* Receiver Enable */ +#define USART_CR_RXDIS (1UL << 5) /* Receiver Disable */ +#define USART_CR_TXEN (1UL << 6) /* Transmitter Enable */ +#define USART_CR_TXDIS (1UL << 7) /* Transmitter Disable */ +#define USART_CR_RSTSTA (1UL << 8) /* Reset Status Bits */ +#define USART_CR_STTBRK (1UL << 9) /* Start Break */ +#define USART_CR_STPBRK (1UL << 10) /* Stop Break */ +#define USART_CR_STTTO (1UL << 11) /* Start Time-out */ +#define USART_CR_SENDA (1UL << 12) /* Send Address */ +#define USART_CR_RSTIT (1UL << 13) /* Reset Iterations */ +#define USART_CR_RSTNACK (1UL << 14) /* Reset Non Acknowledge */ +#define USART_CR_RETTO (1UL << 15) /* Rearm Time-out */ +#define USART_CR_DTREN (1UL << 16) /* Data Terminal ready Enable */ +#define USART_CR_DTRDIS (1UL << 17) /* Data Terminal ready Disable */ +#define USART_CR_RTSEN (1UL << 18) /* Request to Send enable */ +#define USART_CR_RTSDIS (1UL << 19) /* Request to Send Disable */ #define USART_MR 0x04 /* Mode register */ #define USART_MR_MODE_NORMAL 0 /* Normal/Async/3-wire rs-232 */ @@ -91,28 +91,28 @@ #define USART_IMR 0x10 /* Interrupt mask register */ #define USART_CSR 0x14 /* Channel status register */ -#define USART_CSR_RXRDY (1U << 0) /* Receiver ready */ -#define USART_CSR_TXRDY (1U << 1) /* Transmitter ready */ -#define USART_CSR_RXBRK (1U << 2) /* Break received */ -#define USART_CSR_ENDRX (1U << 3) /* End of Transfer RX from PDC */ -#define USART_CSR_ENDTX (1U << 4) /* End of Transfer TX from PDC */ -#define USART_CSR_OVRE (1U << 5) /* Overrun error */ -#define USART_CSR_FRAME (1U << 6) /* Framing error */ -#define USART_CSR_PARE (1U << 7) /* Parity Error */ -#define USART_CSR_TIMEOUT (1U << 8) /* Timeout since start-timeout */ -#define USART_CSR_TXEMPTY (1U << 9) /* Transmitter empty */ -#define USART_CSR_ITERATION (1U << 10) /* max repetitions since RSIT */ -#define USART_CSR_TXBUFE (1U << 11) /* Buffer empty from PDC */ -#define USART_CSR_RXBUFF (1U << 12) /* Buffer full from PDC */ -#define USART_CSR_NACK (1U << 13) /* NACK since last RSTNACK */ -#define USART_CSR_RIIC (1U << 16) /* RI delta since last csr read */ -#define USART_CSR_DSRIC (1U << 17) /* DSR delta */ -#define USART_CSR_DCDIC (1U << 18) /* DCD delta */ -#define USART_CSR_CTSIC (1U << 19) /* CTS delta */ -#define USART_CSR_RI (1U << 20) /* RI status */ -#define USART_CSR_DSR (1U << 21) /* DSR status */ -#define USART_CSR_DCD (1U << 22) /* DCD status */ -#define USART_CSR_CTS (1U << 23) /* CTS status */ +#define USART_CSR_RXRDY (1UL << 0) /* Receiver ready */ +#define USART_CSR_TXRDY (1UL << 1) /* Transmitter ready */ +#define USART_CSR_RXBRK (1UL << 2) /* Break received */ +#define USART_CSR_ENDRX (1UL << 3) /* End of Transfer RX from PDC */ +#define USART_CSR_ENDTX (1UL << 4) /* End of Transfer TX from PDC */ +#define USART_CSR_OVRE (1UL << 5) /* Overrun error */ +#define USART_CSR_FRAME (1UL << 6) /* Framing error */ +#define USART_CSR_PARE (1UL << 7) /* Parity Error */ +#define USART_CSR_TIMEOUT (1UL << 8) /* Timeout since start-timeout */ +#define USART_CSR_TXEMPTY (1UL << 9) /* Transmitter empty */ +#define USART_CSR_ITERATION (1UL << 10) /* max repetitions since RSIT */ +#define USART_CSR_TXBUFE (1UL << 11) /* Buffer empty from PDC */ +#define USART_CSR_RXBUFF (1UL << 12) /* Buffer full from PDC */ +#define USART_CSR_NACK (1UL << 13) /* NACK since last RSTNACK */ +#define USART_CSR_RIIC (1UL << 16) /* RI delta since last csr read */ +#define USART_CSR_DSRIC (1UL << 17) /* DSR delta */ +#define USART_CSR_DCDIC (1UL << 18) /* DCD delta */ +#define USART_CSR_CTSIC (1UL << 19) /* CTS delta */ +#define USART_CSR_RI (1UL << 20) /* RI status */ +#define USART_CSR_DSR (1UL << 21) /* DSR status */ +#define USART_CSR_DCD (1UL << 22) /* DCD status */ +#define USART_CSR_CTS (1UL << 23) /* CTS status */ #define USART_RHR 0x18 /* Receiver holding register */ #define USART_THR 0x1c /* Transmitter holding register */ @@ -125,24 +125,4 @@ /* 0x48 reserved */ #define USART_IFR 0x48 /* IrDA filter register */ - -#define UART_RXRDY (0x1 << 0) /* RXRDY Interrupt */ -#define UART_TXRDY (0x1 << 1) /* TXRDY Interrupt */ -#define UART_RXBRK (0x1 << 2) /* Break Received/End of Break */ -#define UART_ENDRX (0x1 << 3) /* End of Receive Transfer Interrupt */ -#define UART_ENDTX (0x1 << 4) /* End of Transmit Interrupt */ -#define UART_OVRE (0x1 << 5) /* Overrun Interrupt */ -#define UART_FRAME (0x1 << 6) /* Framing Error Interrupt */ -#define UART_PARE (0x1 << 7) /* Parity Error Interrupt */ -#define UART_TIMEOUT ( 0x1 << 8) /* (USART) Receiver Time-out */ -#define UART_TXEMPTY ( 0x1 << 9) /* (USART) TXEMPTY Interrupt */ -#define UART_ITERATION ( 0x1 << 10) /* (USART) Max number of Repetitions Reached */ -#define UART_TXBUFE ( 0x1 << 11) /* (USART) TXBUFE Interrupt */ -#define UART_RXBUFF ( 0x1 << 12) /* (USART) RXBUFF Interrupt */ -#define UART_NACK ( 0x1 << 13) /* (USART) Non Acknowledge */ -#define UART_RIIC ( 0x1 << 16) /* (USART) Ring INdicator Input Change Flag */ -#define AT91RM92_US_DSRIC ( 0x1 << 17) /* (USART) Data Set Ready Input Change Flag */ -#define AT91RM92_US_DCDIC ( 0x1 << 18) /* (USART) Data Carrier Flag */ -#define AT91RM92_US_CTSIC ( 0x1 << 19) /* (USART) Clear To Send Input Change Flag */ - #endif /* AT91RM92REG_H_ */ ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/if_ate.c#2 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.5 2006/03/18 01:43:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.6 2006/04/06 04:30:23 imp Exp $"); #include #include @@ -86,13 +86,14 @@ struct callout tick_ch; /* Tick callout */ bus_dma_tag_t mtag; /* bus dma tag for mbufs */ bus_dmamap_t tx_map[ATE_MAX_TX_BUFFERS]; + struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ bus_dma_tag_t rxtag; bus_dmamap_t rx_map[ATE_MAX_RX_BUFFERS]; + void *rx_buf[ATE_MAX_RX_BUFFERS]; /* RX buffer space */ + int rx_buf_ptr; bus_dma_tag_t rx_desc_tag; bus_dmamap_t rx_desc_map; int txcur; /* current tx map pointer */ - struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ - struct mbuf *rx_mbuf[ATE_MAX_RX_BUFFERS]; /* RX mbufs */ bus_addr_t rx_desc_phys; eth_rx_desc_t *rx_descs; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ @@ -241,6 +242,30 @@ sc->rx_desc_phys = segs[0].ds_addr; } +static void +ate_load_rx_buf(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct ate_softc *sc; + int i; + + if (error != 0) + return; + sc = (struct ate_softc *)arg; + i = sc->rx_buf_ptr; + + /* + * For the last buffer, set the wrap bit so the controller + * restarts from the first descriptor. + */ + if (i == ATE_MAX_RX_BUFFERS - 1) + sc->rx_descs[i].addr = segs[0].ds_addr | ETH_WRAP_BIT; + else + sc->rx_descs[i].addr = segs[0].ds_addr; + sc->rx_descs[i].status = 0; + /* Flush the memory in the mbuf */ + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); +} + /* * Compute the multicast filter for this device using the standard * algorithm. I wonder why this isn't in ether somewhere as a lot @@ -275,10 +300,8 @@ * advantage of that. Locks here are to avoid LOR with the * IF_ADDR_LOCK, but might not be strictly necessary. */ - ATE_LOCK(sc); WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); - ATE_UNLOCK(sc); } static int @@ -342,33 +365,21 @@ if (bus_dmamem_alloc(sc->rx_desc_tag, (void **)&sc->rx_descs, BUS_DMA_NOWAIT | BUS_DMA_COHERENT, &sc->rx_desc_map) != 0) goto errout; - if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, + if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), ate_getaddr, sc, 0) != 0) goto errout; /* XXX TODO(5) Put this in ateinit_locked? */ for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { - bus_dma_segment_t seg; - int nsegs; - - sc->rx_mbuf[i] = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR); - sc->rx_mbuf[i]->m_len = sc->rx_mbuf[i]->m_pkthdr.len = >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 10 15:28:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DA6416A417; Mon, 10 Apr 2006 15:28:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05C1B16A415 for ; Mon, 10 Apr 2006 15:28:01 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A88CD43D48 for ; Mon, 10 Apr 2006 15:28:00 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AFS0BU012012 for ; Mon, 10 Apr 2006 15:28:00 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AFS0vv012005 for perforce@freebsd.org; Mon, 10 Apr 2006 15:28:00 GMT (envelope-from gnn@neville-neil.com) Date: Mon, 10 Apr 2006 15:28:00 GMT Message-Id: <200604101528.k3AFS0vv012005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 94916 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 15:28:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=94916 Change 94916 by gnn@gnn_devbox_fast_ipsec on 2006/04/10 15:27:36 Make it possible to build FAST_IPSEC with INET6. Fix an LOR in crypto.c that results from dealing with SA bundles when using direct dispatch Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_proto.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec.h#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec_output.c#3 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/key.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keysock.c#5 edit .. //depot/projects/gnn_fast_ipsec/src/sys/opencrypto/crypto.c#3 edit Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_proto.c#3 (text+ko) ==== @@ -129,11 +129,6 @@ #ifdef FAST_IPSEC #include -#define IPSEC -#define IPSEC_ESP -#define ah6_input ipsec6_common_input -#define esp6_input ipsec6_common_input -#define ipcomp6_input ipsec6_common_input #endif /* FAST_IPSEC */ #include @@ -234,7 +229,7 @@ .pr_input = frag6_input, .pr_usrreqs = &nousrreqs }, -#ifdef IPSEC +#if defined(IPSEC) { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, @@ -243,7 +238,7 @@ .pr_input = ah6_input, .pr_usrreqs = &nousrreqs, }, -#ifdef IPSEC_ESP +#if defined(IPSEC_ESP) { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, @@ -253,7 +248,7 @@ .pr_ctlinput = esp6_ctlinput, .pr_usrreqs = &nousrreqs, }, -#endif +#endif /* IPSEC_ESP */ { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, @@ -263,6 +258,33 @@ .pr_usrreqs = &nousrreqs, }, #endif /* IPSEC */ +#if defined(FAST_IPSEC) +{ + .pr_type = SOCK_RAW, + .pr_domain = &inet6domain, + .pr_protocol = IPPROTO_AH, + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = ipsec6_common_input, + .pr_usrreqs = &nousrreqs, +}, +{ + .pr_type = SOCK_RAW, + .pr_domain = &inet6domain, + .pr_protocol = IPPROTO_ESP, + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = ipsec6_common_input, + .pr_ctlinput = esp6_ctlinput, + .pr_usrreqs = &nousrreqs, +}, +{ + .pr_type = SOCK_RAW, + .pr_domain = &inet6domain, + .pr_protocol = IPPROTO_IPCOMP, + .pr_flags = PR_ATOMIC|PR_ADDR, + .pr_input = ipsec6_common_input, + .pr_usrreqs = &nousrreqs, +}, +#endif /* FAST_IPSEC */ #ifdef INET { .pr_type = SOCK_RAW, @@ -418,9 +440,9 @@ SYSCTL_NODE(_net_inet6, IPPROTO_ICMPV6, icmp6, CTLFLAG_RW, 0, "ICMP6"); SYSCTL_NODE(_net_inet6, IPPROTO_UDP, udp6, CTLFLAG_RW, 0, "UDP6"); SYSCTL_NODE(_net_inet6, IPPROTO_TCP, tcp6, CTLFLAG_RW, 0, "TCP6"); -#ifdef IPSEC +#if defined(IPSEC) || defined(FAST_IPSEC) SYSCTL_NODE(_net_inet6, IPPROTO_ESP, ipsec6, CTLFLAG_RW, 0, "IPSEC6"); -#endif /* IPSEC */ +#endif /* IPSEC || FAST_IPSEC */ /* net.inet6.ip6 */ static int ==== //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.12 2005/06/02 23:56:10 hmp Exp $ */ +/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.13 2006/03/25 13:38:52 gnn Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /*- @@ -149,7 +149,8 @@ SYSCTL_STRUCT(_net_inet_ipsec, OID_AUTO, ipsecstats, CTLFLAG_RD, &newipsecstat, newipsecstat, ""); -#ifdef INET6 +#ifdef INET6 +struct newipsecstat newipsec6stat; int ip6_esp_trans_deflev = IPSEC_LEVEL_USE; int ip6_esp_net_deflev = IPSEC_LEVEL_USE; int ip6_ah_trans_deflev = IPSEC_LEVEL_USE; @@ -180,6 +181,8 @@ debug, CTLFLAG_RW, &ipsec_debug, 0, ""); SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_ESP_RANDPAD, esp_randpad, CTLFLAG_RW, &ip6_esp_randpad, 0, ""); +SYSCTL_STRUCT(_net_inet6_ipsec6, IPSECCTL_STATS, + ipsecstats, CTLFLAG_RD, &newipsec6stat, newipsecstat, ""); #endif /* INET6 */ static int ipsec4_setspidx_inpcb __P((struct mbuf *, struct inpcb *pcb)); ==== //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec.h#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec_output.c#3 (text+ko) ==== ==== //depot/projects/gnn_fast_ipsec/src/sys/netipsec/key.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/key.c,v 1.20 2005/01/07 01:45:46 imp Exp $ */ +/* $FreeBSD: src/sys/netipsec/key.c,v 1.21 2006/03/25 13:38:52 gnn Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /*- @@ -6257,16 +6257,12 @@ static int key_expire(struct secasvar *sav) { - int s; int satype; struct mbuf *result = NULL, *m; int len; int error = -1; struct sadb_lifetime *lt; - /* XXX: Why do we lock ? */ - s = splnet(); /*called from softclock()*/ - IPSEC_ASSERT (sav != NULL, ("null sav")); IPSEC_ASSERT (sav->sah != NULL, ("null sa header")); @@ -6359,13 +6355,11 @@ mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); - splx(s); return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED); fail: if (result) m_freem(result); - splx(s); return error; } ==== //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keysock.c#5 (text+ko) ==== @@ -81,7 +81,6 @@ { struct sadb_msg *msg; int len, error = 0; - int s; if (m == 0) panic("%s: NULL pointer was passed.\n", __func__); @@ -116,11 +115,8 @@ goto end; } - /*XXX giant lock*/ - s = splnet(); error = key_parse(m, so); m = NULL; - splx(s); end: if (m) m_freem(m); @@ -278,22 +274,18 @@ pfkeystat.in_total++; pfkeystat.in_bytes += m->m_pkthdr.len; if (m->m_len < sizeof(struct sadb_msg)) { -#if 1 m = m_pullup(m, sizeof(struct sadb_msg)); if (m == NULL) { pfkeystat.in_nomem++; return ENOBUFS; } -#else - /* don't bother pulling it up just for stats */ -#endif } if (m->m_len >= sizeof(struct sadb_msg)) { struct sadb_msg *msg; msg = mtod(m, struct sadb_msg *); pfkeystat.in_msgtype[msg->sadb_msg_type]++; } - + mtx_lock(&rawcb_mtx); LIST_FOREACH(rp, &rawcb_list, list) { if (rp->rcb_proto.sp_family != PF_KEY) @@ -344,11 +336,13 @@ if ((n = m_copy(m, 0, (int)M_COPYALL)) == NULL) { m_freem(m); pfkeystat.in_nomem++; + mtx_unlock(&rawcb_mtx); return ENOBUFS; } if ((error = key_sendup0(rp, n, 0)) != 0) { m_freem(m); + mtx_unlock(&rawcb_mtx); return error; } @@ -362,6 +356,7 @@ error = 0; m_freem(m); } + mtx_unlock(&rawcb_mtx); return error; } @@ -372,7 +367,6 @@ static void key_abort(struct socket *so) { - raw_usrreqs.pru_abort(so); } @@ -384,29 +378,21 @@ key_attach(struct socket *so, int proto, struct thread *td) { struct keycb *kp; - int s, error; + int error; + + KASSERT(so->so_pcb == NULL, ("key_attach: so_pcb != NULL")); - if (sotorawcb(so) != 0) - return EISCONN; /* XXX panic? */ - kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK|M_ZERO); /* XXX */ + /* XXX */ + MALLOC(kp, struct keycb *, sizeof *kp, M_PCB, M_WAITOK | M_ZERO); if (kp == 0) return ENOBUFS; - /* - * The splnet() is necessary to block protocols from sending - * error notifications (like RTM_REDIRECT or RTM_LOSING) while - * this PCB is extant but incompletely initialized. - * Probably we should try to do more of this work beforehand and - * eliminate the spl. - */ - s = splnet(); so->so_pcb = (caddr_t)kp; - error = raw_usrreqs.pru_attach(so, proto, td); + error = raw_attach(so, proto); kp = (struct keycb *)sotorawcb(so); if (error) { free(kp, M_PCB); so->so_pcb = (caddr_t) 0; - splx(s); return error; } @@ -420,7 +406,6 @@ soisconnected(so); so->so_options |= SO_USELOOPBACK; - splx(s); return 0; } @@ -431,11 +416,7 @@ static int key_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_bind(so, nam, td); /* xxx just EINVAL */ - splx(s); - return error; + return EINVAL; } /* @@ -445,11 +426,7 @@ static int key_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_connect(so, nam, td); /* XXX just EINVAL */ - splx(s); - return error; + return EINVAL; } /* @@ -460,7 +437,6 @@ key_detach(struct socket *so) { struct keycb *kp = (struct keycb *)sotorawcb(so); - int s, error; KASSERT(kp != NULL, ("key_detach: kp == NULL")); if (kp->kp_raw.rcb_proto.sp_protocol @@ -479,11 +455,7 @@ static int key_disconnect(struct socket *so) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_disconnect(so); - splx(s); - return error; + return(raw_usrreqs.pru_disconnect(so)); } /* @@ -493,11 +465,7 @@ static int key_peeraddr(struct socket *so, struct sockaddr **nam) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_peeraddr(so, nam); - splx(s); - return error; + return(raw_usrreqs.pru_peeraddr(so, nam)); } /* @@ -508,11 +476,7 @@ key_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct mbuf *control, struct thread *td) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_send(so, flags, m, nam, control, td); - splx(s); - return error; + return(raw_usrreqs.pru_send(so, flags, m, nam, control, td)); } /* @@ -522,11 +486,7 @@ static int key_shutdown(struct socket *so) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_shutdown(so); - splx(s); - return error; + return(raw_usrreqs.pru_shutdown(so)); } /* @@ -536,11 +496,7 @@ static int key_sockaddr(struct socket *so, struct sockaddr **nam) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_sockaddr(so, nam); - splx(s); - return error; + return(raw_usrreqs.pru_sockaddr(so, nam)); } struct pr_usrreqs key_usrreqs = { ==== //depot/projects/gnn_fast_ipsec/src/sys/opencrypto/crypto.c#3 (text+ko) ==== @@ -667,7 +667,6 @@ binuptime(&crp->crp_tstamp); #endif - CRYPTO_Q_LOCK(); if ((crp->crp_flags & CRYPTO_F_BATCH) == 0) { struct cryptocap *cap; /* @@ -689,7 +688,9 @@ * behind batch'd ops. */ crypto_drivers[hid].cc_qblocked = 1; + CRYPTO_Q_LOCK(); TAILQ_INSERT_TAIL(&crp_q, crp, crp_next); + CRYPTO_Q_UNLOCK(); cryptostats.cs_blocks++; result = 0; } @@ -698,7 +699,9 @@ * The driver is blocked, just queue the op until * it unblocks and the kernel thread gets kicked. */ + CRYPTO_Q_LOCK(); TAILQ_INSERT_TAIL(&crp_q, crp, crp_next); + CRYPTO_Q_UNLOCK(); result = 0; } } else { @@ -709,13 +712,14 @@ * when the operation is low priority and/or suitable * for batching. */ + CRYPTO_Q_LOCK(); wasempty = TAILQ_EMPTY(&crp_q); TAILQ_INSERT_TAIL(&crp_q, crp, crp_next); + CRYPTO_Q_UNLOCK(); if (wasempty) wakeup_one(&crp_q); result = 0; } - CRYPTO_Q_UNLOCK(); return result; } From owner-p4-projects@FreeBSD.ORG Mon Apr 10 15:35:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26AB216A417; Mon, 10 Apr 2006 15:35:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA27916A411 for ; Mon, 10 Apr 2006 15:35:12 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87CEB43D55 for ; Mon, 10 Apr 2006 15:35:11 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AFZBdZ016168 for ; Mon, 10 Apr 2006 15:35:11 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AFZApD016148 for perforce@freebsd.org; Mon, 10 Apr 2006 15:35:10 GMT (envelope-from gnn@neville-neil.com) Date: Mon, 10 Apr 2006 15:35:10 GMT Message-Id: <200604101535.k3AFZApD016148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 94917 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 15:35:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=94917 Change 94917 by gnn@fast_ipsec_integ on 2006/04/10 15:34:49 Integrate from HEAD Affected files ... .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/undefined.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/pmap.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options#8 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.arm#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amrvar.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/README#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_disk.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_slice.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/geom/mirror/g_mirror_ctl.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/geom/raid3/g_raid3_ctl.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/exception.s#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/kdb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/npx.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/kdb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exec.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_kdb.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_proto.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ath/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_media.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/keysock.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/posix4/ksched.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/kdb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/sys/filedesc.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mac.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mac_policy.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/umtx.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufsmount.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/pmap.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/swap_pager.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/vm/swap_pager.h#2 integrate Differences ... ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.188 2006/04/03 21:16:07 peter Exp $"); #include #include @@ -2125,9 +2125,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2146,11 +2144,6 @@ pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else ==== //depot/projects/fast_ipsec/src/sys/alpha/include/kdb.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.2 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.3 2006/04/03 22:51:46 marcel Exp $ */ #ifndef _MACHINE_KDB_H_ @@ -31,6 +31,8 @@ #include +#define KDB_STOPPEDPCB(pc) &stoppcbs[pc->pc_cpuid] + static __inline void kdb_cpu_clear_singlestep(void) { ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/gdb_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.5 2005/09/27 21:10:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.6 2006/04/04 03:00:20 marcel Exp $"); #include #include @@ -91,3 +91,27 @@ kdb_frame->tf_rip = *(register_t *)val; } } + +int +gdb_cpu_signal(int type, int code) +{ + + switch (type & ~T_USER) { + case 0: return (SIGFPE); /* Divide by zero. */ + case 1: return (SIGTRAP); /* Debug exception. */ + case 3: return (SIGTRAP); /* Breakpoint. */ + case 4: return (SIGSEGV); /* into instr. (overflow). */ + case 5: return (SIGURG); /* bound instruction. */ + case 6: return (SIGILL); /* Invalid opcode. */ + case 7: return (SIGFPE); /* Coprocessor not present. */ + case 8: return (SIGEMT); /* Double fault. */ + case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ + case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ + case 11: return (SIGSEGV); /* Segment not present. */ + case 12: return (SIGSEGV); /* Stack exception. */ + case 13: return (SIGSEGV); /* General protection. */ + case 14: return (SIGSEGV); /* Page fault. */ + case 16: return (SIGEMT); /* Coprocessor error. */ + } + return (SIGEMT); +} ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/io_apic.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -89,6 +89,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -207,9 +208,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -226,9 +225,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -313,6 +310,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.540 2006/04/02 05:45:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.543 2006/04/04 20:17:35 peter Exp $"); /* * Manages physical address maps. @@ -158,6 +158,13 @@ #define PMAP_INLINE #endif +#define PV_STATS +#ifdef PV_STATS +#define PV_STAT(x) do { x ; } while (0) +#else +#define PV_STAT(x) do { } while (0) +#endif + struct pmap kernel_pmap_store; vm_paddr_t avail_start; /* PA of first available physical page */ @@ -182,7 +189,6 @@ /* * Data for the pv entry allocation mechanism */ -static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int shpgperproc = PMAP_SHPGPERPROC; @@ -198,8 +204,8 @@ */ static caddr_t crashdumpmap; -static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(pmap_t locked_pmap); +static void free_pv_entry(pmap_t pmap, pv_entry_t pv); +static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -511,7 +517,7 @@ PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); kernel_pmap->pm_active = -1; /* don't allow deactivation */ - TAILQ_INIT(&kernel_pmap->pm_pvlist); + TAILQ_INIT(&kernel_pmap->pm_pvchunk); nkpt = NKPT; /* @@ -571,8 +577,6 @@ * high water mark so that the system can recover from excessive * numbers of pv entries. */ - pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); @@ -1065,7 +1069,7 @@ PMAP_LOCK_INIT(pmap); pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + KPML4phys); pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1102,7 +1106,7 @@ pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | PG_V | PG_RW | PG_A | PG_M; pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1439,61 +1443,79 @@ * page management routines. ***************************************************/ -/* - * free the pv_entry back to the free list - */ -static PMAP_INLINE void -free_pv_entry(pv_entry_t pv) +CTASSERT(sizeof(struct pv_chunk) == PAGE_SIZE); +CTASSERT(_NPCM == 3); +CTASSERT(_NPCPV == 168); + +static __inline struct pv_chunk * +pv_to_chunk(pv_entry_t pv) { - pv_entry_count--; - uma_zfree(pvzone, pv); + + return (struct pv_chunk *)((uintptr_t)pv & ~(uintptr_t)PAGE_MASK); } +#define PV_PMAP(pv) (pv_to_chunk(pv)->pc_pmap) + +#define PC_FREE0 0xfffffffffffffffful +#define PC_FREE1 0xfffffffffffffffful +#define PC_FREE2 0x000000fffffffffful + +static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; + +#ifdef PV_STATS +static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_count, CTLFLAG_RD, &pc_chunk_count, 0, + "Current number of pv entry chunks"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_allocs, CTLFLAG_RD, &pc_chunk_allocs, 0, + "Current number of pv entry chunks allocated"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_frees, CTLFLAG_RD, &pc_chunk_frees, 0, + "Current number of pv entry chunks frees"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_tryfail, CTLFLAG_RD, &pc_chunk_tryfail, 0, + "Number of times tried to get a chunk page but failed."); + +static long pv_entry_frees, pv_entry_allocs; +static int pv_entry_spare; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, + "Current number of pv entry frees"); +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, + "Current number of pv entry allocs"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_spare, CTLFLAG_RD, &pv_entry_spare, 0, + "Current number of spare pv entries"); + +static int pmap_collect_inactive, pmap_collect_active; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_inactive, CTLFLAG_RD, &pmap_collect_inactive, 0, + "Current number times pmap_collect called on inactive queue"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_active, CTLFLAG_RD, &pmap_collect_active, 0, + "Current number times pmap_collect called on active queue"); +#endif + /* - * get a new pv_entry, allocating a block from the system - * when needed. + * We are in a serious low memory condition. Resort to + * drastic measures to free some pages so we can allocate + * another pv entry chunk. This is normally called to + * unmap inactive pages, and if necessary, active pages. */ -static pv_entry_t -get_pv_entry(pmap_t locked_pmap) +static void +pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) { - static const struct timeval printinterval = { 60, 0 }; - static struct timeval lastprint; - struct vpgqueues *vpq; pd_entry_t ptepde; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t allocated_pv, next_pv, pv; + pv_entry_t next_pv, pv; vm_offset_t va; vm_page_t m; - PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - allocated_pv = uma_zalloc(pvzone, M_NOWAIT); - if (allocated_pv != NULL) { - pv_entry_count++; - if (pv_entry_count > pv_entry_high_water) - pagedaemon_wakeup(); - else - return (allocated_pv); - } - - /* - * Reclaim pv entries: At first, destroy mappings to inactive - * pages. After that, if a pv entry is still needed, destroy - * mappings to active pages. - */ - if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, consider " - "increasing sysctl vm.pmap.shpgperproc or " - "vm.pmap.pv_entry_max\n"); - vpq = &vm_page_queues[PQ_INACTIVE]; -retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; - pmap = pv->pv_pmap; + pmap = PV_PMAP(pv); /* Avoid deadlock and lock recursion. */ if (pmap > locked_pmap) PMAP_LOCK(pmap); @@ -1503,18 +1525,17 @@ pte = pmap_pte_pde(pmap, va, &ptepde); tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, - ("get_pv_entry: wired pte %#lx", tpte)); + ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (tpte & PG_M) { KASSERT((tpte & PG_RW), - ("get_pv_entry: modified page not writable: va: %#lx, pte: %#lx", + ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", va, tpte)); if (pmap_track_modified(va)) vm_page_dirty(m); } pmap_invalidate_page(pmap, va); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); @@ -1522,20 +1543,130 @@ pmap_unuse_pt(pmap, va, ptepde); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); - if (allocated_pv == NULL) - allocated_pv = pv; - else - free_pv_entry(pv); + free_pv_entry(locked_pmap, pv); + } + } +} + + +/* + * free the pv_entry back to the free list + */ +static void +free_pv_entry(pmap_t pmap, pv_entry_t pv) +{ + vm_page_t m; + struct pv_chunk *pc; + int idx, field, bit; + + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc = pv_to_chunk(pv); + idx = pv - &pc->pc_pventry[0]; + field = idx / 64; + bit = idx % 64; + pc->pc_map[field] |= 1ul << bit; + /* move to head of list */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || + pc->pc_map[2] != PC_FREE2) + return; + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); + /* entire chunk is free, return it */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); +} + +/* + * get a new pv_entry, allocating a block from the system + * when needed. + */ +static pv_entry_t +get_pv_entry(pmap_t pmap, int try) +{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + static vm_pindex_t colour; + int bit, field; + pv_entry_t pv; + struct pv_chunk *pc; + vm_page_t m; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PV_STAT(pv_entry_allocs++); + PV_STAT(pv_entry_count++); + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + pc = TAILQ_FIRST(&pmap->pm_pvchunk); + if (pc != NULL) { + for (field = 0; field < _NPCM; field++) { + if (pc->pc_map[field]) { + bit = bsfq(pc->pc_map[field]); + break; + } + } + if (field < _NPCM) { + pv = &pc->pc_pventry[field * 64 + bit]; + pc->pc_map[field] &= ~(1ul << bit); + /* If this was the last item, move it to tail */ + if (pc->pc_map[0] == 0 && pc->pc_map[1] == 0 && + pc->pc_map[2] == 0) { + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); + } + PV_STAT(pv_entry_spare--); + return (pv); } } - if (allocated_pv == NULL) { - if (vpq == &vm_page_queues[PQ_INACTIVE]) { - vpq = &vm_page_queues[PQ_ACTIVE]; - goto retry; + /* No free items, allocate another chunk */ + m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + if (try) { + PV_STAT(pc_chunk_tryfail++); + return (NULL); + } + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv chunk entry is still needed, + * destroy mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, consider " + "increasing sysctl vm.pmap.shpgperproc or " + "vm.pmap.pv_entry_max\n"); + PV_STAT(pmap_collect_inactive++); + pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + PV_STAT(pmap_collect_active++); + pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) + panic("get_pv_entry: increase vm.pmap.shpgperproc"); } - panic("get_pv_entry: increase the vm.pmap.shpgperproc tunable"); } - return (allocated_pv); + PV_STAT(pc_chunk_count++); + PV_STAT(pc_chunk_allocs++); + colour++; + pc = (void *)PHYS_TO_DMAP(m->phys_addr); + pc->pc_pmap = pmap; + pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ + pc->pc_map[1] = PC_FREE1; + pc->pc_map[2] = PC_FREE2; + pv = &pc->pc_pventry[0]; + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + PV_STAT(pv_entry_spare += _NPCPV - 1); + return (pv); } static void @@ -1545,24 +1676,16 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (m->md.pv_list_count < pmap->pm_stats.resident_count) { - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pmap == pv->pv_pmap && va == pv->pv_va) - break; - } - } else { - TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) { - if (va == pv->pv_va) - break; - } + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + if (pmap == PV_PMAP(pv) && va == pv->pv_va) + break; } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - free_pv_entry(pv); + free_pv_entry(pmap, pv); } /* @@ -1574,13 +1697,10 @@ { pv_entry_t pv; - pv = get_pv_entry(pmap); - pv->pv_va = va; - pv->pv_pmap = pmap; - PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); + pv = get_pv_entry(pmap, FALSE); + pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; } @@ -1596,11 +1716,8 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (pv_entry_count < pv_entry_high_water && - (pv = uma_zalloc(pvzone, M_NOWAIT)) != NULL) { - pv_entry_count++; + (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; - pv->pv_pmap = pmap; - TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; return (TRUE); @@ -1791,6 +1908,7 @@ pmap_remove_all(vm_page_t m) { register pv_entry_t pv; + pmap_t pmap; pt_entry_t *pte, tpte; pd_entry_t ptepde; @@ -1805,12 +1923,13 @@ #endif mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { - PMAP_LOCK(pv->pv_pmap); - pv->pv_pmap->pm_stats.resident_count--; - pte = pmap_pte_pde(pv->pv_pmap, pv->pv_va, &ptepde); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pmap->pm_stats.resident_count--; + pte = pmap_pte_pde(pmap, pv->pv_va, &ptepde); tpte = pte_load_clear(pte); if (tpte & PG_W) - pv->pv_pmap->pm_stats.wired_count--; + pmap->pm_stats.wired_count--; if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); @@ -1824,13 +1943,12 @@ if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + pmap_invalidate_page(pmap, pv->pv_va); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, ptepde); - PMAP_UNLOCK(pv->pv_pmap); - free_pv_entry(pv); + pmap_unuse_pt(pmap, pv->pv_va, ptepde); + PMAP_UNLOCK(pmap); + free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2584,7 +2702,7 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pv->pv_pmap == pmap) { + if (PV_PMAP(pv) == pmap) { return TRUE; } loops++; @@ -2594,7 +2712,6 @@ return (FALSE); } -#define PMAP_REMOVE_PAGES_CURPROC_ONLY /* * Remove all pages from specified address space * this aids process exit speeds. Also, this code @@ -2604,79 +2721,95 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; - pv_entry_t pv, npv; + pv_entry_t pv; + struct pv_chunk *pc, *npc; + int field, idx; + int64_t bit; + uint64_t inuse, bitmask; + int allfree; -#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) { printf("warning: pmap_remove_pages called with non-current pmap\n"); return; } -#endif vm_page_lock_queues(); PMAP_LOCK(pmap); - for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { + TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) { + allfree = 1; + for (field = 0; field < _NPCM; field++) { + inuse = (~(pc->pc_map[field])) & pc_freemask[field]; + while (inuse != 0) { + bit = bsfq(inuse); + bitmask = 1UL << bit; + idx = field * 64 + bit; + pv = &pc->pc_pventry[idx]; + inuse &= ~bitmask; - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } + pte = vtopte(pv->pv_va); + tpte = *pte; -#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY - pte = vtopte(pv->pv_va); -#else - pte = pmap_pte(pmap, pv->pv_va); -#endif - tpte = *pte; - - if (tpte == 0) { - printf("TPTE at %p IS ZERO @ VA %08lx\n", - pte, pv->pv_va); - panic("bad pte"); - } + if (tpte == 0) { + printf( + "TPTE at %p IS ZERO @ VA %08lx\n", + pte, pv->pv_va); + panic("bad pte"); + } /* * We cannot remove wired pages from a process' mapping at this time */ - if (tpte & PG_W) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } + if (tpte & PG_W) { + allfree = 0; + continue; + } + + m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); + KASSERT(m->phys_addr == (tpte & PG_FRAME), + ("vm_page_t %p phys_addr mismatch %016jx %016jx", + m, (uintmax_t)m->phys_addr, + (uintmax_t)tpte)); - m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); - KASSERT(m->phys_addr == (tpte & PG_FRAME), - ("vm_page_t %p phys_addr mismatch %016jx %016jx", - m, (uintmax_t)m->phys_addr, (uintmax_t)tpte)); + KASSERT(m < &vm_page_array[vm_page_array_size], + ("pmap_remove_pages: bad tpte %#jx", + (uintmax_t)tpte)); - KASSERT(m < &vm_page_array[vm_page_array_size], - ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); + pmap->pm_stats.resident_count--; - pmap->pm_stats.resident_count--; + pte_clear(pte); - pte_clear(pte); + /* + * Update the vm_page_t clean/reference bits. + */ + if (tpte & PG_M) + vm_page_dirty(m); - /* - * Update the vm_page_t clean and reference bits. - */ - if (tpte & PG_M) { - vm_page_dirty(m); + /* Mark free */ + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc->pc_map[field] |= bitmask; + m->md.pv_list_count--; + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + pmap_unuse_pt(pmap, pv->pv_va, + *vtopde(pv->pv_va)); + } + } + if (allfree) { + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); } - - npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - - m->md.pv_list_count--; - TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_EMPTY(&m->md.pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); - - pmap_unuse_pt(pmap, pv->pv_va, *vtopde(pv->pv_va)); - free_pv_entry(pv); } pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); @@ -2694,6 +2827,7 @@ { pv_entry_t pv; pt_entry_t *pte; + pmap_t pmap; boolean_t rv; rv = FALSE; @@ -2709,10 +2843,11 @@ */ if (!pmap_track_modified(pv->pv_va)) continue; - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); rv = (*pte & PG_M) != 0; - PMAP_UNLOCK(pv->pv_pmap); + PMAP_UNLOCK(pmap); if (rv) break; } @@ -2750,6 +2885,7 @@ pmap_clear_ptes(vm_page_t m, long bit) { register pv_entry_t pv; + pmap_t pmap; pt_entry_t pbits, *pte; if ((m->flags & PG_FICTITIOUS) || @@ -2770,8 +2906,9 @@ continue; } - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); retry: pbits = *pte; if (pbits & bit) { @@ -2785,9 +2922,9 @@ } else { atomic_clear_long(pte, bit); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pmap_invalidate_page(pmap, pv->pv_va); } - PMAP_UNLOCK(pv->pv_pmap); + PMAP_UNLOCK(pmap); } if (bit == PG_RW) vm_page_flag_clear(m, PG_WRITEABLE); @@ -2826,6 +2963,7 @@ pmap_ts_referenced(vm_page_t m) { register pv_entry_t pv, pvf, pvn; + pmap_t pmap; pt_entry_t *pte; pt_entry_t v; int rtval = 0; @@ -2848,20 +2986,21 @@ if (!pmap_track_modified(pv->pv_va)) continue; - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); if (pte && ((v = pte_load(pte)) & PG_A) != 0) { atomic_clear_long(pte, PG_A); - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 10 15:39:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ED6316A414; Mon, 10 Apr 2006 15:39:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C1F616A412 for ; Mon, 10 Apr 2006 15:39:31 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 695B343D67 for ; Mon, 10 Apr 2006 15:39:17 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AFdHQc019155 for ; Mon, 10 Apr 2006 15:39:17 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AFdGK1019143 for perforce@freebsd.org; Mon, 10 Apr 2006 15:39:16 GMT (envelope-from gnn@neville-neil.com) Date: Mon, 10 Apr 2006 15:39:16 GMT Message-Id: <200604101539.k3AFdGK1019143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 94918 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 15:39:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=94918 Change 94918 by gnn@gnn_devbox_fast_ipsec on 2006/04/10 15:39:15 Integrate from HEAD Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.arm#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amrvar.h#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/README#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/scc/scc_core.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_slice.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3_ctl.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/exception.s#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/kdb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/npx.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/kdb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_proto.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ath/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_media.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keysock.c#6 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/posix4/ksched.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/kdb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/gmon.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mac.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mac_policy.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/umtx.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/pmap.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/swap_pager.h#2 integrate Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/pmap.c#3 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.188 2006/04/03 21:16:07 peter Exp $"); #include #include @@ -2125,9 +2125,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2146,11 +2144,6 @@ pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/kdb.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.2 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.3 2006/04/03 22:51:46 marcel Exp $ */ #ifndef _MACHINE_KDB_H_ @@ -31,6 +31,8 @@ #include +#define KDB_STOPPEDPCB(pc) &stoppcbs[pc->pc_cpuid] + static __inline void kdb_cpu_clear_singlestep(void) { ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.5 2005/09/27 21:10:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.6 2006/04/04 03:00:20 marcel Exp $"); #include #include @@ -91,3 +91,27 @@ kdb_frame->tf_rip = *(register_t *)val; } } + +int +gdb_cpu_signal(int type, int code) +{ + + switch (type & ~T_USER) { + case 0: return (SIGFPE); /* Divide by zero. */ + case 1: return (SIGTRAP); /* Debug exception. */ + case 3: return (SIGTRAP); /* Breakpoint. */ + case 4: return (SIGSEGV); /* into instr. (overflow). */ + case 5: return (SIGURG); /* bound instruction. */ + case 6: return (SIGILL); /* Invalid opcode. */ + case 7: return (SIGFPE); /* Coprocessor not present. */ + case 8: return (SIGEMT); /* Double fault. */ + case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ + case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ + case 11: return (SIGSEGV); /* Segment not present. */ + case 12: return (SIGSEGV); /* Stack exception. */ + case 13: return (SIGSEGV); /* General protection. */ + case 14: return (SIGSEGV); /* Page fault. */ + case 16: return (SIGEMT); /* Coprocessor error. */ + } + return (SIGEMT); +} ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/io_apic.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -89,6 +89,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -207,9 +208,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -226,9 +225,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -313,6 +310,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.540 2006/04/02 05:45:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.543 2006/04/04 20:17:35 peter Exp $"); /* * Manages physical address maps. @@ -158,6 +158,13 @@ #define PMAP_INLINE #endif +#define PV_STATS +#ifdef PV_STATS +#define PV_STAT(x) do { x ; } while (0) +#else +#define PV_STAT(x) do { } while (0) +#endif + struct pmap kernel_pmap_store; vm_paddr_t avail_start; /* PA of first available physical page */ @@ -182,7 +189,6 @@ /* * Data for the pv entry allocation mechanism */ -static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int shpgperproc = PMAP_SHPGPERPROC; @@ -198,8 +204,8 @@ */ static caddr_t crashdumpmap; -static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(pmap_t locked_pmap); +static void free_pv_entry(pmap_t pmap, pv_entry_t pv); +static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -511,7 +517,7 @@ PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); kernel_pmap->pm_active = -1; /* don't allow deactivation */ - TAILQ_INIT(&kernel_pmap->pm_pvlist); + TAILQ_INIT(&kernel_pmap->pm_pvchunk); nkpt = NKPT; /* @@ -571,8 +577,6 @@ * high water mark so that the system can recover from excessive * numbers of pv entries. */ - pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); @@ -1065,7 +1069,7 @@ PMAP_LOCK_INIT(pmap); pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + KPML4phys); pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1102,7 +1106,7 @@ pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | PG_V | PG_RW | PG_A | PG_M; pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1439,61 +1443,79 @@ * page management routines. ***************************************************/ -/* - * free the pv_entry back to the free list - */ -static PMAP_INLINE void -free_pv_entry(pv_entry_t pv) +CTASSERT(sizeof(struct pv_chunk) == PAGE_SIZE); +CTASSERT(_NPCM == 3); +CTASSERT(_NPCPV == 168); + +static __inline struct pv_chunk * +pv_to_chunk(pv_entry_t pv) { - pv_entry_count--; - uma_zfree(pvzone, pv); + + return (struct pv_chunk *)((uintptr_t)pv & ~(uintptr_t)PAGE_MASK); } +#define PV_PMAP(pv) (pv_to_chunk(pv)->pc_pmap) + +#define PC_FREE0 0xfffffffffffffffful +#define PC_FREE1 0xfffffffffffffffful +#define PC_FREE2 0x000000fffffffffful + +static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; + +#ifdef PV_STATS +static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_count, CTLFLAG_RD, &pc_chunk_count, 0, + "Current number of pv entry chunks"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_allocs, CTLFLAG_RD, &pc_chunk_allocs, 0, + "Current number of pv entry chunks allocated"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_frees, CTLFLAG_RD, &pc_chunk_frees, 0, + "Current number of pv entry chunks frees"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_tryfail, CTLFLAG_RD, &pc_chunk_tryfail, 0, + "Number of times tried to get a chunk page but failed."); + +static long pv_entry_frees, pv_entry_allocs; +static int pv_entry_spare; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, + "Current number of pv entry frees"); +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, + "Current number of pv entry allocs"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_spare, CTLFLAG_RD, &pv_entry_spare, 0, + "Current number of spare pv entries"); + +static int pmap_collect_inactive, pmap_collect_active; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_inactive, CTLFLAG_RD, &pmap_collect_inactive, 0, + "Current number times pmap_collect called on inactive queue"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_active, CTLFLAG_RD, &pmap_collect_active, 0, + "Current number times pmap_collect called on active queue"); +#endif + /* - * get a new pv_entry, allocating a block from the system - * when needed. + * We are in a serious low memory condition. Resort to + * drastic measures to free some pages so we can allocate + * another pv entry chunk. This is normally called to + * unmap inactive pages, and if necessary, active pages. */ -static pv_entry_t -get_pv_entry(pmap_t locked_pmap) +static void +pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) { - static const struct timeval printinterval = { 60, 0 }; - static struct timeval lastprint; - struct vpgqueues *vpq; pd_entry_t ptepde; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t allocated_pv, next_pv, pv; + pv_entry_t next_pv, pv; vm_offset_t va; vm_page_t m; - PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - allocated_pv = uma_zalloc(pvzone, M_NOWAIT); - if (allocated_pv != NULL) { - pv_entry_count++; - if (pv_entry_count > pv_entry_high_water) - pagedaemon_wakeup(); - else - return (allocated_pv); - } - - /* - * Reclaim pv entries: At first, destroy mappings to inactive - * pages. After that, if a pv entry is still needed, destroy - * mappings to active pages. - */ - if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, consider " - "increasing sysctl vm.pmap.shpgperproc or " - "vm.pmap.pv_entry_max\n"); - vpq = &vm_page_queues[PQ_INACTIVE]; -retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; - pmap = pv->pv_pmap; + pmap = PV_PMAP(pv); /* Avoid deadlock and lock recursion. */ if (pmap > locked_pmap) PMAP_LOCK(pmap); @@ -1503,18 +1525,17 @@ pte = pmap_pte_pde(pmap, va, &ptepde); tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, - ("get_pv_entry: wired pte %#lx", tpte)); + ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (tpte & PG_M) { KASSERT((tpte & PG_RW), - ("get_pv_entry: modified page not writable: va: %#lx, pte: %#lx", + ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", va, tpte)); if (pmap_track_modified(va)) vm_page_dirty(m); } pmap_invalidate_page(pmap, va); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); @@ -1522,20 +1543,130 @@ pmap_unuse_pt(pmap, va, ptepde); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); - if (allocated_pv == NULL) - allocated_pv = pv; - else - free_pv_entry(pv); + free_pv_entry(locked_pmap, pv); + } + } +} + + +/* + * free the pv_entry back to the free list + */ +static void +free_pv_entry(pmap_t pmap, pv_entry_t pv) +{ + vm_page_t m; + struct pv_chunk *pc; + int idx, field, bit; + + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc = pv_to_chunk(pv); + idx = pv - &pc->pc_pventry[0]; + field = idx / 64; + bit = idx % 64; + pc->pc_map[field] |= 1ul << bit; + /* move to head of list */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || + pc->pc_map[2] != PC_FREE2) + return; + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); + /* entire chunk is free, return it */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); +} + +/* + * get a new pv_entry, allocating a block from the system + * when needed. + */ +static pv_entry_t +get_pv_entry(pmap_t pmap, int try) +{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + static vm_pindex_t colour; + int bit, field; + pv_entry_t pv; + struct pv_chunk *pc; + vm_page_t m; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PV_STAT(pv_entry_allocs++); + PV_STAT(pv_entry_count++); + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + pc = TAILQ_FIRST(&pmap->pm_pvchunk); + if (pc != NULL) { + for (field = 0; field < _NPCM; field++) { + if (pc->pc_map[field]) { + bit = bsfq(pc->pc_map[field]); + break; + } + } + if (field < _NPCM) { + pv = &pc->pc_pventry[field * 64 + bit]; + pc->pc_map[field] &= ~(1ul << bit); + /* If this was the last item, move it to tail */ + if (pc->pc_map[0] == 0 && pc->pc_map[1] == 0 && + pc->pc_map[2] == 0) { + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); + } + PV_STAT(pv_entry_spare--); + return (pv); } } - if (allocated_pv == NULL) { - if (vpq == &vm_page_queues[PQ_INACTIVE]) { - vpq = &vm_page_queues[PQ_ACTIVE]; - goto retry; + /* No free items, allocate another chunk */ + m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + if (try) { + PV_STAT(pc_chunk_tryfail++); + return (NULL); + } + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv chunk entry is still needed, + * destroy mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, consider " + "increasing sysctl vm.pmap.shpgperproc or " + "vm.pmap.pv_entry_max\n"); + PV_STAT(pmap_collect_inactive++); + pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + PV_STAT(pmap_collect_active++); + pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) + panic("get_pv_entry: increase vm.pmap.shpgperproc"); } - panic("get_pv_entry: increase the vm.pmap.shpgperproc tunable"); } - return (allocated_pv); + PV_STAT(pc_chunk_count++); + PV_STAT(pc_chunk_allocs++); + colour++; + pc = (void *)PHYS_TO_DMAP(m->phys_addr); + pc->pc_pmap = pmap; + pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ + pc->pc_map[1] = PC_FREE1; + pc->pc_map[2] = PC_FREE2; + pv = &pc->pc_pventry[0]; + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + PV_STAT(pv_entry_spare += _NPCPV - 1); + return (pv); } static void @@ -1545,24 +1676,16 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (m->md.pv_list_count < pmap->pm_stats.resident_count) { - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pmap == pv->pv_pmap && va == pv->pv_va) - break; - } - } else { - TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) { - if (va == pv->pv_va) - break; - } + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + if (pmap == PV_PMAP(pv) && va == pv->pv_va) + break; } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - free_pv_entry(pv); + free_pv_entry(pmap, pv); } /* @@ -1574,13 +1697,10 @@ { pv_entry_t pv; - pv = get_pv_entry(pmap); - pv->pv_va = va; - pv->pv_pmap = pmap; - PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); + pv = get_pv_entry(pmap, FALSE); + pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; } @@ -1596,11 +1716,8 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (pv_entry_count < pv_entry_high_water && - (pv = uma_zalloc(pvzone, M_NOWAIT)) != NULL) { - pv_entry_count++; + (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; - pv->pv_pmap = pmap; - TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; return (TRUE); @@ -1791,6 +1908,7 @@ pmap_remove_all(vm_page_t m) { register pv_entry_t pv; + pmap_t pmap; pt_entry_t *pte, tpte; pd_entry_t ptepde; @@ -1805,12 +1923,13 @@ #endif mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { - PMAP_LOCK(pv->pv_pmap); - pv->pv_pmap->pm_stats.resident_count--; - pte = pmap_pte_pde(pv->pv_pmap, pv->pv_va, &ptepde); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pmap->pm_stats.resident_count--; + pte = pmap_pte_pde(pmap, pv->pv_va, &ptepde); tpte = pte_load_clear(pte); if (tpte & PG_W) - pv->pv_pmap->pm_stats.wired_count--; + pmap->pm_stats.wired_count--; if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); @@ -1824,13 +1943,12 @@ if (pmap_track_modified(pv->pv_va)) vm_page_dirty(m); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + pmap_invalidate_page(pmap, pv->pv_va); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, ptepde); - PMAP_UNLOCK(pv->pv_pmap); - free_pv_entry(pv); + pmap_unuse_pt(pmap, pv->pv_va, ptepde); + PMAP_UNLOCK(pmap); + free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2584,7 +2702,7 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pv->pv_pmap == pmap) { + if (PV_PMAP(pv) == pmap) { return TRUE; } loops++; @@ -2594,7 +2712,6 @@ return (FALSE); } -#define PMAP_REMOVE_PAGES_CURPROC_ONLY /* * Remove all pages from specified address space * this aids process exit speeds. Also, this code @@ -2604,79 +2721,95 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; - pv_entry_t pv, npv; + pv_entry_t pv; + struct pv_chunk *pc, *npc; + int field, idx; + int64_t bit; + uint64_t inuse, bitmask; + int allfree; -#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) { printf("warning: pmap_remove_pages called with non-current pmap\n"); return; } -#endif vm_page_lock_queues(); PMAP_LOCK(pmap); - for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { + TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) { + allfree = 1; + for (field = 0; field < _NPCM; field++) { + inuse = (~(pc->pc_map[field])) & pc_freemask[field]; + while (inuse != 0) { + bit = bsfq(inuse); + bitmask = 1UL << bit; + idx = field * 64 + bit; + pv = &pc->pc_pventry[idx]; + inuse &= ~bitmask; - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } + pte = vtopte(pv->pv_va); + tpte = *pte; -#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY - pte = vtopte(pv->pv_va); -#else - pte = pmap_pte(pmap, pv->pv_va); -#endif - tpte = *pte; - - if (tpte == 0) { - printf("TPTE at %p IS ZERO @ VA %08lx\n", - pte, pv->pv_va); - panic("bad pte"); - } + if (tpte == 0) { + printf( + "TPTE at %p IS ZERO @ VA %08lx\n", + pte, pv->pv_va); + panic("bad pte"); + } /* * We cannot remove wired pages from a process' mapping at this time */ - if (tpte & PG_W) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } + if (tpte & PG_W) { + allfree = 0; + continue; + } + + m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); + KASSERT(m->phys_addr == (tpte & PG_FRAME), + ("vm_page_t %p phys_addr mismatch %016jx %016jx", + m, (uintmax_t)m->phys_addr, + (uintmax_t)tpte)); - m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); - KASSERT(m->phys_addr == (tpte & PG_FRAME), - ("vm_page_t %p phys_addr mismatch %016jx %016jx", - m, (uintmax_t)m->phys_addr, (uintmax_t)tpte)); + KASSERT(m < &vm_page_array[vm_page_array_size], + ("pmap_remove_pages: bad tpte %#jx", + (uintmax_t)tpte)); - KASSERT(m < &vm_page_array[vm_page_array_size], - ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); + pmap->pm_stats.resident_count--; - pmap->pm_stats.resident_count--; + pte_clear(pte); - pte_clear(pte); + /* + * Update the vm_page_t clean/reference bits. + */ + if (tpte & PG_M) + vm_page_dirty(m); - /* - * Update the vm_page_t clean and reference bits. - */ - if (tpte & PG_M) { - vm_page_dirty(m); + /* Mark free */ + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc->pc_map[field] |= bitmask; + m->md.pv_list_count--; + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + pmap_unuse_pt(pmap, pv->pv_va, + *vtopde(pv->pv_va)); + } + } + if (allfree) { + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); } - - npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - - m->md.pv_list_count--; - TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_EMPTY(&m->md.pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); - - pmap_unuse_pt(pmap, pv->pv_va, *vtopde(pv->pv_va)); - free_pv_entry(pv); } pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); @@ -2694,6 +2827,7 @@ { pv_entry_t pv; pt_entry_t *pte; + pmap_t pmap; boolean_t rv; rv = FALSE; @@ -2709,10 +2843,11 @@ */ if (!pmap_track_modified(pv->pv_va)) continue; - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); rv = (*pte & PG_M) != 0; - PMAP_UNLOCK(pv->pv_pmap); + PMAP_UNLOCK(pmap); if (rv) break; } @@ -2750,6 +2885,7 @@ pmap_clear_ptes(vm_page_t m, long bit) { register pv_entry_t pv; + pmap_t pmap; pt_entry_t pbits, *pte; if ((m->flags & PG_FICTITIOUS) || @@ -2770,8 +2906,9 @@ continue; } - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); retry: pbits = *pte; if (pbits & bit) { @@ -2785,9 +2922,9 @@ } else { atomic_clear_long(pte, bit); } - pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + pmap_invalidate_page(pmap, pv->pv_va); } - PMAP_UNLOCK(pv->pv_pmap); + PMAP_UNLOCK(pmap); } if (bit == PG_RW) vm_page_flag_clear(m, PG_WRITEABLE); @@ -2826,6 +2963,7 @@ pmap_ts_referenced(vm_page_t m) { register pv_entry_t pv, pvf, pvn; + pmap_t pmap; pt_entry_t *pte; pt_entry_t v; int rtval = 0; @@ -2848,20 +2986,21 @@ if (!pmap_track_modified(pv->pv_va)) continue; - PMAP_LOCK(pv->pv_pmap); - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); if (pte && ((v = pte_load(pte)) & PG_A) != 0) { atomic_clear_long(pte, PG_A); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 10 17:08:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C223816A405; Mon, 10 Apr 2006 17:08:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FD9B16A401 for ; Mon, 10 Apr 2006 17:08:57 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5161843D48 for ; Mon, 10 Apr 2006 17:08:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AH8uSY074941 for ; Mon, 10 Apr 2006 17:08:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AH8t0x074938 for perforce@freebsd.org; Mon, 10 Apr 2006 17:08:55 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Apr 2006 17:08:55 GMT Message-Id: <200604101708.k3AH8t0x074938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 94921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 17:08:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=94921 Change 94921 by marcel@marcel_nfs on 2006/04/10 17:07:55 IFC @94915 Affected files ... .. //depot/projects/uart/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#30 integrate .. //depot/projects/uart/arm/arm/cpufunc.c#6 integrate .. //depot/projects/uart/arm/arm/swtch.S#8 integrate .. //depot/projects/uart/arm/arm/trap.c#12 integrate .. //depot/projects/uart/arm/arm/undefined.c#11 integrate .. //depot/projects/uart/arm/at91/at91.c#3 integrate .. //depot/projects/uart/arm/at91/at91_twi.c#2 integrate .. //depot/projects/uart/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/uart/arm/at91/if_ate.c#3 integrate .. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/uart/arm/include/pmap.h#9 integrate .. //depot/projects/uart/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_timer.c#7 integrate .. //depot/projects/uart/conf/options.arm#6 integrate .. //depot/projects/uart/dev/aac/aac.c#17 integrate .. //depot/projects/uart/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/uart/dev/amr/amr.c#14 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#14 integrate .. //depot/projects/uart/dev/amr/amrvar.h#10 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#10 integrate .. //depot/projects/uart/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/uart/dev/drm/drm.h#7 integrate .. //depot/projects/uart/dev/drm/drm_agpsupport.c#5 integrate .. //depot/projects/uart/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/uart/dev/drm/i915_dma.c#3 integrate .. //depot/projects/uart/dev/drm/i915_drm.h#3 integrate .. //depot/projects/uart/dev/drm/i915_drv.h#3 integrate .. //depot/projects/uart/dev/drm/i915_irq.c#3 integrate .. //depot/projects/uart/dev/drm/i915_mem.c#3 integrate .. //depot/projects/uart/dev/drm/mga_drv.h#7 integrate .. //depot/projects/uart/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/uart/dev/drm/r300_reg.h#3 integrate .. //depot/projects/uart/dev/drm/radeon_cp.c#9 integrate .. //depot/projects/uart/dev/drm/radeon_drm.h#9 integrate .. //depot/projects/uart/dev/drm/radeon_drv.h#9 integrate .. //depot/projects/uart/dev/drm/radeon_state.c#10 integrate .. //depot/projects/uart/dev/drm/savage_bci.c#3 integrate .. //depot/projects/uart/dev/drm/savage_state.c#3 integrate .. //depot/projects/uart/dev/drm/sis_ds.c#5 integrate .. //depot/projects/uart/dev/drm/sis_ds.h#6 integrate .. //depot/projects/uart/dev/drm/sis_mm.c#6 integrate .. //depot/projects/uart/dev/em/LICENSE#3 integrate .. //depot/projects/uart/dev/em/README#6 integrate .. //depot/projects/uart/dev/em/if_em.c#21 integrate .. //depot/projects/uart/dev/em/if_em_hw.c#7 integrate .. //depot/projects/uart/dev/em/if_em_hw.h#6 integrate .. //depot/projects/uart/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/uart/dev/iicbus/iic.c#5 integrate .. //depot/projects/uart/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/uart/dev/iicbus/iicsmb.c#3 integrate .. //depot/projects/uart/dev/mfi/mfi.c#3 integrate .. //depot/projects/uart/dev/usb/usbdevs#20 integrate .. //depot/projects/uart/dev/usb/uscanner.c#12 integrate .. //depot/projects/uart/geom/eli/g_eli.c#5 integrate .. //depot/projects/uart/geom/geom.h#10 integrate .. //depot/projects/uart/geom/geom_bsd.c#7 integrate .. //depot/projects/uart/geom/geom_ccd.c#6 integrate .. //depot/projects/uart/geom/geom_ctl.c#9 integrate .. //depot/projects/uart/geom/geom_disk.c#11 integrate .. //depot/projects/uart/geom/geom_gpt.c#6 integrate .. //depot/projects/uart/geom/geom_slice.c#6 integrate .. //depot/projects/uart/geom/geom_subr.c#8 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#14 integrate .. //depot/projects/uart/geom/mirror/g_mirror.h#8 integrate .. //depot/projects/uart/geom/mirror/g_mirror_ctl.c#8 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#15 integrate .. //depot/projects/uart/geom/raid3/g_raid3.h#8 integrate .. //depot/projects/uart/geom/raid3/g_raid3_ctl.c#8 integrate .. //depot/projects/uart/i386/i386/io_apic.c#9 integrate .. //depot/projects/uart/i386/i386/machdep.c#21 integrate .. //depot/projects/uart/i386/isa/npx.c#10 integrate .. //depot/projects/uart/kern/kern_event.c#11 integrate .. //depot/projects/uart/kern/kern_exit.c#15 integrate .. //depot/projects/uart/kern/kern_shutdown.c#9 integrate .. //depot/projects/uart/kern/subr_witness.c#15 integrate .. //depot/projects/uart/kern/uipc_proto.c#4 integrate .. //depot/projects/uart/net/if_media.h#9 integrate .. //depot/projects/uart/net/raw_usrreq.c#7 integrate .. //depot/projects/uart/netgraph/ng_socket.c#10 integrate .. //depot/projects/uart/netinet/tcp_input.c#22 integrate .. //depot/projects/uart/netinet/tcp_sack.c#8 integrate .. //depot/projects/uart/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/uart/netipsec/ipsec.c#11 integrate .. //depot/projects/uart/netipsec/ipsec.h#7 integrate .. //depot/projects/uart/netipsec/xform_ah.c#7 integrate .. //depot/projects/uart/netipsec/xform_esp.c#8 integrate .. //depot/projects/uart/netnatm/natm.c#10 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#12 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/uart/nfsclient/nfsnode.h#7 integrate .. //depot/projects/uart/nfsserver/nfs_srvsock.c#9 integrate .. //depot/projects/uart/posix4/ksched.c#4 integrate .. //depot/projects/uart/posix4/p1003_1b.c#4 integrate .. //depot/projects/uart/powerpc/conf/GENERIC#9 integrate .. //depot/projects/uart/security/mac/mac_vfs.c#6 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#12 integrate .. //depot/projects/uart/sys/filedesc.h#9 integrate .. //depot/projects/uart/sys/mac.h#11 integrate .. //depot/projects/uart/sys/mac_policy.h#9 integrate .. //depot/projects/uart/vm/swap_pager.c#22 integrate .. //depot/projects/uart/vm/swap_pager.h#8 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/io_apic.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -89,6 +89,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -207,9 +208,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -226,9 +225,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -313,6 +310,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/uart/amd64/amd64/pmap.c#30 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.542 2006/04/03 21:36:00 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.543 2006/04/04 20:17:35 peter Exp $"); /* * Manages physical address maps. @@ -1474,13 +1474,14 @@ SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_tryfail, CTLFLAG_RD, &pc_chunk_tryfail, 0, "Number of times tried to get a chunk page but failed."); -static int pv_entry_frees, pv_entry_allocs, pv_entry_spare; +static long pv_entry_frees, pv_entry_allocs; +static int pv_entry_spare; SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, "Current number of pv entries"); -SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, "Current number of pv entry frees"); -SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, "Current number of pv entry allocs"); SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_spare, CTLFLAG_RD, &pv_entry_spare, 0, "Current number of spare pv entries"); ==== //depot/projects/uart/arm/arm/cpufunc.c#6 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.9 2005/05/25 13:46:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.10 2006/04/09 23:07:31 cognet Exp $"); #include @@ -1530,7 +1530,8 @@ cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE - | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE; + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE | + CPU_CONTROL_ROUNDROBIN; cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE ==== //depot/projects/uart/arm/arm/swtch.S#8 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.18 2005/10/04 20:47:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.19 2006/04/09 20:16:47 cognet Exp $"); /* @@ -467,7 +467,7 @@ bl _C_LABEL(fork_exit) /* Kill irq"s */ mrs r0, cpsr - orr r0, r0, #(I32_bit) + orr r0, r0, #(I32_bit|F32_bit) msr cpsr_c, r0 DO_AST PULLFRAME ==== //depot/projects/uart/arm/arm/trap.c#12 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.23 2006/03/01 20:43:51 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.24 2006/04/09 20:16:47 cognet Exp $"); #include @@ -271,9 +271,13 @@ /* Grab the current pcb */ pcb = td->td_pcb; /* Re-enable interrupts if they were enabled previously */ - if (td->td_md.md_spinlock_count == 0 && - __predict_true(tf->tf_spsr & I32_bit) == 0) - enable_interrupts(I32_bit); + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(tf->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(tf->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + /* Invoke the appropriate handler, if necessary */ if (__predict_false(data_aborts[fsr & FAULT_TYPE_MASK].func != NULL)) { @@ -487,6 +491,7 @@ mode = TRAP_USERMODE(tf) ? "user" : "kernel"; + disable_interrupts(I32_bit|F32_bit); if (td != NULL) { printf("Fatal %s mode data abort: '%s'\n", mode, data_aborts[fsr & FAULT_TYPE_MASK].desc); @@ -730,9 +735,13 @@ thread_user_enter(td); } fault_pc = tf->tf_pc; - if (td->td_md.md_spinlock_count == 0 && - __predict_true((tf->tf_spsr & I32_bit) == 0)) - enable_interrupts(I32_bit); + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(tf->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(tf->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + /* See if the cpu state needs to be fixed up */ @@ -1012,9 +1021,13 @@ * Since all syscalls *should* come from user mode it will always * be safe to enable them, but check anyway. */ - if (td->td_md.md_spinlock_count == 0 && !(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); - + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(frame->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(frame->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + syscall(td, frame, insn); } ==== //depot/projects/uart/arm/arm/undefined.c#11 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.12 2006/03/01 18:33:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.13 2006/04/09 20:16:47 cognet Exp $"); #include #include @@ -189,7 +189,7 @@ /* Enable interrupts if they were enabled before the exception. */ if (!(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); + enable_interrupts(I32_bit|F32_bit); frame->tf_pc -= INSN_SIZE; PCPU_LAZY_INC(cnt.v_trap); ==== //depot/projects/uart/arm/at91/at91.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.3 2006/03/18 01:35:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.4 2006/04/06 04:32:29 imp Exp $"); #include #include @@ -201,11 +201,14 @@ struct at91_ivar *ivar; kid = device_add_child_ordered(dev, prio, name, unit); - if (kid == NULL) - return; + if (kid == NULL) { + printf("Can't add child %s%d ordered\n", name, unit); + return; + } ivar = malloc(sizeof(*ivar), M_DEVBUF, M_WAITOK | M_ZERO); if (ivar == NULL) { device_delete_child(dev, kid); + printf("Can't add alloc ivar\n"); return; } device_set_ivars(kid, ivar); ==== //depot/projects/uart/arm/at91/at91_twi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.2 2006/04/06 04:31:19 imp Exp $"); #include #include @@ -40,7 +40,10 @@ #include #include -#include + +#include +#include +#include "iicbus_if.h" struct at91_twi_softc { @@ -50,13 +53,12 @@ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ int flags; -#define XFER_PENDING 1 /* true when transfer taking place */ -#define OPENED 2 /* Device opened */ #define RXRDY 4 -#define TXCOMP 8 #define TXRDY 0x10 - struct cdev *cdev; uint32_t cwgr; + int sc_started; + int twi_addr; + device_t iicbus; }; static inline uint32_t @@ -79,7 +81,6 @@ #define AT91_TWI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define AT91_TWI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define AT91_TWI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); -#define CDEV2SOFTC(dev) ((dev)->si_drv1) #define TWI_DEF_CLK 100000 static devclass_t at91_twi_devclass; @@ -95,19 +96,6 @@ static int at91_twi_activate(device_t dev); static void at91_twi_deactivate(device_t dev); -/* cdev routines */ -static d_open_t at91_twi_open; -static d_close_t at91_twi_close; -static d_ioctl_t at91_twi_ioctl; - -static struct cdevsw at91_twi_cdevsw = -{ - .d_version = D_VERSION, - .d_open = at91_twi_open, - .d_close = at91_twi_close, - .d_ioctl = at91_twi_ioctl -}; - static int at91_twi_probe(device_t dev) { @@ -137,20 +125,23 @@ AT91_TWI_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_twi_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "twi%d", device_get_unit(dev)); - if (sc->cdev == NULL) { - err = ENOMEM; - goto out; - } - sc->cdev->si_drv1 = sc; - sc->cwgr = TWI_CWGR_CKDIV(1) | + sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); + + WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | + TWI_SR_NACK); + + if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) + device_printf(dev, "could not allocate iicbus instance\n"); + + /* probe and attach the iicbus */ + bus_generic_attach(dev); + out:; if (err) at91_twi_deactivate(dev); @@ -160,7 +151,15 @@ static int at91_twi_detach(device_t dev) { - return (EBUSY); /* XXX */ + struct at91_twi_softc *sc; + int rv; + + sc = device_get_softc(dev); + at91_twi_deactivate(dev); + if (sc->iicbus && (rv = device_delete_child(dev, sc->iicbus)) != 0) + return (rv); + + return (0); } static int @@ -215,13 +214,12 @@ /* Reading the status also clears the interrupt */ status = RD4(sc, TWI_SR); + printf("status %x\n", status); if (status == 0) return; AT91_TWI_LOCK(sc); if (status & TWI_SR_RXRDY) sc->flags |= RXRDY; - if (status & TWI_SR_TXCOMP) - sc->flags |= TXCOMP; if (status & TWI_SR_TXRDY) sc->flags |= TXRDY; AT91_TWI_UNLOCK(sc); @@ -229,191 +227,196 @@ return; } -static int -at91_twi_open(struct cdev *dev, int oflags, int devtype, struct thread *td) +static int +at91_twi_wait_stop_done(struct at91_twi_softc *sc) +{ + int err = 0; + + while (!(RD4(sc, TWI_SR) & TWI_SR_TXCOMP)) + continue; + return (err); +} + +/* + * Stop the transfer by entering a STOP state on the iic bus. For read + * operations, we've already entered the STOP state, since we need to do + * that to read the last character. For write operations, we need to + * wait for the TXCOMP bit to turn on before returning. + */ +static int +at91_twi_stop(device_t dev) { struct at91_twi_softc *sc; + int err = 0; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - if (!(sc->flags & OPENED)) { - sc->flags |= OPENED; - WR4(sc, TWI_IER, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); + sc = device_get_softc(dev); + if (sc->sc_started) { + WR4(sc, TWI_CR, TWI_CR_STOP); + err = at91_twi_wait_stop_done(sc); } - AT91_TWI_UNLOCK(sc); - return (0); + return (err); } +/* + * enter a START condition without requiring the device to be in a STOP + * state. + */ static int -at91_twi_close(struct cdev *dev, int fflag, int devtype, struct thread *td) +at91_twi_repeated_start(device_t dev, u_char slave, int timeout) { struct at91_twi_softc *sc; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - sc->flags &= ~OPENED; - WR4(sc, TWI_IDR, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); - AT91_TWI_UNLOCK(sc); + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_DADR(slave)); + WR4(sc, TWI_CR, TWI_CR_START); + sc->sc_started = 1; return (0); } - +/* + * enter a START condition from an idle state. + */ static int -at91_twi_read_master(struct at91_twi_softc *sc, struct at91_twi_io *xfr) +at91_twi_start(device_t dev, u_char slave, int timeout) { - uint8_t *walker; - uint8_t buffer[256]; - size_t len; - int err = 0; + struct at91_twi_softc *sc; - if (xfr->xfer_len > sizeof(buffer)) - return (EINVAL); - walker = buffer; - len = xfr->xfer_len; - RD4(sc, TWI_RHR); - // Master mode, with the right address and interal addr size - WR4(sc, TWI_MMR, TWI_MMR_IADRSZ(xfr->iadrsz) | TWI_MMR_MREAD | - TWI_MMR_DADR(xfr->dadr)); - WR4(sc, TWI_IADR, xfr->iadr); + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_DADR(slave)); WR4(sc, TWI_CR, TWI_CR_START); - while (len-- > 1) { - while (!(sc->flags & RXRDY)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird", - 0); - if (err) - return (err); - } - sc->flags &= ~RXRDY; - *walker++ = RD4(sc, TWI_RHR) & 0xff; - } - WR4(sc, TWI_CR, TWI_CR_STOP); - while (!(sc->flags & TXCOMP)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird2", 0); - if (err) - return (err); - } - sc->flags &= ~TXCOMP; - *walker = RD4(sc, TWI_RHR) & 0xff; - if (xfr->xfer_buf) { - AT91_TWI_UNLOCK(sc); - err = copyout(buffer, xfr->xfer_buf, xfr->xfer_len); - AT91_TWI_LOCK(sc); - } - return (err); + sc->sc_started = 1; + return (0); } static int -at91_twi_write_master(struct at91_twi_softc *sc, struct at91_twi_io *xfr) +at91_twi_write(device_t dev, char *buf, int len, int *sent, int timeout /* us */) { + struct at91_twi_softc *sc; uint8_t *walker; - uint8_t buffer[256]; - size_t len; - int err; + int err = 0; - if (xfr->xfer_len > sizeof(buffer)) - return (EINVAL); - walker = buffer; - len = xfr->xfer_len; - AT91_TWI_UNLOCK(sc); - err = copyin(xfr->xfer_buf, buffer, xfr->xfer_len); + walker = buf; + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_MWRITE | RD4(sc, TWI_MMR)); AT91_TWI_LOCK(sc); - if (err) - return (err); - /* Setup the xfr for later readback */ - xfr->xfer_buf = 0; - xfr->xfer_len = 1; + WR4(sc, TWI_IER, TWI_SR_TXRDY); while (len--) { - WR4(sc, TWI_MMR, TWI_MMR_IADRSZ(xfr->iadrsz) | TWI_MMR_MWRITE | - TWI_MMR_DADR(xfr->dadr)); - WR4(sc, TWI_IADR, xfr->iadr++); WR4(sc, TWI_THR, *walker++); - WR4(sc, TWI_CR, TWI_CR_START); - /* - * If we get signal while waiting for TXRDY, make sure we - * try to stop this device - */ while (!(sc->flags & TXRDY)) { err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr", 0); if (err) - break; + goto errout; } - WR4(sc, TWI_CR, TWI_CR_STOP); - if (err) - return (err); - while (!(sc->flags & TXCOMP)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr2", + } +errout:; + WR4(sc, TWI_IDR, TWI_SR_TXRDY); + AT91_TWI_UNLOCK(sc); + return (err); +} + +static int +at91_twi_read(device_t dev, char *buf, int len, int *read, int last, + int delay /* us */) +{ + struct at91_twi_softc *sc; + char *walker; + int err = 0; + + walker = buf; + sc = device_get_softc(dev); + AT91_TWI_LOCK(sc); + WR4(sc, TWI_MMR, ~TWI_MMR_MWRITE & RD4(sc, TWI_MMR)); + WR4(sc, TWI_IER, TWI_SR_RXRDY); + while (len-- > 0) { + err = 0; + while (!(sc->flags & RXRDY)) { + err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird", 0); if (err) - return (err); + goto errout; } - /* Readback */ - at91_twi_read_master(sc, xfr); + sc->flags &= ~RXRDY; + *walker++ = RD4(sc, TWI_RHR) & 0xff; + if (len == 1 && last) + break; } + if (!last) + goto errout; + WR4(sc, TWI_CR, TWI_CR_STOP); + err = at91_twi_wait_stop_done(sc); + *walker = RD4(sc, TWI_RHR) & 0xff; + if (read) + *read = walker - buf; + sc->sc_started = 0; +errout:; + WR4(sc, TWI_IDR, TWI_SR_RXRDY); + AT91_TWI_UNLOCK(sc); return (err); } static int -at91_twi_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, - struct thread *td) +at91_twi_rst_card(device_t dev, u_char speed, u_char addr, u_char *oldaddr) { - int err = 0; struct at91_twi_softc *sc; + int ckdiv, rate; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - while (sc->flags & XFER_PENDING) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, - "twiwait", 0); - if (err) { - AT91_TWI_UNLOCK(sc); - return (err); - } - } - sc->flags |= XFER_PENDING; + sc = device_get_softc(dev); + if (oldaddr) + *oldaddr = sc->twi_addr; + if (addr != 0) + sc->twi_addr = 0; + else + sc->twi_addr = addr; + + rate = 1; + + /* + * 8 * is because "rate == 1" -> 4 clocks down, 4 clocks up. The + * speeds are for 1.5kb/s, 45kb/s and 90kb/s. + */ + switch (speed) { + case IIC_SLOW: + ckdiv = 8 * AT91C_MASTER_CLOCK / 1500; + break; + + case IIC_FAST: + ckdiv = 8 * AT91C_MASTER_CLOCK / 45000; + break; - switch (cmd) - { - case TWIIOCXFER: - { - struct at91_twi_io *xfr = (struct at91_twi_io *)data; - switch (xfr->type) - { - case TWI_IO_READ_MASTER: - err = at91_twi_read_master(sc, xfr); - break; - case TWI_IO_WRITE_MASTER: - err = at91_twi_write_master(sc, xfr); - break; - default: - err = EINVAL; - break; - } + case IIC_UNKNOWN: + case IIC_FASTEST: + default: + ckdiv = 8 * AT91C_MASTER_CLOCK / 90000; break; } - case TWIIOCSETCLOCK: - { - struct at91_twi_clock *twick = (struct at91_twi_clock *)data; + sc->cwgr = TWI_CWGR_CKDIV(ckdiv) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(rate)) | + TWI_CWGR_CLDIV(TWI_CWGR_DIV(rate)); + WR4(sc, TWI_CR, TWI_CR_SWRST); + WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); + WR4(sc, TWI_CWGR, sc->cwgr); + + return EIO; +} + +static int +at91_twi_callback(device_t dev, int index, caddr_t *data) +{ + int error = 0; + + switch (index) { + case IIC_REQUEST_BUS: + break; - sc->cwgr = TWI_CWGR_CKDIV(twick->ckdiv) | - TWI_CWGR_CHDIV(TWI_CWGR_DIV(twick->high_rate)) | - TWI_CWGR_CLDIV(TWI_CWGR_DIV(twick->low_rate)); - WR4(sc, TWI_CR, TWI_CR_SWRST); - WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); - WR4(sc, TWI_CWGR, sc->cwgr); + case IIC_RELEASE_BUS: break; - } + default: - err = ENOTTY; - break; + error = EINVAL; } - sc->flags &= ~XFER_PENDING; - AT91_TWI_UNLOCK(sc); - wakeup(sc); - return err; + + return (error); } static device_method_t at91_twi_methods[] = { @@ -422,6 +425,14 @@ DEVMETHOD(device_attach, at91_twi_attach), DEVMETHOD(device_detach, at91_twi_detach), + /* iicbus interface */ + DEVMETHOD(iicbus_callback, at91_twi_callback), + DEVMETHOD(iicbus_repeated_start, at91_twi_repeated_start), + DEVMETHOD(iicbus_start, at91_twi_start), + DEVMETHOD(iicbus_stop, at91_twi_stop), + DEVMETHOD(iicbus_write, at91_twi_write), + DEVMETHOD(iicbus_read, at91_twi_read), + DEVMETHOD(iicbus_reset, at91_twi_rst_card), { 0, 0 } }; ==== //depot/projects/uart/arm/at91/at91_usartreg.h#2 (text) ==== @@ -22,30 +22,30 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.2 2006/04/06 04:29:24 imp Exp $ */ #ifndef AT91USARTREG_H_ #define AT91USARTREG_H_ #define USART_CR 0x00 /* Control register */ -#define USART_CR_RSTRX (1 << 2) /* Reset Receiver */ -#define USART_CR_RSTTX (1 << 3) /* Reset Transmitter */ -#define USART_CR_RXEN (1 << 4) /* Receiver Enable */ -#define USART_CR_RXDIS (1 << 5) /* Receiver Disable */ -#define USART_CR_TXEN (1 << 6) /* Transmitter Enable */ -#define USART_CR_TXDIS (1 << 7) /* Transmitter Disable */ -#define USART_CR_RSTSTA (1 << 8) /* Reset Status Bits */ -#define USART_CR_STTBRK (1 << 9) /* Start Break */ -#define USART_CR_STPBRK (1 << 10) /* Stop Break */ -#define USART_CR_STTTO (1 << 11) /* Start Time-out */ -#define USART_CR_SENDA (1 << 12) /* Send Address */ -#define USART_CR_RSTIT (1 << 13) /* Reset Iterations */ -#define USART_CR_RSTNACK (1 << 14) /* Reset Non Acknowledge */ -#define USART_CR_RETTO (1 << 15) /* Rearm Time-out */ -#define USART_CR_DTREN (1 << 16) /* Data Terminal ready Enable */ -#define USART_CR_DTRDIS (1 << 17) /* Data Terminal ready Disable */ -#define USART_CR_RTSEN (1 << 18) /* Request to Send enable */ -#define USART_CR_RTSDIS (1 << 19) /* Request to Send Disable */ +#define USART_CR_RSTRX (1UL << 2) /* Reset Receiver */ +#define USART_CR_RSTTX (1UL << 3) /* Reset Transmitter */ +#define USART_CR_RXEN (1UL << 4) /* Receiver Enable */ +#define USART_CR_RXDIS (1UL << 5) /* Receiver Disable */ +#define USART_CR_TXEN (1UL << 6) /* Transmitter Enable */ +#define USART_CR_TXDIS (1UL << 7) /* Transmitter Disable */ +#define USART_CR_RSTSTA (1UL << 8) /* Reset Status Bits */ +#define USART_CR_STTBRK (1UL << 9) /* Start Break */ +#define USART_CR_STPBRK (1UL << 10) /* Stop Break */ +#define USART_CR_STTTO (1UL << 11) /* Start Time-out */ +#define USART_CR_SENDA (1UL << 12) /* Send Address */ +#define USART_CR_RSTIT (1UL << 13) /* Reset Iterations */ +#define USART_CR_RSTNACK (1UL << 14) /* Reset Non Acknowledge */ +#define USART_CR_RETTO (1UL << 15) /* Rearm Time-out */ +#define USART_CR_DTREN (1UL << 16) /* Data Terminal ready Enable */ +#define USART_CR_DTRDIS (1UL << 17) /* Data Terminal ready Disable */ +#define USART_CR_RTSEN (1UL << 18) /* Request to Send enable */ +#define USART_CR_RTSDIS (1UL << 19) /* Request to Send Disable */ #define USART_MR 0x04 /* Mode register */ #define USART_MR_MODE_NORMAL 0 /* Normal/Async/3-wire rs-232 */ @@ -91,28 +91,28 @@ #define USART_IMR 0x10 /* Interrupt mask register */ #define USART_CSR 0x14 /* Channel status register */ -#define USART_CSR_RXRDY (1U << 0) /* Receiver ready */ -#define USART_CSR_TXRDY (1U << 1) /* Transmitter ready */ -#define USART_CSR_RXBRK (1U << 2) /* Break received */ -#define USART_CSR_ENDRX (1U << 3) /* End of Transfer RX from PDC */ -#define USART_CSR_ENDTX (1U << 4) /* End of Transfer TX from PDC */ -#define USART_CSR_OVRE (1U << 5) /* Overrun error */ -#define USART_CSR_FRAME (1U << 6) /* Framing error */ -#define USART_CSR_PARE (1U << 7) /* Parity Error */ -#define USART_CSR_TIMEOUT (1U << 8) /* Timeout since start-timeout */ -#define USART_CSR_TXEMPTY (1U << 9) /* Transmitter empty */ -#define USART_CSR_ITERATION (1U << 10) /* max repetitions since RSIT */ -#define USART_CSR_TXBUFE (1U << 11) /* Buffer empty from PDC */ -#define USART_CSR_RXBUFF (1U << 12) /* Buffer full from PDC */ -#define USART_CSR_NACK (1U << 13) /* NACK since last RSTNACK */ -#define USART_CSR_RIIC (1U << 16) /* RI delta since last csr read */ -#define USART_CSR_DSRIC (1U << 17) /* DSR delta */ -#define USART_CSR_DCDIC (1U << 18) /* DCD delta */ -#define USART_CSR_CTSIC (1U << 19) /* CTS delta */ -#define USART_CSR_RI (1U << 20) /* RI status */ -#define USART_CSR_DSR (1U << 21) /* DSR status */ -#define USART_CSR_DCD (1U << 22) /* DCD status */ -#define USART_CSR_CTS (1U << 23) /* CTS status */ +#define USART_CSR_RXRDY (1UL << 0) /* Receiver ready */ +#define USART_CSR_TXRDY (1UL << 1) /* Transmitter ready */ +#define USART_CSR_RXBRK (1UL << 2) /* Break received */ +#define USART_CSR_ENDRX (1UL << 3) /* End of Transfer RX from PDC */ +#define USART_CSR_ENDTX (1UL << 4) /* End of Transfer TX from PDC */ +#define USART_CSR_OVRE (1UL << 5) /* Overrun error */ +#define USART_CSR_FRAME (1UL << 6) /* Framing error */ +#define USART_CSR_PARE (1UL << 7) /* Parity Error */ +#define USART_CSR_TIMEOUT (1UL << 8) /* Timeout since start-timeout */ +#define USART_CSR_TXEMPTY (1UL << 9) /* Transmitter empty */ +#define USART_CSR_ITERATION (1UL << 10) /* max repetitions since RSIT */ +#define USART_CSR_TXBUFE (1UL << 11) /* Buffer empty from PDC */ +#define USART_CSR_RXBUFF (1UL << 12) /* Buffer full from PDC */ +#define USART_CSR_NACK (1UL << 13) /* NACK since last RSTNACK */ +#define USART_CSR_RIIC (1UL << 16) /* RI delta since last csr read */ +#define USART_CSR_DSRIC (1UL << 17) /* DSR delta */ +#define USART_CSR_DCDIC (1UL << 18) /* DCD delta */ +#define USART_CSR_CTSIC (1UL << 19) /* CTS delta */ +#define USART_CSR_RI (1UL << 20) /* RI status */ +#define USART_CSR_DSR (1UL << 21) /* DSR status */ +#define USART_CSR_DCD (1UL << 22) /* DCD status */ +#define USART_CSR_CTS (1UL << 23) /* CTS status */ #define USART_RHR 0x18 /* Receiver holding register */ #define USART_THR 0x1c /* Transmitter holding register */ @@ -125,24 +125,4 @@ /* 0x48 reserved */ #define USART_IFR 0x48 /* IrDA filter register */ - -#define UART_RXRDY (0x1 << 0) /* RXRDY Interrupt */ -#define UART_TXRDY (0x1 << 1) /* TXRDY Interrupt */ -#define UART_RXBRK (0x1 << 2) /* Break Received/End of Break */ -#define UART_ENDRX (0x1 << 3) /* End of Receive Transfer Interrupt */ -#define UART_ENDTX (0x1 << 4) /* End of Transmit Interrupt */ -#define UART_OVRE (0x1 << 5) /* Overrun Interrupt */ -#define UART_FRAME (0x1 << 6) /* Framing Error Interrupt */ -#define UART_PARE (0x1 << 7) /* Parity Error Interrupt */ -#define UART_TIMEOUT ( 0x1 << 8) /* (USART) Receiver Time-out */ -#define UART_TXEMPTY ( 0x1 << 9) /* (USART) TXEMPTY Interrupt */ -#define UART_ITERATION ( 0x1 << 10) /* (USART) Max number of Repetitions Reached */ -#define UART_TXBUFE ( 0x1 << 11) /* (USART) TXBUFE Interrupt */ -#define UART_RXBUFF ( 0x1 << 12) /* (USART) RXBUFF Interrupt */ -#define UART_NACK ( 0x1 << 13) /* (USART) Non Acknowledge */ -#define UART_RIIC ( 0x1 << 16) /* (USART) Ring INdicator Input Change Flag */ -#define AT91RM92_US_DSRIC ( 0x1 << 17) /* (USART) Data Set Ready Input Change Flag */ -#define AT91RM92_US_DCDIC ( 0x1 << 18) /* (USART) Data Carrier Flag */ -#define AT91RM92_US_CTSIC ( 0x1 << 19) /* (USART) Clear To Send Input Change Flag */ - #endif /* AT91RM92REG_H_ */ ==== //depot/projects/uart/arm/at91/if_ate.c#3 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.5 2006/03/18 01:43:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.6 2006/04/06 04:30:23 imp Exp $"); #include #include @@ -86,13 +86,14 @@ struct callout tick_ch; /* Tick callout */ bus_dma_tag_t mtag; /* bus dma tag for mbufs */ bus_dmamap_t tx_map[ATE_MAX_TX_BUFFERS]; + struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ bus_dma_tag_t rxtag; bus_dmamap_t rx_map[ATE_MAX_RX_BUFFERS]; + void *rx_buf[ATE_MAX_RX_BUFFERS]; /* RX buffer space */ + int rx_buf_ptr; bus_dma_tag_t rx_desc_tag; bus_dmamap_t rx_desc_map; int txcur; /* current tx map pointer */ - struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ - struct mbuf *rx_mbuf[ATE_MAX_RX_BUFFERS]; /* RX mbufs */ bus_addr_t rx_desc_phys; eth_rx_desc_t *rx_descs; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ @@ -241,6 +242,30 @@ sc->rx_desc_phys = segs[0].ds_addr; } +static void +ate_load_rx_buf(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 10 17:14:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19DE716A403; Mon, 10 Apr 2006 17:14:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A980616A401 for ; Mon, 10 Apr 2006 17:14:03 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5973F43D5C for ; Mon, 10 Apr 2006 17:14:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AHE3PB078208 for ; Mon, 10 Apr 2006 17:14:03 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AHE2K9078199 for perforce@freebsd.org; Mon, 10 Apr 2006 17:14:02 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 17:14:02 GMT Message-Id: <200604101714.k3AHE2K9078199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 17:14:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=94922 Change 94922 by imp@imp_Speedy on 2006/04/10 17:13:06 Rewrite makefile from scratch linker.cfg simplification Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#3 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/linker.cfg#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#3 (text+ko) ==== @@ -1,38 +1,18 @@ -# ****************************************************************************** -# * -# * Filename: Makefile -# * -# * Classic makefile intended for use in gnu environment. The entries listed -# * here are intentionally simple to aid the novice user in his/her own -# * development - for easy modification. -# * -# * Revision information: -# * -# * 20AUG2004 kb_admin initial creation -# * 12JAN2005 kb_admin re-org, added emac -# * -# * BEGIN_KBDD_BLOCK -# * No warranty, expressed or implied, is included with this software. It is -# * provided "AS IS" and no warranty of any kind including statutory or aspects -# * relating to merchantability or fitness for any purpose is provided. All -# * intellectual property rights of others is maintained with the respective -# * owners. This software is not copyrighted and is intended for reference -# * only. -# * END_BLOCK -# ****************************************************************************** -# +PROG=boot0 +SRCS=arm_init.s at91rm9200_lowlevel.c main.c debug_io.c xmodem.c +NO_MAN= +LDFLAGS=-e 0 -T linker.cfg +CFLAGS=-O2 -mcpu=arm9 -ffreestanding +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +CLEANFILES=${OBJS} ${PROG} ${PROG}.out + +all: ${PROG} -CFILES= at91rm9200_lowlevel.o main.o debug_io.o xmodem.o -ASFILES= arm_init.o -OBJCOPY=objcopy -LD=ld -CFLAGS=-O2 -mcpu=arm9 -ffreestanding -PROG=boot0 +${PROG}: ${PROG}.out ${OBJS} + objcopy -S -O binary ${PROG}.out ${PROG} -${PROG}.bin: ${PROG}.out - ${OBJCOPY} -O binary ${PROG}.out ${PROG}.bin -${PROG}.out: ${CFILES} ${ASFILES} - ${LD} -e 0 -o ${PROG}.out -T linker.cfg ${ASFILES} ${CFILES} +${PROG}.out: ${OBJS} + ld ${LDFLAGS} -o ${PROG}.out ${OBJS} clean: - rm -f ${CFILES} ${ASFILES} ${PROG}.out ${PROG}.bin + rm -f ${CLEANFILES} ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/linker.cfg#2 (text+ko) ==== @@ -23,8 +23,6 @@ OUTPUT_ARCH(arm) ENTRY(start) SEARCH_DIR(/usr/local/arm/2.95.3/arm-linux/lib); -/* Do we need any of these for elf? - __DYNAMIC = 0; */ SECTIONS { /* Read-only sections, merged into text segment: */ @@ -39,137 +37,9 @@ *(.gnu.linkonce.t.*) *(.glue_7t) *(.glue_7) } - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.text : - { - *(.rel.text) - *(.rel.text.*) - *(.rel.gnu.linkonce.t.*) - } - .rela.text : - { - *(.rela.text) - *(.rela.text.*) - *(.rela.gnu.linkonce.t.*) - } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.rodata : - { - *(.rel.rodata) - *(.rel.rodata.*) - *(.rel.gnu.linkonce.r.*) - } - .rela.rodata : - { - *(.rela.rodata) - *(.rela.rodata.*) - *(.rela.gnu.linkonce.r.*) - } - .rel.data : - { - *(.rel.data) - *(.rel.data.*) - *(.rel.gnu.linkonce.d.*) - } - .rela.data : - { - *(.rela.data) - *(.rela.data.*) - *(.rela.gnu.linkonce.d.*) - } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.sdata : - { - *(.rel.sdata) - *(.rel.sdata.*) - *(.rel.gnu.linkonce.s.*) - } - .rela.sdata : - { - *(.rela.sdata) - *(.rela.sdata.*) - *(.rela.gnu.linkonce.s.*) - } - .rel.sbss : - { - *(.rel.sbss) - *(.rel.sbss.*) - *(.rel.gnu.linkonce.sb.*) - } - .rela.sbss : - { - *(.rela.sbss) - *(.rela.sbss.*) - *(.rel.gnu.linkonce.sb.*) - } - .rel.sdata2 : - { - *(.rel.sdata2) - *(.rel.sdata2.*) - *(.rel.gnu.linkonce.s2.*) - } - .rela.sdata2 : - { - *(.rela.sdata2) - *(.rela.sdata2.*) - *(.rela.gnu.linkonce.s2.*) - } - .rel.sbss2 : - { - *(.rel.sbss2) - *(.rel.sbss2.*) - *(.rel.gnu.linkonce.sb2.*) - } - .rela.sbss2 : - { - *(.rela.sbss2) - *(.rela.sbss2.*) - *(.rela.gnu.linkonce.sb2.*) - } - .rel.bss : - { - *(.rel.bss) - *(.rel.bss.*) - *(.rel.gnu.linkonce.b.*) - } - .rela.bss : - { - *(.rela.bss) - *(.rela.bss.*) - *(.rela.gnu.linkonce.b.*) - } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : - { - KEEP (*(.init)) - } =0 - .plt : { *(.plt) } - .fini : - { - KEEP (*(.fini)) - } =0 PROVIDE (__etext = .); PROVIDE (_etext = .); PROVIDE (etext = .); - .rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } - .rodata1 : { *(.rodata1) } - .sdata2 : { *(.sdata2) *(.sdata2.*) *(.gnu.linkonce.s2.*) } - .sbss2 : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) } .data : { __data_start = . ; @@ -178,48 +48,6 @@ *(.gnu.linkonce.d.*) SORT(CONSTRUCTORS) } - .data1 : { *(.data1) } - . = 0x21200000; - .eh_frame : { KEEP (*(.eh_frame)) } - .gcc_except_table : { *(.gcc_except_table) } - .ctors : - { - /* gcc uses crtbegin.o to find the start of - the constructors, so we make sure it is - first. Because this is a wildcard, it - doesn't matter if the user does not - actually link against crtbegin.o; the - linker won't look for a file to match a - wildcard. The wildcard also means that it - doesn't matter which directory crtbegin.o - is in. */ - KEEP (*crtbegin.o(.ctors)) - /* We don't want to include the .ctor section from - from the crtend.o file until after the sorted ctors. - The .ctor section from the crtend file contains the - end of ctors marker and it must be last */ - KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - } - .dtors : - { - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - } - .got : { *(.got.plt) *(.got) } - .dynamic : { *(.dynamic) } - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : - { - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - } _edata = .; PROVIDE (edata = .); __bss_start = .; @@ -252,38 +80,4 @@ _end = .; _bss_end__ = . ; __bss_end__ = . ; __end__ = . ; PROVIDE (end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ } From owner-p4-projects@FreeBSD.ORG Mon Apr 10 17:29:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDF2216A404; Mon, 10 Apr 2006 17:29:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8148D16A401 for ; Mon, 10 Apr 2006 17:29:22 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4558E43D45 for ; Mon, 10 Apr 2006 17:29:22 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AHTM2v085633 for ; Mon, 10 Apr 2006 17:29:22 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AHTLU4085630 for perforce@freebsd.org; Mon, 10 Apr 2006 17:29:21 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Apr 2006 17:29:21 GMT Message-Id: <200604101729.k3AHTLU4085630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 94923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 17:29:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=94923 Change 94923 by marcel@marcel_nfs on 2006/04/10 17:29:15 For single-UART cards with default RCLK, have uart(4) attach directly. Affected files ... .. //depot/projects/uart/dev/puc/pucdata.c#16 edit .. //depot/projects/uart/dev/uart/uart_bus_pci.c#11 edit Differences ... ==== //depot/projects/uart/dev/puc/pucdata.c#16 (text+ko) ==== @@ -257,33 +257,6 @@ * SIIG "10x" family boards. */ - /* SIIG Cyber Serial PCI 16C550 (10x family): 1S */ - { "SIIG Cyber Serial PCI 16C550 (10x family)", - { 0x131f, 0x1000, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - }, - }, - - /* SIIG Cyber Serial PCI 16C650 (10x family): 1S */ - { "SIIG Cyber Serial PCI 16C650 (10x family)", - { 0x131f, 0x1001, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - }, - }, - - /* SIIG Cyber Serial PCI 16C850 (10x family): 1S */ - { "SIIG Cyber Serial PCI 16C850 (10x family)", - { 0x131f, 0x1002, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - }, - }, - /* SIIG Cyber I/O PCI 16C550 (10x family): 1S, 1P */ { "SIIG Cyber I/O PCI 16C550 (10x family)", { 0x131f, 0x1010, 0, 0 }, @@ -488,33 +461,6 @@ }, }, - /* SIIG Cyber Serial PCI 16C550 (20x family): 1S */ - { "SIIG Cyber Serial PCI 16C550 (20x family)", - { 0x131f, 0x2000, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - }, - }, - - /* SIIG Cyber Serial PCI 16C650 (20x family): 1S */ - { "SIIG Cyber Serial PCI 16C650 (20x family)", - { 0x131f, 0x2001, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - }, - }, - - /* SIIG Cyber Serial PCI 16C850 (20x family): 1S */ - { "SIIG Cyber Serial PCI 16C850 (20x family)", - { 0x131f, 0x2002, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - }, - }, - /* SIIG Cyber I/O PCI 16C550 (20x family): 1S, 1P */ { "SIIG Cyber I/O PCI 16C550 (20x family)", { 0x131f, 0x2010, 0, 0 }, @@ -797,15 +743,6 @@ }, }, - /* Lava Computers DSerial PCI serial ports */ - { "Lava Computers serial port", - { 0x1407, 0x0110, 0, 0 }, - { 0xffff, 0xfffc, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - }, - }, - /* Lava Computers Octopus-550 serial ports */ { "Lava Computers Octopus-550 8-port serial", { 0x1407, 0x0180, 0, 0 }, @@ -818,24 +755,6 @@ }, }, - /* US Robotics (3Com) PCI Modems */ - { "US Robotics (3Com) 3CP5609 PCI 16550 Modem", - { 0x12b9, 0x1008, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - }, - }, - - /* Actiontec 56K PCI Master */ - { "Actiontec 56K PCI Master", - { 0x11c1, 0x0480, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - }, - }, - /* * Boards with an Oxford Semiconductor chip. * @@ -945,18 +864,6 @@ }, }, - /* - * This is the Middle Digital, Inc. PCI-Weasel, which - * uses a PCI interface implemented in FPGA. - */ - { "Middle Digital, Inc. Weasel serial port", - { 0xdeaf, 0x9051, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - }, - }, - /* SD-LAB PCI I/O Card 4S2P */ { "Syba Tech Ltd. PCI-4S2P-550-ECP", { 0x1592, 0x0781, 0, 0 }, ==== //depot/projects/uart/dev/uart/uart_bus_pci.c#11 (text+ko) ==== @@ -67,7 +67,6 @@ { 0x01101407, "Lava Computers serial port", 0x10 }, { 0x01111407, "Lava Computers serial port", 0x10 }, { 0x9051deaf, "Middle Digital, Inc. Weasel serial port", 0x10 }, - { 0x950b1415, "Oxford Semiconductor OXCB950 UART", 0x10 }, { 0x01c0135c, "Quatech SSCLP-200/300", 0x18 /* * NB: You must mount the "SPAD" jumper to correctly detect From owner-p4-projects@FreeBSD.ORG Mon Apr 10 17:56:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C25116A408; Mon, 10 Apr 2006 17:56:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E269416A406 for ; Mon, 10 Apr 2006 17:56:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97FF243D4C for ; Mon, 10 Apr 2006 17:56:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AHuugg001931 for ; Mon, 10 Apr 2006 17:56:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AHuuC2001925 for perforce@freebsd.org; Mon, 10 Apr 2006 17:56:56 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 17:56:56 GMT Message-Id: <200604101756.k3AHuuC2001925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 17:56:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=94925 Change 94925 by imp@imp_Speedy on 2006/04/10 17:56:21 We don't need debug_io.h here. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#5 (text+ko) ==== @@ -22,7 +22,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "debug_io.h" #include "AT91RM9200.h" typedef void fn_t(void); From owner-p4-projects@FreeBSD.ORG Mon Apr 10 18:07:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CC1016A405; Mon, 10 Apr 2006 18:07:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58F1E16A409 for ; Mon, 10 Apr 2006 18:07:14 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B9F143D6B for ; Mon, 10 Apr 2006 18:07:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AI79BR008189 for ; Mon, 10 Apr 2006 18:07:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AI79wY008186 for perforce@freebsd.org; Mon, 10 Apr 2006 18:07:09 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 18:07:09 GMT Message-Id: <200604101807.k3AI79wY008186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 18:07:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=94926 Change 94926 by imp@imp_Speedy on 2006/04/10 18:06:39 Migrate towards using more standard interfaces. Use getc/getchar and putc. This also happens to have a bunch of bytes off the size of this unit. We're now at 1040 bytes. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#27 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#4 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/debug_io.c#4 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/debug_io.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/lib.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/lib.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#27 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ PROG=boot0 -SRCS=arm_init.s at91rm9200_lowlevel.c main.c debug_io.c xmodem.c +SRCS=arm_init.s at91rm9200_lowlevel.c lib.c main.c xmodem.c NO_MAN= LDFLAGS=-e 0 -T linker.cfg CFLAGS=-O2 -mcpu=arm9 -ffreestanding ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#4 (text+ko) ==== @@ -22,7 +22,6 @@ #include "AT91RM9200.h" #include "at91rm9200_lowlevel.h" -#include "debug_io.h" #define BAUD 115200 ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.c#3 (text+ko) ==== @@ -1,29 +1,28 @@ -/******************************************************************************* +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. * - * Filename: xmodem.c + * 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. * - * Instantiation of simple x-modem support using debug uart channel. - * - * Revision information: - * - * 22AUG2004 kb_admin initial creation - * 24AUG2004 kb_admin optimize for space, not quite as elegant. . . - * - * BEGIN_KBDD_BLOCK - * No warranty, expressed or implied, is included with this software. It is - * provided "AS IS" and no warranty of any kind including statutory or aspects - * relating to merchantability or fitness for any purpose is provided. All - * intellectual property rights of others is maintained with the respective - * owners. This software is not copyrighted and is intended for reference - * only. - * END_BLOCK - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 "at91rm9200_lowlevel.h" - -/* ****************************** GLOBALS *************************************/ - -/* ********************* PRIVATE FUNCTIONS/DATA/DEFINES ***********************/ +#include "lib.h" #define PACKET_SIZE 128 @@ -34,15 +33,6 @@ #define CAN 0x18 /* Cancel */ #define EOT 0x04 /* end of text */ -enum { - INVALID_STATE = 0, - WAITING_START, - WAIT_SOH, - RX_PACKET, - RX_EOT, - SEND_NAK -}; - /* * .KB_C_FN_DEFINITION_START * int GetRecord(char , char *) @@ -54,52 +44,48 @@ GetRecord(char blocknum, char *dest) { int size; - char nextChar; + int ch; unsigned chk, j; chk = 0; - if (!WaitForChar(&nextChar, 1)) + if ((ch = getc(1)) == -1) goto err; - if (nextChar != blocknum) + if (ch != blocknum) goto err; - if (!WaitForChar(&nextChar, 1)) + if ((ch = getc(1)) == -1) goto err; - if ((char)nextChar != (char)~blocknum) + if (ch != ~blocknum & 0xff) goto err; for (size = 0; size < PACKET_SIZE; ++size) { - if (!WaitForChar(&nextChar, 1)) + if ((ch = getc(1)) == -1) goto err; - chk = chk ^(int)nextChar << 8; + chk = chk ^ ch << 8; for (j = 0; j < 8; ++j) { if (chk & 0x8000) chk = chk << 1 ^ 0x1021; else chk = chk << 1; } - *dest++ = nextChar; + *dest++ = ch; } chk &= 0xFFFF; - if ((!WaitForChar(&nextChar, 1)) || (nextChar != ((chk >> 8) & 0xFF))) + if (((ch = getc(1)) == -1) || (ch & 0xff != ((chk >> 8) & 0xFF))) goto err; - if ((!WaitForChar(&nextChar, 1)) || (nextChar != (chk & 0xFF))) + if (((ch = getc(1)) == -1) || (ch & 0xff != (chk & 0xFF))) goto err; - DebugPutc(ACK); + putc(ACK); return (1); err:; - DebugPutc(NAK); + putc(CAN); // We should allow for resend, but we don't. return (0); } - -/* ************************** GLOBAL FUNCTIONS ********************************/ - - /* * .KB_C_FN_DEFINITION_START * int xmodem_rx(char *) @@ -111,20 +97,19 @@ int xmodem_rx(char *dest) { - int starting; - char packetNumber, nextChar, *startAddress = dest; + int starting, ch; + char packetNumber, *startAddress = dest; packetNumber = 1; starting = 1; while (1) { if (starting) - DebugPutc('C'); - if (!WaitForChar(&nextChar, 1) || - (nextChar != SOH && nextChar != EOT)) + putc('C'); + if (((ch = getc(1)) == -1) || (ch != SOH && ch != EOT)) continue; - if (nextChar == EOT) { - DebugPutc(ACK); + if (ch == EOT) { + putc(ACK); return (dest - startAddress); } starting = 0; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 18:10:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2458016A406; Mon, 10 Apr 2006 18:10:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 030F316A400 for ; Mon, 10 Apr 2006 18:10:13 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABD6843D48 for ; Mon, 10 Apr 2006 18:10:13 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AIADuc008304 for ; Mon, 10 Apr 2006 18:10:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AIADQC008301 for perforce@freebsd.org; Mon, 10 Apr 2006 18:10:13 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 18:10:13 GMT Message-Id: <200604101810.k3AIADQC008301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 18:10:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=94927 Change 94927 by imp@imp_Speedy on 2006/04/10 18:09:42 Use a volatile pointer to write to the memory, rather than just a bunch of back to back writes. This bloats us back to 1084, but is necessary to stabilize the SDRAM. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#5 (text+ko) ==== @@ -49,6 +49,7 @@ register unsigned value; int i; + volatile unsigned short *p = (unsigned short *)SDRAM_BASE; AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC10; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC10; @@ -139,30 +140,30 @@ AT91C_BASE_SDRC->SDRC_MR = AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_PRCGALL_CMD; - *(unsigned short*)SDRAM_BASE = 0; + *p = 0; AT91C_BASE_SDRC->SDRC_MR = AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_RFSH_CMD; - *(unsigned short*)SDRAM_BASE = 0; - *(unsigned short*)SDRAM_BASE = 0; - *(unsigned short*)SDRAM_BASE = 0; - *(unsigned short*)SDRAM_BASE = 0; - *(unsigned short*)SDRAM_BASE = 0; - *(unsigned short*)SDRAM_BASE = 0; - *(unsigned short*)SDRAM_BASE = 0; - *(unsigned short*)SDRAM_BASE = 0; + *p = 0; + *p = 0; + *p = 0; + *p = 0; + *p = 0; + *p = 0; + *p = 0; + *p = 0; AT91C_BASE_SDRC->SDRC_MR = AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_LMR_CMD; - *(unsigned short*)SDRAM_BASE = 0; + *p = 0; AT91C_BASE_SDRC->SDRC_TR = 7 * AT91C_MASTER_CLOCK / 1000000; - *(unsigned short*)SDRAM_BASE = 0; + *p = 0; AT91C_BASE_SDRC->SDRC_MR = AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_NORMAL_CMD; - *(unsigned short*)SDRAM_BASE = 0; + *p = 0; // Configure DBGU -use local routine optimized for space pPio->PIO_ASR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 18:40:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD60816A40F; Mon, 10 Apr 2006 18:40:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86FDD16A403 for ; Mon, 10 Apr 2006 18:40:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F32E543D70 for ; Mon, 10 Apr 2006 18:39:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AIdpdA026866 for ; Mon, 10 Apr 2006 18:39:51 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AIdp5O026860 for perforce@freebsd.org; Mon, 10 Apr 2006 18:39:51 GMT (envelope-from jhb@freebsd.org) Date: Mon, 10 Apr 2006 18:39:51 GMT Message-Id: <200604101839.k3AIdp5O026860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 94932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 18:40:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=94932 Change 94932 by jhb@jhb_slimer on 2006/04/10 18:39:34 Use the kernel linker to lookup our linker set instead of depending on ld(8). Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#30 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#30 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -61,15 +62,15 @@ void (*ev_handler)(void); }; -SET_DECLARE(crash_event_set, struct crash_event); - #define CRASH_EVENT(name, function) \ static struct crash_event function ## _crash_event = \ { name, function }; \ DATA_SET(crash_event_set, function ## _crash_event) -#define MAX_EVENT SET_COUNT(crash_event_set) +#define MAX_EVENT event_max +static int event_max; +static struct crash_event **event_start, **event_stop; static struct rwlock baz; static struct sx foo, bar, bar2; static struct cv event_cv; @@ -630,12 +631,11 @@ { struct crash_event **ev; - SET_FOREACH(ev, crash_event_set) { + for (ev = event_start; ev < event_stop; ev++) { /* Skip null event 0. */ if ((*ev)->ev_name == NULL) continue; - printf("%4td %s\n", ev - SET_BEGIN(crash_event_set), - (*ev)->ev_name); + printf("%4td %s\n", ev - event_start, (*ev)->ev_name); } } CRASH_EVENT("help", help); @@ -692,7 +692,7 @@ printf("crash: event %d is not defined!\n", event); continue; } - evp = SET_ITEM(crash_event_set, ev); + evp = event_start[ev]; printf("crash: %s\n", evp->ev_name); evp->ev_handler(); } @@ -758,6 +758,10 @@ switch (cmd) { case MOD_LOAD: + error = linker_file_lookup_set(module_file(module), + "crash_event_set", &event_start, &event_stop, &event_max); + if (error) + break; error = load(arg); break; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Mon Apr 10 18:40:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AD3916A408; Mon, 10 Apr 2006 18:40:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE71716A404 for ; Mon, 10 Apr 2006 18:40:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D21343D45 for ; Mon, 10 Apr 2006 18:40:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AIer4D027694 for ; Mon, 10 Apr 2006 18:40:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AIeqdp027691 for perforce@freebsd.org; Mon, 10 Apr 2006 18:40:52 GMT (envelope-from jhb@freebsd.org) Date: Mon, 10 Apr 2006 18:40:52 GMT Message-Id: <200604101840.k3AIeqdp027691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 94933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 18:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=94933 Change 94933 by jhb@jhb_slimer on 2006/04/10 18:40:04 Always use the kernel linker instead of depending on ld(8). Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#6 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#6 (text+ko) ==== @@ -61,10 +61,6 @@ #define NTHREADS 4 -#ifndef __amd64__ -#define USE_SET -#endif - typedef void (*event_handler)(void); struct crash2_event { @@ -72,10 +68,6 @@ event_handler ev_handler[NTHREADS]; }; -#ifdef USE_SET -SET_DECLARE(crash2_event_set, struct crash2_event); -#endif - #define CRASH2_EVENT(name, func, ...) \ _CRASH2_EVENT(name, __LINE__, func , ## __VA_ARGS__) #define _CRASH2_EVENT(name, line, func, ...) \ @@ -85,16 +77,10 @@ { name, { func , ## __VA_ARGS__ } }; \ DATA_SET(crash2_event_set, crash2_event_ ## line) -#ifdef USE_SET -#define MAX_EVENT SET_COUNT(crash2_event_set) -#else #define MAX_EVENT event_max -#endif -#ifndef USE_SET static int event_max; static struct crash2_event **event_start, **event_stop; -#endif static struct cv event_cv; static struct mtx event_mtx; static struct proc *kthread[NTHREADS]; @@ -179,20 +165,11 @@ { struct crash2_event **ev; -#ifdef USE_SET - SET_FOREACH(ev, crash2_event_set) { -#else for (ev = event_start; ev < event_stop; ev++) { -#endif /* Skip null event 0. */ if ((*ev)->ev_name == NULL) continue; -#ifdef USE_SET - printf("%4td %s\n", ev - SET_BEGIN(crash2_event_set), -#else - printf("%4td %s\n", ev - event_start, -#endif - (*ev)->ev_name); + printf("%4td %s\n", ev - event_start, (*ev)->ev_name); } } CRASH2_EVENT("help", help); @@ -263,11 +240,7 @@ printf("crash2[%d]: event %d is not defined!\n", i, ev); continue; } -#ifdef USE_SET - evp = SET_ITEM(crash2_event_set, ev); -#else evp = event_start[ev]; -#endif if (evp->ev_handler[i]) evp->ev_handler[i](); mtx_lock(&event_mtx); @@ -344,12 +317,10 @@ switch (cmd) { case MOD_LOAD: -#ifndef USE_SET error = linker_file_lookup_set(module_file(module), "crash2_event_set", &event_start, &event_stop, &event_max); if (error) break; -#endif error = load(arg); break; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Mon Apr 10 18:57:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 351EA16A40A; Mon, 10 Apr 2006 18:57:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E768216A405 for ; Mon, 10 Apr 2006 18:57:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 399F343D68 for ; Mon, 10 Apr 2006 18:57:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AIvFER035674 for ; Mon, 10 Apr 2006 18:57:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AIvFF2035668 for perforce@freebsd.org; Mon, 10 Apr 2006 18:57:15 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 18:57:15 GMT Message-Id: <200604101857.k3AIvFF2035668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 18:57:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=94940 Change 94940 by imp@imp_Speedy on 2006/04/10 18:56:56 Nits, but important ones that makes the download work. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ goto err; if ((ch = getc(1)) == -1) goto err; - if (ch != ~blocknum & 0xff) + if (ch != (~blocknum & 0xff)) goto err; for (size = 0; size < PACKET_SIZE; ++size) { @@ -73,10 +73,10 @@ chk &= 0xFFFF; - if (((ch = getc(1)) == -1) || (ch & 0xff != ((chk >> 8) & 0xFF))) - goto err; - if (((ch = getc(1)) == -1) || (ch & 0xff != (chk & 0xFF))) - goto err; + if (((ch = getc(1)) == -1) || ((ch & 0xff) != ((chk >> 8) & 0xFF))) + goto err; + if (((ch = getc(1)) == -1) || ((ch & 0xff) != (chk & 0xFF))) + goto err; putc(ACK); return (1); From owner-p4-projects@FreeBSD.ORG Mon Apr 10 19:09:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07A5116A403; Mon, 10 Apr 2006 19:09:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7CED16A400 for ; Mon, 10 Apr 2006 19:09:31 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B09343D4C for ; Mon, 10 Apr 2006 19:09:31 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AJ9VH7041811 for ; Mon, 10 Apr 2006 19:09:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AJ9U0W041808 for perforce@freebsd.org; Mon, 10 Apr 2006 19:09:30 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Apr 2006 19:09:30 GMT Message-Id: <200604101909.k3AJ9U0W041808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 94942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 19:09:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=94942 Change 94942 by marcel@marcel_nfs on 2006/04/10 19:08:57 Allow non-standard rclk values for PCI cards and attach those single-UART PCI boards with uart(4) and not puc(4). Affected files ... .. //depot/projects/uart/dev/puc/pucdata.c#17 edit .. //depot/projects/uart/dev/uart/uart_bus_pci.c#12 edit Differences ... ==== //depot/projects/uart/dev/puc/pucdata.c#17 (text+ko) ==== @@ -798,16 +798,6 @@ }, }, - /* Oxford Semiconductor OXCB950 PCI/CardBus UARTs */ - { "Oxford Semiconductor OXCB950 UART", - { 0x1415, 0x950b, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - /* { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, */ - { PUC_PORT_TYPE_COM, 0x10, 0x00, 16384000 }, - }, - }, - /* * Oxford Semiconductor OX9160/OX16PCI954 PCI UARTS * Second chip on Exsys EX-41098 8x cards @@ -1165,21 +1155,6 @@ }, }, - { "Dell RAC III Virtual UART", - { 0x1028, 0x0008, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 128 }, - }, - }, - - { "Dell RAC IV/ERA Virtual UART", - { 0x1028, 0x0012, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_COM, 0x14, 0x00, DEFAULT_RCLK * 128 }, - }, - }, { /* "VScom 200Li" 00=14D2 02=8028 uart@20 uart@+8 */ "VScom 200Li", { 0x14d2, 0x8028, 0, 0 }, ==== //depot/projects/uart/dev/uart/uart_bus_pci.c#12 (text+ko) ==== @@ -40,6 +40,8 @@ #include #include +#define DEFAULT_RCLK 1843200 + static int uart_pci_probe(device_t dev); static device_method_t uart_pci_methods[] = { @@ -60,13 +62,17 @@ uint32_t type; const char *desc; int rid; + int rclk; }; static struct pci_id pci_ns8250_ids[] = { { 0x048011c1, "Actiontec 56K PCI Master", 0x14 }, + { 0x00081028, "Dell RAC III Virtual UART", 0x14, 128*DEFAULT_RCLK }, + { 0x00121028, "Dell RAC IV/ERA Virtual UART", 0x14, 128*DEFAULT_RCLK }, { 0x01101407, "Lava Computers serial port", 0x10 }, { 0x01111407, "Lava Computers serial port", 0x10 }, { 0x9051deaf, "Middle Digital, Inc. Weasel serial port", 0x10 }, + { 0x950b1415, "Oxford Semiconductor OXCB950 UART", 0x10, 16384000 }, { 0x01c0135c, "Quatech SSCLP-200/300", 0x18 /* * NB: You must mount the "SPAD" jumper to correctly detect @@ -115,7 +121,7 @@ match: if (id->desc) device_set_desc(dev, id->desc); - return (uart_bus_probe(dev, 0, 0, id->rid, 0)); + return (uart_bus_probe(dev, 0, id->rclk, id->rid, 0)); } DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Mon Apr 10 19:17:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C6DD16A406; Mon, 10 Apr 2006 19:17:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F6E516A408 for ; Mon, 10 Apr 2006 19:17:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AC0543D48 for ; Mon, 10 Apr 2006 19:17:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AJHfvT047928 for ; Mon, 10 Apr 2006 19:17:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AJHfrB047925 for perforce@freebsd.org; Mon, 10 Apr 2006 19:17:41 GMT (envelope-from jhb@freebsd.org) Date: Mon, 10 Apr 2006 19:17:41 GMT Message-Id: <200604101917.k3AJHfrB047925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 94944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 19:17:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=94944 Change 94944 by jhb@jhb_slimer on 2006/04/10 19:16:57 Various upgrade/downgrade tests for rwlocks. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#31 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#31 (text+ko) ==== @@ -86,6 +86,73 @@ /* Events. */ +static void +upgrade_baz(void) +{ + rw_init(&baz, "baz"); + rw_rlock(&baz); + if (rw_try_upgrade(&baz) == 0) { + printf("crash: umm, upgrade failed?\n"); + rw_runlock(&baz); + } else + rw_wunlock(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("rlock baz, upgrade, and release", upgrade_baz); + +static void +downgrade_baz(void) +{ + rw_init(&baz, "baz"); + rw_wlock(&baz); + rw_downgrade(&baz); + rw_runlock(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("wlock baz, downgrade, and release", downgrade_baz); + +static void +upgrade_excl_baz(void) +{ + rw_init(&baz, "baz"); + rw_wlock(&baz); + rw_try_upgrade(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("wlock baz, upgrade", upgrade_excl_baz); + +static void +downgrade_shared_baz(void) +{ + rw_init(&baz, "baz"); + rw_rlock(&baz); + rw_downgrade(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("rlock baz, downgrade", downgrade_shared_baz); + +static void +runlock_upgraded_baz(void) +{ + rw_init(&baz, "baz"); + rw_rlock(&baz); + rw_try_upgrade(&baz); + rw_runlock(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("rlock baz, upgrade, runlock", runlock_upgraded_baz); + +static void +wunlock_downgraded_baz(void) +{ + rw_init(&baz, "baz"); + rw_wlock(&baz); + rw_downgrade(&baz); + rw_wunlock(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("wlock baz, downgrade, wunlock", wunlock_downgraded_baz); + #ifdef WITNESS static void @@ -356,8 +423,8 @@ if (sx_try_upgrade(&foo) == 0) { printf("crash: umm, upgrade failed?\n"); sx_sunlock(&foo); - } - sx_xunlock(&foo); + } else + sx_xunlock(&foo); } CRASH_EVENT("slock foo, upgrade, and release", upgrade_foo); From owner-p4-projects@FreeBSD.ORG Mon Apr 10 19:44:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06F9D16A426; Mon, 10 Apr 2006 19:44:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A11AC16A424 for ; Mon, 10 Apr 2006 19:44:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89F1343D49 for ; Mon, 10 Apr 2006 19:44:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AJiGPA062983 for ; Mon, 10 Apr 2006 19:44:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AJiGIZ062980 for perforce@freebsd.org; Mon, 10 Apr 2006 19:44:16 GMT (envelope-from jhb@freebsd.org) Date: Mon, 10 Apr 2006 19:44:16 GMT Message-Id: <200604101944.k3AJiGIZ062980@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 94945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 19:44:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=94945 Change 94945 by jhb@jhb_slimer on 2006/04/10 19:44:00 Reduce diff with CVS. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#122 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#122 (text+ko) ==== @@ -455,7 +455,7 @@ int line) { #if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) - struct thread *owner; + volatile struct thread *owner; #endif uintptr_t v; #ifdef KTR @@ -551,16 +551,8 @@ if (m != &Giant && TD_IS_RUNNING(owner)) { #endif turnstile_release(&m->mtx_object); - - /* - * Expanded TD_IS_RUNNING so that we could force - * the compiler to not cache owner->td_state. - * Otherwise, we wouldn't notice when the owning - * thread stopped running. - */ while (mtx_rawowner(m) == owner && - ((volatile struct thread *)owner)->td_state == - TDS_RUNNING) { + TD_IS_RUNNING(owner)) { cpu_spinwait(); } continue; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 21:08:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8923F16A404; Mon, 10 Apr 2006 21:08:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38AF116A406 for ; Mon, 10 Apr 2006 21:08:02 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFF6643D45 for ; Mon, 10 Apr 2006 21:08:01 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AL81qf016353 for ; Mon, 10 Apr 2006 21:08:01 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AL81DV016350 for perforce@freebsd.org; Mon, 10 Apr 2006 21:08:01 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Apr 2006 21:08:01 GMT Message-Id: <200604102108.k3AL81DV016350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 94953 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 21:08:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=94953 Change 94953 by marcel@marcel_nfs on 2006/04/10 21:07:26 Normalize the description based on the PCI database. Resort and reindent. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_pci.c#13 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_pci.c#13 (text+ko) ==== @@ -66,31 +66,31 @@ }; static struct pci_id pci_ns8250_ids[] = { - { 0x048011c1, "Actiontec 56K PCI Master", 0x14 }, - { 0x00081028, "Dell RAC III Virtual UART", 0x14, 128*DEFAULT_RCLK }, - { 0x00121028, "Dell RAC IV/ERA Virtual UART", 0x14, 128*DEFAULT_RCLK }, - { 0x01101407, "Lava Computers serial port", 0x10 }, - { 0x01111407, "Lava Computers serial port", 0x10 }, - { 0x9051deaf, "Middle Digital, Inc. Weasel serial port", 0x10 }, - { 0x950b1415, "Oxford Semiconductor OXCB950 UART", 0x10, 16384000 }, - { 0x01c0135c, "Quatech SSCLP-200/300", 0x18 - /* - * NB: You must mount the "SPAD" jumper to correctly detect - * the FIFO on the UART. Set the options on the jumpers, - * we do not support the extra registers on the Quatech. - */ - }, - { 0x7101135e, "SeaLevel Ultra 530.PCI Single Port Serial", 0x18 }, - { 0x1000131f, "SIIG Cyber Serial PCI 16C550 (10x family)", 0x18 }, - { 0x1001131f, "SIIG Cyber Serial PCI 16C650 (10x family)", 0x18 }, - { 0x1002131f, "SIIG Cyber Serial PCI 16C850 (10x family)", 0x18 }, - { 0x2000131f, "SIIG Cyber Serial PCI 16C550 (20x family)", 0x10 }, - { 0x2001131f, "SIIG Cyber Serial PCI 16C650 (20x family)", 0x10 }, - { 0x2002131f, "SIIG Cyber Serial PCI 16C850 (20x family)", 0x10 }, - { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, - { 0x100812b9, "US Robotics (3Com) 3CP5609 PCI 16550 Modem", 0x10 }, - { 0x0103115d, "Xircom Cardbus modem", 0x10 }, - { 0x00000000, NULL, 0 } +{ 0x100812b9, "3Com - 56K FaxModem Model 5610", 0x10 }, +{ 0x048011c1, "Agere Systems - Venus Modem (V90, 56KFlex)", 0x14 }, +{ 0x00081028, "Dell - Remote Access Card III", 0x14, 128 * DEFAULT_RCLK }, +{ 0x00121028, "Dell - Remote Access Card 4 Daughter Card Virtual UART", 0x14, 128 * DEFAULT_RCLK }, +{ 0x01101407, "Lava Computer mfg - DSerial-PCI Port A", 0x10 }, +{ 0x01111407, "Lava Computer mfg - DSerial-PCI Port B", 0x10 }, +{ 0x9051deaf, "Middle Digital - PC Weasel Serial Port", 0x10 }, +{ 0x950b1415, "Oxford Semiconductor - OXCB950 Cardbus 16950 UART", 0x10, 16384000 }, +{ 0x01c0135c, "Quatech - SSCLP-200/300", 0x18 + /* + * NB: You must mount the "SPAD" jumper to correctly detect + * the FIFO on the UART. Set the options on the jumpers, + * we do not support the extra registers on the Quatech. + */ +}, +{ 0x7101135e, "Sealevel Systems - Single Port RS-232/422/485/530", 0x18 }, +{ 0x1000131f, "Siig - CyberSerial (1-port) 16550", 0x18 }, +{ 0x1001131f, "Siig - CyberSerial (1-port) 16650", 0x18 }, +{ 0x1002131f, "Siig - CyberSerial (1-port) 16850", 0x18 }, +{ 0x2000131f, "Siig - CyberSerial (1-port) 16550", 0x10 }, +{ 0x2001131f, "Siig - CyberSerial (1-port) 16650", 0x10 }, +{ 0x2002131f, "Siig - CyberSerial (1-port) 16850", 0x10 }, +{ 0x0000151f, "TOPIC SEMICONDUCTOR - TP560 Data/Fax/Voice 56k modem", 0x10 }, +{ 0x0103115d, "Xircom - Cardbus Ethernet + 56k Modem", 0x10 }, +{ 0x00000000, NULL, 0 } }; static struct pci_id * From owner-p4-projects@FreeBSD.ORG Mon Apr 10 22:33:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D27D116A403; Mon, 10 Apr 2006 22:33:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAC1816A401 for ; Mon, 10 Apr 2006 22:33:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71CD943D45 for ; Mon, 10 Apr 2006 22:33:46 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AMXkg1063216 for ; Mon, 10 Apr 2006 22:33:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AMXkwd063202 for perforce@freebsd.org; Mon, 10 Apr 2006 22:33:46 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 10 Apr 2006 22:33:46 GMT Message-Id: <200604102233.k3AMXkwd063202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 22:33:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=94956 Change 94956 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/10 22:33:07 don't enable interrupts in _start - silly vestige from sparc64 fix scratch register comment, pcb to rarely used in traps to warrant scratch register Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#10 (text+ko) ==== @@ -66,11 +66,6 @@ sub %l0, SPOFF + CCFSZ, %sp /* - * Enable interrupts. - */ - wrpr %g0, PSTATE_KERNEL, %pstate - - /* * Do initial bootstrap to setup pmap and thread0. */ call sparc64_init @@ -99,14 +94,12 @@ /* * Disable interrupts, normal globals. */ - wrpr %g0, PSTATE_NORMAL, %pstate - mov %o0, PCPU_REG /* - * store PCB_REG and PCPU_REG into their respective scratchpad registers - * this allows us to retrieve them in the trap handlers - where we receive - * a new set of globals + * store PCPU_REG into its scratchpad register + * this allows us to retrieve it in the trap handlers - + * where we receive a new set of globals */ mov SCRATCH_REG_PCPU, %g2 stxa PCPU_REG, [%g2]ASI_SCRATCHPAD From owner-p4-projects@FreeBSD.ORG Mon Apr 10 22:38:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A53E516A405; Mon, 10 Apr 2006 22:38:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 822BD16A403 for ; Mon, 10 Apr 2006 22:38:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A80243D48 for ; Mon, 10 Apr 2006 22:38:53 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AMcrej067227 for ; Mon, 10 Apr 2006 22:38:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AMcqiN067219 for perforce@freebsd.org; Mon, 10 Apr 2006 22:38:52 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Apr 2006 22:38:52 GMT Message-Id: <200604102238.k3AMcqiN067219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 94957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 22:38:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=94957 Change 94957 by marcel@marcel_nfs on 2006/04/10 22:38:15 Allow specification of subvendor and subdevice. Resort on vendor, device. Affected files ... .. //depot/projects/uart/dev/puc/pucdata.c#18 edit .. //depot/projects/uart/dev/uart/uart_bus_pci.c#14 edit Differences ... ==== //depot/projects/uart/dev/puc/pucdata.c#18 (text+ko) ==== @@ -693,27 +693,6 @@ }, }, - /* - * NEC PK-UG-X001 K56flex PCI Modem card. - * Uses NEC MARTH bridge chip and Rockwell RCVDL56ACF/SP. - */ - { "NEC PK-UG-X001 K56flex PCI Modem", - { 0x1033, 0x0074, 0x1033, 0x8014 }, - { 0xffff, 0xffff, 0xffff, 0xffff }, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - }, - }, - - /* NEC PK-UG-X008 */ - { "NEC PK-UG-X008", - { 0x1033, 0x007d, 0x1033, 0x8012 }, - { 0xffff, 0xffff, 0xffff, 0xffff }, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - }, - }, - /* Lava Computers 2SP-PCI */ { "Lava Computers 2SP-PCI parallel port", { 0x1407, 0x8000, 0, 0 }, ==== //depot/projects/uart/dev/uart/uart_bus_pci.c#14 (text+ko) ==== @@ -59,47 +59,65 @@ }; struct pci_id { - uint32_t type; + uint16_t vendor; + uint16_t device; + uint16_t subven; + uint16_t subdev; const char *desc; int rid; int rclk; }; static struct pci_id pci_ns8250_ids[] = { -{ 0x100812b9, "3Com - 56K FaxModem Model 5610", 0x10 }, -{ 0x048011c1, "Agere Systems - Venus Modem (V90, 56KFlex)", 0x14 }, -{ 0x00081028, "Dell - Remote Access Card III", 0x14, 128 * DEFAULT_RCLK }, -{ 0x00121028, "Dell - Remote Access Card 4 Daughter Card Virtual UART", 0x14, 128 * DEFAULT_RCLK }, -{ 0x01101407, "Lava Computer mfg - DSerial-PCI Port A", 0x10 }, -{ 0x01111407, "Lava Computer mfg - DSerial-PCI Port B", 0x10 }, -{ 0x9051deaf, "Middle Digital - PC Weasel Serial Port", 0x10 }, -{ 0x950b1415, "Oxford Semiconductor - OXCB950 Cardbus 16950 UART", 0x10, 16384000 }, -{ 0x01c0135c, "Quatech - SSCLP-200/300", 0x18 +{ 0x1028, 0x0008, 0xffff, 0, "Dell - Remote Access Card III", 0x14, 128 * DEFAULT_RCLK }, +{ 0x1028, 0x0012, 0xffff, 0, "Dell - Remote Access Card 4 Daughter Card Virtual UART", 0x14, 128 * DEFAULT_RCLK }, +{ 0x1033, 0x0074, 0x1033, 0x8014, "NEC - RCV56ACF 56k Voice Modem", 0x10 }, +{ 0x1033, 0x007d, 0x1033, 0x8012, "NEC - RS232C", 0x10 }, +{ 0x11c1, 0x0480, 0xffff, 0, "Agere Systems - Venus Modem (V90, 56KFlex)", 0x14 }, +{ 0x115d, 0x0103, 0xffff, 0, "Xircom - Cardbus Ethernet + 56k Modem", 0x10 }, +{ 0x12b9, 0x1008, 0xffff, 0, "3Com - 56K FaxModem Model 5610", 0x10 }, +{ 0x131f, 0x1000, 0xffff, 0, "Siig - CyberSerial (1-port) 16550", 0x18 }, +{ 0x131f, 0x1001, 0xffff, 0, "Siig - CyberSerial (1-port) 16650", 0x18 }, +{ 0x131f, 0x1002, 0xffff, 0, "Siig - CyberSerial (1-port) 16850", 0x18 }, +{ 0x131f, 0x2000, 0xffff, 0, "Siig - CyberSerial (1-port) 16550", 0x10 }, +{ 0x131f, 0x2001, 0xffff, 0, "Siig - CyberSerial (1-port) 16650", 0x10 }, +{ 0x131f, 0x2002, 0xffff, 0, "Siig - CyberSerial (1-port) 16850", 0x10 }, +{ 0x135c, 0x01c0, 0xffff, 0, "Quatech - SSCLP-200/300", 0x18 /* * NB: You must mount the "SPAD" jumper to correctly detect * the FIFO on the UART. Set the options on the jumpers, * we do not support the extra registers on the Quatech. */ }, -{ 0x7101135e, "Sealevel Systems - Single Port RS-232/422/485/530", 0x18 }, -{ 0x1000131f, "Siig - CyberSerial (1-port) 16550", 0x18 }, -{ 0x1001131f, "Siig - CyberSerial (1-port) 16650", 0x18 }, -{ 0x1002131f, "Siig - CyberSerial (1-port) 16850", 0x18 }, -{ 0x2000131f, "Siig - CyberSerial (1-port) 16550", 0x10 }, -{ 0x2001131f, "Siig - CyberSerial (1-port) 16650", 0x10 }, -{ 0x2002131f, "Siig - CyberSerial (1-port) 16850", 0x10 }, -{ 0x0000151f, "TOPIC SEMICONDUCTOR - TP560 Data/Fax/Voice 56k modem", 0x10 }, -{ 0x0103115d, "Xircom - Cardbus Ethernet + 56k Modem", 0x10 }, -{ 0x00000000, NULL, 0 } +{ 0x135e, 0x7101, 0xffff, 0, "Sealevel Systems - Single Port RS-232/422/485/530", 0x18 }, +{ 0x1407, 0x0110, 0xffff, 0, "Lava Computer mfg - DSerial-PCI Port A", 0x10 }, +{ 0x1407, 0x0111, 0xffff, 0, "Lava Computer mfg - DSerial-PCI Port B", 0x10 }, +{ 0x1415, 0x950b, 0xffff, 0, "Oxford Semiconductor - OXCB950 Cardbus 16950 UART", 0x10, 16384000 }, +{ 0x151f, 0x0000, 0xffff, 0, "TOPIC SEMICONDUCTOR - TP560 Data/Fax/Voice 56k modem", 0x10 }, +{ 0xdeaf, 0x9051, 0xffff, 0, "Middle Digital - PC Weasel Serial Port", 0x10 }, +{ 0xffff, 0, 0xffff, 0, NULL, 0, 0} }; static struct pci_id * -uart_pci_match(uint32_t type, struct pci_id *id) +uart_pci_match(device_t dev, struct pci_id *id) { + uint16_t device, subdev, subven, vendor; - while (id->type && id->type != type) + vendor = pci_get_vendor(dev); + device = pci_get_device(dev); + while (id->vendor != 0xffff && + (id->vendor != vendor || id->device != device)) + id++; + if (id->vendor == 0xffff) + return (NULL); + if (id->subven == 0xffff) + return (id); + subven = pci_get_subvendor(dev); + subdev = pci_get_subdevice(dev); + while (id->vendor == vendor && id->device == device && + (id->subven != subven || id->subdev != subdev)) id++; - return ((id->type) ? id : NULL); + return ((id->vendor == vendor && id->device == device) ? id : NULL); } static int @@ -110,7 +128,7 @@ sc = device_get_softc(dev); - id = uart_pci_match(pci_get_devid(dev), pci_ns8250_ids); + id = uart_pci_match(dev, pci_ns8250_ids); if (id != NULL) { sc->sc_class = &uart_ns8250_class; goto match; From owner-p4-projects@FreeBSD.ORG Mon Apr 10 22:40:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD20716A407; Mon, 10 Apr 2006 22:40:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBF8216A401 for ; Mon, 10 Apr 2006 22:40:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C43A43D46 for ; Mon, 10 Apr 2006 22:40:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AMeuGS068681 for ; Mon, 10 Apr 2006 22:40:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AMetB3068674 for perforce@freebsd.org; Mon, 10 Apr 2006 22:40:55 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Apr 2006 22:40:55 GMT Message-Id: <200604102240.k3AMetB3068674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 22:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=94958 Change 94958 by imp@imp_Speedy on 2006/04/10 22:40:55 Start to support both 10MHz and 16MHz clocks for download. Ideally we'd support all the Main Clocks that the bootloader would support, but that's going to take some doing to get the right tables. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#6 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#3 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#6 (text+ko) ==== @@ -67,41 +67,29 @@ value = AT91C_BASE_CKGR->CKGR_PLLAR; value &= ~AT91C_CKGR_DIVA; value &= ~AT91C_CKGR_OUTA; -#ifdef USE_80P_20M_CLOCKS - value |= (OSC_MAIN_FREQ_DIV | AT91C_CKGR_OUTA_0); -#else - value |= (OSC_MAIN_FREQ_DIV | AT91C_CKGR_OUTA_2); -#endif + value |= (OSC_MAIN_FREQ_DIV_16 | AT91C_CKGR_OUTA_2); value |= AT91C_CKGR_SRCA; AT91C_BASE_CKGR->CKGR_PLLAR = value; // mul = 90 value = AT91C_BASE_CKGR->CKGR_PLLAR; value &= ~AT91C_CKGR_MULA; -#ifdef USE_80P_20M_CLOCKS - value |= (39 << 16); -#else - value |= (89 << 16); -#endif + value |= (OSC_MAIN_MULT -1) << 16; AT91C_BASE_CKGR->CKGR_PLLAR = value; // wait for lock - while (!((AT91C_BASE_PMC->PMC_SR) & AT91C_PMC_LOCKA)) ; + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_LOCKA)) ; // change divider = 3, pres = 1 value = AT91C_BASE_PMC->PMC_MCKR; value &= ~AT91C_PMC_MDIV; -#ifdef USE_80P_20M_CLOCKS - value |= AT91C_PMC_MDIV_4; -#else value |= AT91C_PMC_MDIV_3; -#endif value &= ~AT91C_PMC_PRES; value |= AT91C_PMC_PRES_CLK; AT91C_BASE_PMC->PMC_MCKR = value; // wait for update - while (!((AT91C_BASE_PMC->PMC_SR) & AT91C_PMC_MCKRDY)) ; + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) ; // change CSS = PLLA value &= ~AT91C_PMC_CSS; @@ -109,7 +97,7 @@ AT91C_BASE_PMC->PMC_MCKR = value; // wait for update - while (!((AT91C_BASE_PMC->PMC_SR) & AT91C_PMC_MCKRDY)) ; + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) ; // setup SDRAM access // EBI chip-select register (CS1 = SDRAM controller) ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#3 (text+ko) ==== @@ -1,46 +1,41 @@ -/******************************************************************************* +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. * - * Filename: at91rm9200_lowlevel.h + * 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. * - * Definition of low-level routines to access the chip-specific - * functions/registers. - * - * Revision information: - * - * 20AUG2004 kb_admin initial creation - * - * BEGIN_KBDD_BLOCK - * No warranty, expressed or implied, is included with this software. It is - * provided "AS IS" and no warranty of any kind including statutory or aspects - * relating to merchantability or fitness for any purpose is provided. All - * intellectual property rights of others is maintained with the respective - * owners. This software is not copyrighted and is intended for reference - * only. - * END_BLOCK - ******************************************************************************/ + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 _AT91RM9200_LOWLEVEL_H_ #define _AT91RM9200_LOWLEVEL_H_ /* default system config parameters */ -/* Define following for 80MHz processor/20MHz master */ -/* If not defined, set for 180MHz processor/60MHz master */ -// #ifdef USE_80P_20M_CLOCKS - #define SDRAM_BASE 0x20000000 /* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */ -// #define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */ -#define OSC_MAIN_FREQ_DIV 8 /* for 16MHz osc */ +#define OSC_MAIN_FREQ_DIV_10 5 /* for 10MHz osc */ +#define OSC_MAIN_FREQ_DIV_16 8 /* for 16MHz osc */ +#define OSC_MAIN_MULT 90 /* Constant for both */ /* Master clock frequency at power-up */ -#ifdef USE_80P_20M_CLOCKS -#define AT91C_MASTER_CLOCK 20000000 -#else #define AT91C_MASTER_CLOCK 60000000 -#endif - #define GetSeconds() (AT91C_BASE_RTC->RTC_TIMR & AT91C_RTC_SEC) ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#6 (text+ko) ==== @@ -23,6 +23,7 @@ */ #include "AT91RM9200.h" +#include "at91rm9200_lowlevel.h" typedef void fn_t(void); From owner-p4-projects@FreeBSD.ORG Mon Apr 10 23:40:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F02F116A402; Mon, 10 Apr 2006 23:40:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D03216A400 for ; Mon, 10 Apr 2006 23:40:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2006143D45 for ; Mon, 10 Apr 2006 23:40:08 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ANe7CI000927 for ; Mon, 10 Apr 2006 23:40:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ANe7dl000918 for perforce@freebsd.org; Mon, 10 Apr 2006 23:40:07 GMT (envelope-from jb@freebsd.org) Date: Mon, 10 Apr 2006 23:40:07 GMT Message-Id: <200604102340.k3ANe7dl000918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 94959 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 23:40:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=94959 Change 94959 by jb@jb_freebsd2 on 2006/04/10 23:39:21 Ensure that CDDL code is only built if NO_CDDL is not defined. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile#3 (text+ko) ==== @@ -1,5 +1,9 @@ # $FreeBSD$ -SUBDIR= lib usr.bin usr.sbin +SUBDIR= + +.if !defined(NO_CDDL) +SUBDIR+= lib usr.bin usr.sbin +.endif .include From owner-p4-projects@FreeBSD.ORG Tue Apr 11 00:10:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6278316A406; Tue, 11 Apr 2006 00:10:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2232616A404 for ; Tue, 11 Apr 2006 00:10:46 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C256D43D49 for ; Tue, 11 Apr 2006 00:10:45 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B0Ajxn015620 for ; Tue, 11 Apr 2006 00:10:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B0Ajmf015607 for perforce@freebsd.org; Tue, 11 Apr 2006 00:10:45 GMT (envelope-from marcel@freebsd.org) Date: Tue, 11 Apr 2006 00:10:45 GMT Message-Id: <200604110010.k3B0Ajmf015607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 94960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 00:10:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=94960 Change 94960 by marcel@marcel_nfs on 2006/04/11 00:09:48 Add an ipend() method. The method is called by puc(4) to obtain pending interrupt status for each of the UARTs it controls. This allows puc(4) to call the source-specific interrupt handlers on a priority basis using the function pointers returned by the ihand() method. Affected files ... .. //depot/projects/uart/kern/serdev_if.m#6 edit Differences ... ==== //depot/projects/uart/kern/serdev_if.m#6 (text+ko) ==== @@ -50,6 +50,12 @@ } static int + default_ipend(device_t dev) + { + return (-1); + } + + static int default_sysdev(device_t dev) { return (0); @@ -66,6 +72,15 @@ int ipend; } DEFAULT default_ihand; +# ipend() - Query pending interrupt status. +# This method is called by the umbrella driver to obtain interrupt status +# for the UART in question. This allows the umbrella driver to build a +# matrix and service the interrupts in the most flexible way by calling +# interrupt handlers collected with the ihand() method. +METHOD int ipend { + device_t dev; +} DEFAULT default_ipend; + # sysdev() - Query system device status # This method may be called by the umbrella driver for each child driver # to establish if a particular channel and mode is currently being used From owner-p4-projects@FreeBSD.ORG Tue Apr 11 00:23:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9286116A405; Tue, 11 Apr 2006 00:23:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60C5216A404 for ; Tue, 11 Apr 2006 00:23:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CFCF43D45 for ; Tue, 11 Apr 2006 00:23:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B0N1oH025221 for ; Tue, 11 Apr 2006 00:23:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B0N0YM025218 for perforce@freebsd.org; Tue, 11 Apr 2006 00:23:00 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 00:23:00 GMT Message-Id: <200604110023.k3B0N0YM025218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 00:23:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=94961 Change 94961 by imp@imp_Speedy on 2006/04/11 00:22:42 minor moves towards supporting dual clocks. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#7 (text+ko) ==== @@ -50,6 +50,7 @@ register unsigned value; int i; volatile unsigned short *p = (unsigned short *)SDRAM_BASE; + unsigned int div; AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC10; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC10; @@ -61,14 +62,19 @@ // PLLB configured for 96MHz (48MHz after div) // CSS = PLLB + // Crude selection between 16MHz clock and 10MHz clock. + if (AT91C_BASE_CKGR->CKGR_MCFR & AT91C_CKGR_MAINF < 6000) + div = OSC_MAIN_FREQ_DIV_10; + else + div = OSC_MAIN_FREQ_DIV_16; + // set PLLA = 180MHz // assume main osc = 10Mhz // div = 5 , out = 2 (150MHz = 240MHz) value = AT91C_BASE_CKGR->CKGR_PLLAR; value &= ~AT91C_CKGR_DIVA; value &= ~AT91C_CKGR_OUTA; - value |= (OSC_MAIN_FREQ_DIV_16 | AT91C_CKGR_OUTA_2); - value |= AT91C_CKGR_SRCA; + value |= div | AT91C_CKGR_OUTA_2 | AT91C_CKGR_SRCA; AT91C_BASE_CKGR->CKGR_PLLAR = value; // mul = 90 From owner-p4-projects@FreeBSD.ORG Tue Apr 11 00:59:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43F7916A403; Tue, 11 Apr 2006 00:59:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BC0516A400 for ; Tue, 11 Apr 2006 00:59:53 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 674AA43D6A for ; Tue, 11 Apr 2006 00:59:47 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B0xleT051447 for ; Tue, 11 Apr 2006 00:59:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B0xkKp051429 for perforce@freebsd.org; Tue, 11 Apr 2006 00:59:46 GMT (envelope-from marcel@freebsd.org) Date: Tue, 11 Apr 2006 00:59:46 GMT Message-Id: <200604110059.k3B0xkKp051429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 94962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 00:59:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=94962 Change 94962 by marcel@marcel_nfs on 2006/04/11 00:59:26 override the serdev I/F methods for ihand() and ipend() for the puc(4) attachment. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#46 edit .. //depot/projects/uart/dev/uart/uart_bus_puc.c#12 edit .. //depot/projects/uart/dev/uart/uart_core.c#53 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#46 (text+ko) ==== @@ -140,6 +140,7 @@ int uart_bus_attach(device_t dev); int uart_bus_detach(device_t dev); serdev_intr_t *uart_bus_ihand(device_t dev, int ipend); +int uart_bus_ipend(device_t dev); int uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan); int uart_bus_sysdev(device_t dev); ==== //depot/projects/uart/dev/uart/uart_bus_puc.c#12 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2006 Marcel Moolenaar. All rights reserved. * Copyright (c) 2002 JF Hay. All rights reserved. * Copyright (c) 2001 M. Warner Losh. All rights reserved. * @@ -36,6 +37,9 @@ #include #include +#include +#include + #include #include @@ -49,6 +53,9 @@ DEVMETHOD(device_probe, uart_puc_probe), DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), + /* Serdev interface */ + DEVMETHOD(serdev_ihand, uart_bus_ihand), + DEVMETHOD(serdev_ipend, uart_bus_ipend), { 0, 0 } }; ==== //depot/projects/uart/dev/uart/uart_core.c#53 (text+ko) ==== @@ -267,6 +267,15 @@ } int +uart_bus_ipend(device_t dev) +{ + struct uart_softc *sc; + + sc = device_get_softc(dev); + return (UART_IPEND(sc)); +} + +int uart_bus_sysdev(device_t dev) { struct uart_softc *sc; From owner-p4-projects@FreeBSD.ORG Tue Apr 11 01:08:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5474E16A405; Tue, 11 Apr 2006 01:08:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2ED3416A400 for ; Tue, 11 Apr 2006 01:08:59 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEC5E43D49 for ; Tue, 11 Apr 2006 01:08:58 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B18wOx055663 for ; Tue, 11 Apr 2006 01:08:58 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B18w1C055660 for perforce@freebsd.org; Tue, 11 Apr 2006 01:08:58 GMT (envelope-from jmg@freebsd.org) Date: Tue, 11 Apr 2006 01:08:58 GMT Message-Id: <200604110108.k3B18w1C055660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 01:08:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=94963 Change 94963 by jmg@jmg_carbon-60 on 2006/04/11 01:08:05 fix odering of args, the hcall.S has them this way, how anoying... make an arg uint64_t, the hv docs doesn't say how large this needs to be.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#14 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#14 (text+ko) ==== @@ -130,13 +130,13 @@ extern uint64_t hvio_iommu_demap(devhandle_t dev_hdl, tsbid_t tsbid, pages_t pages, pages_t *pages_demapped); extern uint64_t hvio_iommu_getmap(devhandle_t dev_hdl, tsbid_t tsbid, - io_attributes_t *attributes_p, - r_addr_t *r_addr_p); + r_addr_t *r_addr_p, + io_attributes_t *attributes_p); extern uint64_t hvio_iommu_getbypass(devhandle_t dev_hdl, r_addr_t ra, io_attributes_t io_attributes, io_addr_t *io_addr_p); extern uint64_t hvio_dma_sync(devhandle_t dev_hdl, r_addr_t ra, - size_t num_bytes, int io_sync_direction, + size_t num_bytes, uint64_t io_sync_direction, size_t *bytes_synched); extern void hv_magic_trap_on(void); From owner-p4-projects@FreeBSD.ORG Tue Apr 11 01:22:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7456B16A403; Tue, 11 Apr 2006 01:22:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52A5D16A43E for ; Tue, 11 Apr 2006 01:22:24 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EF7643D46 for ; Tue, 11 Apr 2006 01:22:24 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B1MOhI065515 for ; Tue, 11 Apr 2006 01:22:24 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B1MNho065509 for perforce@freebsd.org; Tue, 11 Apr 2006 01:22:23 GMT (envelope-from jmg@freebsd.org) Date: Tue, 11 Apr 2006 01:22:23 GMT Message-Id: <200604110122.k3B1MNho065509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 01:22:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=94965 Change 94965 by jmg@jmg_carbon-60 on 2006/04/11 01:21:22 use iottebase instead of dvmaddr, which is long past where we are suppose to map.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#7 (text+ko) ==== @@ -622,7 +622,7 @@ iottebase = trunc_io_page(dvmaddr); iottes[iottecnt] = MAKEIOTTE(trunc_io_page(curaddr), 1, 0, 0); if (iottecnt >= IOTTE_CNT) { - hviommu_map_pages(him, dvmaddr, iottes, iottecnt); + hviommu_map_pages(him, iottebase, iottes, iottecnt); iottecnt = 0; } #endif @@ -658,7 +658,7 @@ firstpg = 0; } - hviommu_map_pages(him, dvmaddr, iottes, iottecnt); + hviommu_map_pages(him, iottebase, iottes, iottecnt); *segp = sgcnt; return (0); } From owner-p4-projects@FreeBSD.ORG Tue Apr 11 01:27:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54EFB16A408; Tue, 11 Apr 2006 01:27:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B7AF16A401 for ; Tue, 11 Apr 2006 01:27:31 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B67A643D67 for ; Tue, 11 Apr 2006 01:27:30 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B1RU2l066200 for ; Tue, 11 Apr 2006 01:27:30 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B1RUep066197 for perforce@freebsd.org; Tue, 11 Apr 2006 01:27:30 GMT (envelope-from jmg@freebsd.org) Date: Tue, 11 Apr 2006 01:27:30 GMT Message-Id: <200604110127.k3B1RUep066197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 01:27:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=94966 Change 94966 by jmg@jmg_arlene on 2006/04/11 01:27:19 shutup stupid gcc.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#8 (text+ko) ==== @@ -595,6 +595,7 @@ sgcnt = *segp; firstpg = 1; iottecnt = 0; + iottebase = 0; /* shutup gcc */ for (; buflen > 0; ) { /* * Get the physical address for this page. From owner-p4-projects@FreeBSD.ORG Tue Apr 11 02:27:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 006EF16A407; Tue, 11 Apr 2006 02:27:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7B4E16A400 for ; Tue, 11 Apr 2006 02:27:43 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75BDB43D66 for ; Tue, 11 Apr 2006 02:27:43 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B2RhBe098976 for ; Tue, 11 Apr 2006 02:27:43 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B2Rh0o098973 for perforce@freebsd.org; Tue, 11 Apr 2006 02:27:43 GMT (envelope-from marcel@freebsd.org) Date: Tue, 11 Apr 2006 02:27:43 GMT Message-Id: <200604110227.k3B2Rh0o098973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 94967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 02:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=94967 Change 94967 by marcel@marcel_nfs on 2006/04/11 02:27:30 Revert the addition of a register shift and revert the exposure of the port number. Both are not needed anymore. Affected files ... .. //depot/projects/uart/dev/puc/puc.c#19 edit .. //depot/projects/uart/dev/puc/pucvar.h#14 edit .. //depot/projects/uart/dev/uart/uart_bus_puc.c#13 edit Differences ... ==== //depot/projects/uart/dev/puc/puc.c#19 (text+ko) ==== @@ -102,8 +102,6 @@ struct puc_device { struct resource_list resources; - int port; - int regshft; u_int serialfreq; }; @@ -314,9 +312,7 @@ rman_set_bushandle(rle->res, bh); } - pdev->port = i + 1; pdev->serialfreq = sc->sc_desc.ports[i].serialfreq; - pdev->regshft = sc->sc_desc.ports[i].regshft; childunit = puc_find_free_unit(typestr); sc->sc_ports[i].dev = device_add_child(dev, typestr, @@ -576,12 +572,6 @@ case PUC_IVAR_FREQ: *result = pdev->serialfreq; break; - case PUC_IVAR_PORT: - *result = pdev->port; - break; - case PUC_IVAR_REGSHFT: - *result = pdev->regshft; - break; default: return (ENOENT); } ==== //depot/projects/uart/dev/puc/pucvar.h#14 (text+ko) ==== @@ -78,7 +78,6 @@ int offset; u_int serialfreq; u_int flags; - int regshft; } ports[PUC_MAX_PORTS]; uint32_t ilr_type; uint32_t ilr_offset[2]; @@ -104,9 +103,7 @@ #define PUC_MAX_BAR 6 enum puc_device_ivars { - PUC_IVAR_FREQ, - PUC_IVAR_REGSHFT, - PUC_IVAR_PORT + PUC_IVAR_FREQ }; #ifdef PUC_ENTRAILS ==== //depot/projects/uart/dev/uart/uart_bus_puc.c#13 (text+ko) ==== @@ -70,7 +70,7 @@ { device_t parent; struct uart_softc *sc; - uintptr_t rclk, regshft; + uintptr_t rclk; parent = device_get_parent(dev); sc = device_get_softc(dev); @@ -79,9 +79,7 @@ if (BUS_READ_IVAR(parent, dev, PUC_IVAR_FREQ, &rclk)) rclk = 0; - if (BUS_READ_IVAR(parent, dev, PUC_IVAR_REGSHFT, ®shft)) - regshft = 0; - return (uart_bus_probe(dev, regshft, rclk, 0, 0)); + return (uart_bus_probe(dev, 0, rclk, 0, 0)); } DRIVER_MODULE(uart, puc, uart_puc_driver, uart_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Tue Apr 11 04:43:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B10516A402; Tue, 11 Apr 2006 04:43:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3875C16A406 for ; Tue, 11 Apr 2006 04:43:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDA2343D49 for ; Tue, 11 Apr 2006 04:43:26 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B4hQbX075588 for ; Tue, 11 Apr 2006 04:43:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B4hQce075585 for perforce@freebsd.org; Tue, 11 Apr 2006 04:43:26 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 04:43:26 GMT Message-Id: <200604110443.k3B4hQce075585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 04:43:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=94969 Change 94969 by imp@imp_hammer on 2006/04/11 04:43:14 Write a stupid memory test. It is so stupid that I would have thought it impossible to fail. Our current board, alas, fails. The KB9202 board doesn't. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#7 (text+ko) ==== @@ -23,19 +23,40 @@ */ #include "AT91RM9200.h" -#include "at91rm9200_lowlevel.h" +#include "lib.h" typedef void fn_t(void); int main(void) { +#if 0 char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ fn_t *fn = (fn_t *)addr; - AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC10; - xmodem_rx(addr); +// AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC10; + while (xmodem_rx(addr) == -1) + continue; +// AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; + fn(); +#else + int *addr = (int *)0x20000000; /* Load to base + 1MB */ + int i; + + while (1) { + int sec = GetSeconds(); + while (sec == GetSeconds()) + continue; + putc('A'); + for (i = 0; i < 1024; i++) + addr[i] = i * 2; + for (i = 0; i < 1024; i++) + if (addr[i] != i * 2) { + putc('N'); + break; + } + } AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; - fn(); +#endif return (1); } From owner-p4-projects@FreeBSD.ORG Tue Apr 11 06:16:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 007E216A404; Tue, 11 Apr 2006 06:16:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD52316A401 for ; Tue, 11 Apr 2006 06:16:47 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C19643D4C for ; Tue, 11 Apr 2006 06:16:47 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B6GlDG033608 for ; Tue, 11 Apr 2006 06:16:47 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B6GkUx033605 for perforce@freebsd.org; Tue, 11 Apr 2006 06:16:46 GMT (envelope-from jmg@freebsd.org) Date: Tue, 11 Apr 2006 06:16:46 GMT Message-Id: <200604110616.k3B6GkUx033605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 06:16:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=94972 Change 94972 by jmg@jmg_carbon-60 on 2006/04/11 06:15:49 remove duplicate define.. use _getmap to get the ra of the mapping for syncing.. we need to store the offset so we can index into the page... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#9 (text+ko) ==== @@ -368,6 +368,7 @@ dvmend = dvmaddr + size; if (dvmend <= BDR_END(r)) { r->dr_used = dvmend - BDR_START(r); + r->dr_offset = voffs; return (dvmaddr); } } @@ -529,8 +530,6 @@ } #define IOTTE_CNT 64 -#define HVIOMMU_TSBID(him, dvmaddr) \ - (((dvmaddr) - (him)->him_dvmabase) >> IO_PAGE_SHIFT) static void hviommu_map_pages(struct hviommu *him, bus_addr_t dvmaddr, uint64_t *iottes, pages_t iottecnt) @@ -547,7 +546,7 @@ /* push tte's */ cntdone = 0; while (cntdone < iottecnt) { - if ((err = hvio_iommu_map(him->him_handle, HVIOMMU_TSBID(him, + if ((err = hvio_iommu_map(him->him_handle, VA_TO_TSBID(him, dvmaddr), iottecnt, PCI_MAP_ATTR_READ | PCI_MAP_ATTR_WRITE, (io_page_list_t *)pmap_kextract((vm_offset_t)&iotteaddr[0]), &mapcnt))) { @@ -884,7 +883,9 @@ vm_offset_t va; vm_size_t len; size_t synced; + bus_addr_t ra; uint64_t err; + uint32_t ioattr; io_sync_direction_t iodir; if ((map->dm_flags & DMF_LOADED) == 0) @@ -900,11 +901,17 @@ membar(Sync); HIM_LOCK(him); SLIST_FOREACH(r, &map->dm_reslist, dr_link) { - va = (vm_offset_t)BDR_START(r); + va = (vm_offset_t)BDR_START(r) + r->dr_offset; len = r->dr_used; while (len > 0) { - if ((err = hvio_dma_sync(him->him_handle, va, len, iodir, - &synced))) { + if ((err = hvio_iommu_getmap(him->him_handle, + VA_TO_TSBID(him, va), &ra, &ioattr))) { + printf("failed to _getmap: err: %ld, handle: %#lx, tsbid: %#lx", err, him->him_handle, VA_TO_TSBID(him, va)); + continue; + } + if ((err = hvio_dma_sync(him->him_handle, ra, + min(len, (trunc_io_page(ra) + IO_PAGE_SIZE) - ra), + iodir, &synced))) { printf("failed to dma_sync: err: %ld, handle: %#lx, va: %#lx, len: %#lx, dir: %d\n", err, him->him_handle, va, len, iodir); synced = 1; From owner-p4-projects@FreeBSD.ORG Tue Apr 11 06:16:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CC1216A446; Tue, 11 Apr 2006 06:16:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0013016A403 for ; Tue, 11 Apr 2006 06:16:47 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9672143D53 for ; Tue, 11 Apr 2006 06:16:47 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B6GlPt033617 for ; Tue, 11 Apr 2006 06:16:47 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B6Glxr033614 for perforce@freebsd.org; Tue, 11 Apr 2006 06:16:47 GMT (envelope-from jmg@freebsd.org) Date: Tue, 11 Apr 2006 06:16:47 GMT Message-Id: <200604110616.k3B6Glxr033614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 94973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 06:16:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=94973 Change 94973 by jmg@jmg_carbon-60 on 2006/04/11 06:16:45 other part of previous commit, defines the offset Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus_private.h#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus_private.h#2 (text+ko) ==== @@ -44,6 +44,7 @@ struct bus_dmamap_res { struct resource *dr_res; bus_size_t dr_used; + bus_size_t dr_offset; SLIST_ENTRY(bus_dmamap_res) dr_link; }; From owner-p4-projects@FreeBSD.ORG Tue Apr 11 07:18:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E92416A403; Tue, 11 Apr 2006 07:18:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 407EE16A401 for ; Tue, 11 Apr 2006 07:18:04 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E774243D4C for ; Tue, 11 Apr 2006 07:18:03 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B7I36R068162 for ; Tue, 11 Apr 2006 07:18:03 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B7I3AA068156 for perforce@freebsd.org; Tue, 11 Apr 2006 07:18:03 GMT (envelope-from alc@freebsd.org) Date: Tue, 11 Apr 2006 07:18:03 GMT Message-Id: <200604110718.k3B7I3AA068156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 94976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 07:18:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=94976 Change 94976 by alc@alc_home on 2006/04/11 07:17:57 IFC change to pmap_remove_pages()'s parameters. Affected files ... .. //depot/projects/superpages/src/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/superpages/src/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/superpages/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/superpages/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/superpages/src/sys/kern/kern_exec.c#8 integrate .. //depot/projects/superpages/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/superpages/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/superpages/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/superpages/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/superpages/src/sys/vm/pmap.h#3 integrate Differences ... ==== //depot/projects/superpages/src/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.188 2006/04/03 21:16:07 peter Exp $"); #include #include @@ -2125,9 +2125,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2146,11 +2144,6 @@ pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#14 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.540 2006/04/02 05:45:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.541 2006/04/03 21:16:07 peter Exp $"); /* * Manages physical address maps. @@ -2772,9 +2772,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pd_entry_t *pde; pt_entry_t *pte, tpte; @@ -2791,11 +2789,6 @@ PMAP_LOCK(pmap); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pde = vtopde(pv->pv_va); #else ==== //depot/projects/superpages/src/sys/arm/arm/pmap.c#10 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.45 2006/03/26 22:03:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.46 2006/04/03 21:16:07 peter Exp $"); #include #include #include @@ -3174,7 +3174,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +pmap_remove_pages(pmap_t pmap) { struct pv_entry *pv, *npv; struct l2_bucket *l2b = NULL; @@ -3186,10 +3186,6 @@ vm_page_lock_queues(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } if (pv->pv_flags & PVF_WIRED) { /* The page is wired, cannot remove it now. */ npv = TAILQ_NEXT(pv, pv_plist); ==== //depot/projects/superpages/src/sys/i386/i386/pmap.c#11 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.547 2006/04/02 05:45:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.548 2006/04/03 21:16:07 peter Exp $"); /* * Manages physical address maps. @@ -2777,9 +2777,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pd_entry_t *pde; pt_entry_t *pte, tpte; @@ -2797,11 +2795,6 @@ sched_pin(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - pde = pmap_pde(pmap, pv->pv_va); if (*pde & PG_PS) { if (*pde & PG_W) { ==== //depot/projects/superpages/src/sys/ia64/ia64/pmap.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.172 2005/11/20 06:09:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.173 2006/04/03 21:16:08 peter Exp $"); #include #include @@ -1862,7 +1862,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +pmap_remove_pages(pmap_t pmap) { pmap_t oldpmap; pv_entry_t pv, npv; @@ -1881,9 +1881,6 @@ npv = TAILQ_NEXT(pv, pv_plist); - if (pv->pv_va >= eva || pv->pv_va < sva) - continue; - pte = pmap_find_vhpt(pv->pv_va); KASSERT(pte != NULL, ("pte")); if (!pmap_wired(pte)) ==== //depot/projects/superpages/src/sys/kern/kern_exec.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.290 2006/03/08 20:21:54 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.291 2006/04/03 21:16:08 peter Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" @@ -905,8 +905,7 @@ if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser && vm_map_max(map) == sv->sv_maxuser) { shmexit(vmspace); - pmap_remove_pages(vmspace_pmap(vmspace), vm_map_min(map), - vm_map_max(map)); + pmap_remove_pages(vmspace_pmap(vmspace)); vm_map_remove(map, vm_map_min(map), vm_map_max(map)); } else { vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser); ==== //depot/projects/superpages/src/sys/kern/kern_exit.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.286 2006/03/14 04:00:21 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.287 2006/04/03 21:16:09 peter Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -325,8 +325,7 @@ while (!atomic_cmpset_int(&vm->vm_refcnt, refcnt, refcnt - 1)); if (refcnt == 1) { shmexit(vm); - pmap_remove_pages(vmspace_pmap(vm), vm_map_min(&vm->vm_map), - vm_map_max(&vm->vm_map)); + pmap_remove_pages(vmspace_pmap(vm)); (void) vm_map_remove(&vm->vm_map, vm_map_min(&vm->vm_map), vm_map_max(&vm->vm_map)); } ==== //depot/projects/superpages/src/sys/powerpc/powerpc/mmu_if.m#2 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.2 2005/11/20 06:09:49 alc Exp $ +# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.3 2006/04/03 21:16:09 peter Exp $ # #include @@ -85,8 +85,7 @@ return; } - static void mmu_null_remove_pages(mmu_t mmu, pmap_t pmap, - vm_offset_t start, vm_offset_t end) + static void mmu_null_remove_pages(mmu_t mmu, pmap_t pmap) { return; } @@ -543,8 +542,6 @@ METHOD void remove_pages { mmu_t _mmu; pmap_t _pmap; - vm_offset_t _start; - vm_offset_t _end; } DEFAULT mmu_null_remove_pages; ==== //depot/projects/superpages/src/sys/powerpc/powerpc/pmap_dispatch.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.3 2005/11/20 06:09:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.4 2006/04/03 21:16:09 peter Exp $"); /* * Dispatch MI pmap calls to the appropriate MMU implementation @@ -244,9 +244,9 @@ } void -pmap_remove_pages(pmap_t pmap, vm_offset_t start, vm_offset_t end) +pmap_remove_pages(pmap_t pmap) { - MMU_REMOVE_PAGES(mmu_obj, pmap, start, end); + MMU_REMOVE_PAGES(mmu_obj, pmap); } void ==== //depot/projects/superpages/src/sys/sparc64/sparc64/pmap.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.152 2006/01/01 22:52:21 scottl Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.153 2006/04/03 21:16:09 peter Exp $ */ /* @@ -1698,7 +1698,7 @@ * an entire address space. Only works for the current pmap. */ void -pmap_remove_pages(pmap_t pm, vm_offset_t sva, vm_offset_t eva) +pmap_remove_pages(pmap_t pm) { } ==== //depot/projects/superpages/src/sys/vm/pmap.h#3 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/pmap.h,v 1.74 2005/11/20 06:09:49 alc Exp $ + * $FreeBSD: src/sys/vm/pmap.h,v 1.75 2006/04/03 21:16:10 peter Exp $ */ /* @@ -121,7 +121,7 @@ void pmap_release(pmap_t); void pmap_remove(pmap_t, vm_offset_t, vm_offset_t); void pmap_remove_all(vm_page_t m); -void pmap_remove_pages(pmap_t, vm_offset_t, vm_offset_t); +void pmap_remove_pages(pmap_t); void pmap_zero_page(vm_page_t); void pmap_zero_page_area(vm_page_t, int off, int size); void pmap_zero_page_idle(vm_page_t); From owner-p4-projects@FreeBSD.ORG Tue Apr 11 08:45:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C84516A403; Tue, 11 Apr 2006 08:45:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3712416A400 for ; Tue, 11 Apr 2006 08:45:25 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E648E43D46 for ; Tue, 11 Apr 2006 08:45:24 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B8jOqX016526 for ; Tue, 11 Apr 2006 08:45:24 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B8jOc9016523 for perforce@freebsd.org; Tue, 11 Apr 2006 08:45:24 GMT (envelope-from alc@freebsd.org) Date: Tue, 11 Apr 2006 08:45:24 GMT Message-Id: <200604110845.k3B8jOc9016523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 94980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 08:45:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=94980 Change 94980 by alc@alc_home on 2006/04/11 08:44:23 IF user/alc/superpages Various fixes to promotion and demotion of kernel pmap pages. Some code clean up and optimization. Catch up with the change to pmap_remove_pages()'s parameters. Affected files ... .. //depot/projects/superpages/src/sys/i386/i386/pmap.c#12 integrate Differences ... ==== //depot/projects/superpages/src/sys/i386/i386/pmap.c#12 (text+ko) ==== @@ -259,6 +259,8 @@ static pv_entry_t get_pv_entry(pmap_t locked_pmap); static void pmap_clear_ptes(vm_page_t m, int bit); +static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +static void pmap_promote_pde(pmap_t pmap, vm_offset_t va, reservation_t reserv); static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva); static void pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); @@ -281,9 +283,6 @@ static void *pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #endif -static void mach_promote(pmap_t pmap, vm_offset_t va, reservation_t reserv); -static boolean_t pmap_demote(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); - CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); @@ -1187,7 +1186,7 @@ * normal 4K page. */ if (ptepa & PG_PS) { - pmap_demote(pmap, &pmap->pm_pdir[ptepindex], va); + pmap_demote_pde(pmap, &pmap->pm_pdir[ptepindex], va); ptepa = pmap->pm_pdir[ptepindex]; } @@ -1777,15 +1776,21 @@ printf("pmap_remove: superpage at %x to destroy.\n", sva); #endif + + /* + * The TLB entry for a PG_G mapping is + * invalidated by pmap_remove_pde(). + */ + if ((ptpaddr & PG_G) == 0) + anyvalid = 1; pmap_remove_pde(pmap, pmap_pde(pmap, sva), sva); - anyvalid = 1; continue; } else { #ifdef INVARIANTS printf("pmap_remove: superpage at %x to demote !!!\n", sva); #endif - if (!pmap_demote(pmap, pmap_pde(pmap, sva), sva)) { + if (!pmap_demote_pde(pmap, pmap_pde(pmap, sva), sva)) { anyvalid = 1; /* XXX */ continue; } @@ -1862,7 +1867,7 @@ pde = pmap_pde(pmap, pv->pv_va); if (*pde & PG_PS) { printf("pmap_remove_all: superpage to demote !!!\n"); - if (!pmap_demote(pmap, pde, pv->pv_va)) { + if (!pmap_demote_pde(pmap, pde, pv->pv_va)) { /* * All mappings within the same 4mpage were * destroyed and pv was freed. @@ -1991,7 +1996,7 @@ anychanged = 1; continue; } else { - if (!pmap_demote(pmap, pmap_pde(pmap, sva), sva)) { + if (!pmap_demote_pde(pmap, pmap_pde(pmap, sva), sva)) { anychanged = 1; /* XXX */ continue; } @@ -2250,7 +2255,7 @@ printf("%s: pmap %p va %x XXX\n", __func__, pmap, va); #endif KASSERT(m->object->flags & OBJ_SUPERPAGES, ("pmap_enter: xxx")); - mach_promote(pmap, va, m->reserv); + pmap_promote_pde(pmap, va, m->reserv); } sched_unpin(); vm_page_unlock_queues(); @@ -2380,7 +2385,7 @@ #endif KASSERT(m->object->flags & OBJ_SUPERPAGES, ("pmap_enter_quick: xxx")); - mach_promote(pmap, va, m->reserv); + pmap_promote_pde(pmap, va, m->reserv); } out: PMAP_UNLOCK(pmap); @@ -2801,28 +2806,13 @@ npv = TAILQ_NEXT(pv, pv_plist); continue; } - if (sva <= trunc_4mpage(pv->pv_va) && - eva >= round_4mpage(pv->pv_va + 1)) { -#ifdef INVARIANTS - printf("pmap_remove_pages: superpage at %x to destroy.\n", - trunc_4mpage(pv->pv_va)); -#endif - pmap_remove_pde(pmap, pde, trunc_4mpage(pv->pv_va)); - npv = TAILQ_FIRST(&pmap->pm_pvlist); - continue; - } #ifdef INVARIANTS - printf("pmap_remove_pages: superpage at %x to demote !!!\n", - pv->pv_va); + printf("pmap_remove_pages: superpage at %x to destroy.\n", + trunc_4mpage(pv->pv_va)); #endif - if (!pmap_demote(pmap, pde, pv->pv_va)) { - /* - * All mappings within the same 2mpage were - * destroyed and pv was freed. - */ - npv = TAILQ_FIRST(&pmap->pm_pvlist); - continue; - } + pmap_remove_pde(pmap, pde, trunc_4mpage(pv->pv_va)); + npv = TAILQ_FIRST(&pmap->pm_pvlist); + continue; } #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY @@ -2982,7 +2972,7 @@ if (*pde & PG_PS) { printf("pmap_clear_ptes: superpage to demote !!!\n"); if ((*pde & bit) == 0 || - !pmap_demote(pmap, pde, pv->pv_va)) { + !pmap_demote_pde(pmap, pde, pv->pv_va)) { /* * All mappings within the same 2mpage were * destroyed and pv was freed. @@ -3292,7 +3282,7 @@ #define COMPATIBLE_PTE(a,b) ((a & COMPATIBLE_PTE_MASK) == (b & COMPATIBLE_PTE_MASK)) static void -mach_promote(pmap_t pmap, vm_offset_t va, reservation_t reserv) +pmap_promote_pde(pmap_t pmap, vm_offset_t va, reservation_t reserv) { vm_paddr_t pa; pmap_t allpmaps_entry; @@ -3314,8 +3304,9 @@ pa += PAGE_SIZE; page_pa = PHYS_TO_VM_PAGE(*pte & PG_FRAME); - KASSERT(page_pa->reserv,("mach_promote: page has no reservation")); - KASSERT(page_pa->reserv == reserv,("mach_promote: reservation mismatch")); + KASSERT(page_pa->reserv,("pmap_promote_pde: page has no reservation")); + KASSERT(page_pa->reserv == reserv, + ("pmap_promote_pde: reservation mismatch")); if ((*pte & PG_V) == 0 || !COMPATIBLE_PTE(*pte, flags)) return; @@ -3341,15 +3332,10 @@ /* Invalidate old TLB entries */ pmap_invalidate_all(pmap); - /* - * XXX - * - * File system corruption occurs if pte pages belonging to the - * kernel pmap are freed. - */ - if (pmap != kernel_pmap) { + /* This leaks up to nkpt kernel pmap page table pages. XXX */ + if (pmap != kernel_pmap || tofree->wire_count == NPTEPG) { KASSERT(tofree->wire_count == NPTEPG, - ("pmap_promote: pte page wire count error")); + ("pmap_promote_pde: pte page wire count error")); tofree->wire_count = 0; vm_page_free(tofree); atomic_subtract_int(&cnt.v_wire_count, 1); @@ -3361,8 +3347,9 @@ } static boolean_t -pmap_demote(pmap_t pmap, pd_entry_t *pde0, vm_offset_t va) +pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { + pmap_t allpmaps_entry; pd_entry_t save_pde_value, new_pte_value ; pt_entry_t *pte_page_va, *new_pte_va; vm_paddr_t pte_page_pa; @@ -3370,21 +3357,21 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); KASSERT(curthread->td_pinned > 0, ("curthread not pinned")); - KASSERT((*pde0 & PG_PS) != 0, - ("pmap_demote: not a superpage, impossible to demote")); + KASSERT((*pde & PG_PS) != 0, + ("pmap_demote_pde: not a superpage, impossible to demote")); /* STEP 1 * Allocate the PTE page */ if ((pte_page = vm_page_alloc(NULL, va >> PDRSHIFT, VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL | VM_ALLOC_WIRED)) == NULL) { - pmap_remove_pde(pmap, pde0, trunc_4mpage(va)); + pmap_remove_pde(pmap, pde, trunc_4mpage(va)); pmap_invalidate_all(pmap); return (FALSE); } pte_page->wire_count += NPTEPG - 1; KASSERT(pte_page->wire_count == NPTEPG, - ("pmap_demote: page table page %p has wire count %d", + ("pmap_demote_pde: page table page %p has wire count %d", pte_page, pte_page->wire_count)); if (pmap != kernel_pmap) pmap->pm_stats.resident_count++; @@ -3407,7 +3394,7 @@ #endif PMAP1unchanged++; pte_page_va = PADDR1; - pte_page_pa |= PG_U | PG_RW | PG_V | PG_A | PG_M; + pte_page_pa |= PG_M | PG_A | (*pde & PG_U) | PG_RW | PG_V; repeat: @@ -3415,7 +3402,7 @@ * Save the value of the pde entry * Define the value of the first pte entry */ - save_pde_value = *pde0; + save_pde_value = *pde; /* STEP 3 * Fill the PTE page with the physical address of the base pages @@ -3433,10 +3420,23 @@ * If not, assign the new pde value. * If yes, repeat the pte assignment loop. */ - if (!atomic_cmpset_int(pde0, save_pde_value, pte_page_pa)) - goto repeat; + if (pmap == kernel_pmap) { + mtx_lock_spin(&allpmaps_lock); + LIST_FOREACH(allpmaps_entry, &allpmaps, pm_list) { + pde = pmap_pde(allpmaps_entry, va); + KASSERT(COMPATIBLE_PTE(*pde, save_pde_value), + ("pmap_demote_pde: pde was %#jx, expected %#jx", + (uintmax_t)*pde, (uintmax_t)save_pde_value)); + pde_store(pde, pte_page_pa); + } + mtx_unlock_spin(&allpmaps_lock); + } else { + if (!atomic_cmpset_int(pde, save_pde_value, pte_page_pa)) + goto repeat; + } - pmap_invalidate_all(pmap); + /* Invalidate the recursive mapping of the page table page. */ + pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); return (TRUE); } From owner-p4-projects@FreeBSD.ORG Tue Apr 11 09:47:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CEAF16A408; Tue, 11 Apr 2006 09:47:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B08216A406 for ; Tue, 11 Apr 2006 09:47:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6E2343D46 for ; Tue, 11 Apr 2006 09:47:42 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B9lg4U057081 for ; Tue, 11 Apr 2006 09:47:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B9lg7i057078 for perforce@freebsd.org; Tue, 11 Apr 2006 09:47:42 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 11 Apr 2006 09:47:42 GMT Message-Id: <200604110947.k3B9lg7i057078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94981 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 09:47:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=94981 Change 94981 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/11 09:46:41 fix a number of small API misuses allowing us to get to single-user Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#10 (text+ko) ==== @@ -134,6 +134,7 @@ #define round_io_page(x) round_page(x) #define trunc_io_page(x) trunc_page(x) + MALLOC_DEFINE(M_HVIOMMU, "hviommu", "HyperVisor IOMMU"); TAILQ_HEAD(hviommu_maplruq_head, bus_dmamap); @@ -151,6 +152,12 @@ #define VA_TO_TSBID(him, va) ((va - (him)->him_dvmabase) >> IO_PAGE_SHIFT) +#ifdef IOMMU_DEBUG +#define DPRINTF printf +#else +#define DPRINTF(...) +#endif + /* * Always overallocate one page; this is needed to handle alignment of the * buffer, so it makes sense using a lazy allocation scheme. @@ -238,6 +245,7 @@ KASSERT(va + len >= va, ("%s: va 0x%lx + len 0x%lx wraps", __func__, (long)va, (long)len)); va = trunc_io_page(va); + len = round_page(len); while (len > 0) { if ((error = hvio_iommu_demap(him->him_handle, VA_TO_TSBID(him, va), len >> IO_PAGE_SHIFT, &demapped))) { @@ -534,27 +542,39 @@ static void hviommu_map_pages(struct hviommu *him, bus_addr_t dvmaddr, uint64_t *iottes, pages_t iottecnt) { - uint64_t iotteaddr[IOTTE_CNT]; uint64_t err; +#ifdef IOMMU_DEBUG + bus_addr_t ra; + io_attributes_t ioattr; +#endif pages_t mapcnt; int cntdone; int i; - for (i = 0; i < iottecnt; i++) - iotteaddr[i] = pmap_kextract((vm_offset_t)&iottes[i]); + DPRINTF("mapping: dh: %#lx, dvmaddr: %#lx, tsbid: %#lx, cnt: %d\n", + him->him_handle, dvmaddr, VA_TO_TSBID(him, dvmaddr), iottecnt); + for (i = 0; i < iottecnt; i++) { + DPRINTF("iotte:%#lx\n", iottes[i]); + } /* push tte's */ cntdone = 0; while (cntdone < iottecnt) { if ((err = hvio_iommu_map(him->him_handle, VA_TO_TSBID(him, dvmaddr), iottecnt, PCI_MAP_ATTR_READ | PCI_MAP_ATTR_WRITE, - (io_page_list_t *)pmap_kextract((vm_offset_t)&iotteaddr[0]), + (io_page_list_t *)pmap_kextract((vm_offset_t)&iottes[0]), &mapcnt))) { - printf("iommu_map: err: %ld\n", err); + DPRINTF("iommu_map: err: %ld\n", err); mapcnt = 1; } cntdone += mapcnt; } + for (i = 0; i < iottecnt; i++) { + DPRINTF("err: %ld", hvio_iommu_getmap(him->him_handle, + VA_TO_TSBID(him, dvmaddr + i * IO_PAGE_SIZE), + &ioattr, &ra)); + DPRINTF(", ioattr: %d, raddr: %#lx\n", ioattr, ra); + } } /* @@ -591,6 +611,8 @@ if (error != 0) return (error); + DPRINTF("vallocseg: dvmaddr: %#lx, voffs: %#lx, buflen: %#lx\n", + dvmaddr, voffs, buflen); sgcnt = *segp; firstpg = 1; iottecnt = 0; @@ -620,7 +642,9 @@ #else if (iottecnt == 0) iottebase = trunc_io_page(dvmaddr); - iottes[iottecnt] = MAKEIOTTE(trunc_io_page(curaddr), 1, 0, 0); + DPRINTF("adding: %#lx\n", trunc_io_page(curaddr)); + iottes[iottecnt++] = trunc_io_page(curaddr); + if (iottecnt >= IOTTE_CNT) { hviommu_map_pages(him, iottebase, iottes, iottecnt); iottecnt = 0; @@ -885,42 +909,56 @@ size_t synced; bus_addr_t ra; uint64_t err; - uint32_t ioattr; + io_attributes_t ioattr; + vm_paddr_t raddr; io_sync_direction_t iodir; if ((map->dm_flags & DMF_LOADED) == 0) return; - /* XXX This is probably bogus. */ + iodir = 0; - if (op & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_POSTREAD)) + + if (op & (BUS_DMASYNC_POSTREAD)) iodir |= IO_SYNC_CPU; - if (op & (BUS_DMASYNC_PREWRITE|BUS_DMASYNC_POSTWRITE)) + if (op & (BUS_DMASYNC_PREWRITE)) iodir |= IO_SYNC_DEVICE; - if ((op & BUS_DMASYNC_PREREAD) != 0) + if ((op & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_POSTWRITE)) != 0) membar(Sync); + + /* nothing to be done */ + if (!iodir) + return; + HIM_LOCK(him); SLIST_FOREACH(r, &map->dm_reslist, dr_link) { va = (vm_offset_t)BDR_START(r) + r->dr_offset; len = r->dr_used; while (len > 0) { if ((err = hvio_iommu_getmap(him->him_handle, - VA_TO_TSBID(him, va), &ra, &ioattr))) { - printf("failed to _getmap: err: %ld, handle: %#lx, tsbid: %#lx", err, him->him_handle, VA_TO_TSBID(him, va)); + VA_TO_TSBID(him, va), &ioattr, &ra))) { + printf("failed to _getmap: err: %ld, handle: %#lx, tsbid: %#lx", + err, him->him_handle, VA_TO_TSBID(him, va)); continue; } if ((err = hvio_dma_sync(him->him_handle, ra, - min(len, (trunc_io_page(ra) + IO_PAGE_SIZE) - ra), + ulmin(len, (trunc_io_page(ra) + IO_PAGE_SIZE) - ra), iodir, &synced))) { - printf("failed to dma_sync: err: %ld, handle: %#lx, va: %#lx, len: %#lx, dir: %d\n", - err, him->him_handle, va, len, iodir); - synced = 1; + printf("failed to dma_sync: err: %ld, handle: %#lx, ra: %#lx, len: %#lx, dir: %d\n", + err, him->him_handle, ra, ulmin(len, + (trunc_io_page(ra) + IO_PAGE_SIZE) - ra), + iodir); + synced = ulmin(len, (trunc_io_page(ra) + IO_PAGE_SIZE) - ra); + printf("err: %ld", hvio_iommu_getmap(him->him_handle, VA_TO_TSBID(him, va), + &ioattr, &raddr)); + printf(", ioattr: %d, raddr: %#lx\n", ioattr, raddr); } va += synced; len -= synced; } } HIM_UNLOCK(him); + if ((op & BUS_DMASYNC_PREWRITE) != 0) membar(Sync); } From owner-p4-projects@FreeBSD.ORG Tue Apr 11 10:12:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AD2416A402; Tue, 11 Apr 2006 10:12:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B6F416A400 for ; Tue, 11 Apr 2006 10:12:14 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB76F43D46 for ; Tue, 11 Apr 2006 10:12:13 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BACDaF070346 for ; Tue, 11 Apr 2006 10:12:13 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BACDBf070328 for perforce@freebsd.org; Tue, 11 Apr 2006 10:12:13 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 11 Apr 2006 10:12:13 GMT Message-Id: <200604111012.k3BACDBf070328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 94982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 10:12:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=94982 Change 94982 by soc-andrew@soc-andrew_serv on 2006/04/11 10:11:57 Fix to build -CURRENT on -STABLE Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#40 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#40 (text+ko) ==== @@ -600,7 +600,7 @@ # Install the system into the various distributions. release.2: - cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base + cd ${.CURDIR}/.. && make distrib-dirs DESTDIR=${RD}/trees/base cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \ DISTDIR=${RD}/trees touch ${.TARGET} @@ -624,8 +624,8 @@ .if exists(${.CURDIR}/${TARGET}/${j}_crunch.conf) rm -rf ${j}_crunch mkdir ${j}_crunch - cd ${j}_crunch; ${WMAKEENV} crunchgen -o \ - ${.CURDIR}/${TARGET}/${j}_crunch.conf + cd ${j}_crunch; ${WMAKEENV} MAKEFLAGS="-m ${.CURDIR}/../share/mk" \ + crunchgen -o ${.CURDIR}/${TARGET}/${j}_crunch.conf cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean cd ${.CURDIR}/..; ${BINMAKE} -f Makefile.inc1 _build-tools cd ${j}_crunch; CFLAGS="-Os -pipe" ${WMAKE} -f ${j}_crunch.mk \ @@ -1224,7 +1224,7 @@ > ${RD}/dists/${TD}/$$tn.mtree ; \ else \ true; \ - fi; \ + fi; \ ) .else @( cd ${SD} && \ From owner-p4-projects@FreeBSD.ORG Tue Apr 11 10:14:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7C3716A405; Tue, 11 Apr 2006 10:14:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68D8F16A403 for ; Tue, 11 Apr 2006 10:14:17 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1578C43D45 for ; Tue, 11 Apr 2006 10:14:17 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BAEHej071974 for ; Tue, 11 Apr 2006 10:14:17 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BAEGk2071965 for perforce@freebsd.org; Tue, 11 Apr 2006 10:14:16 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 11 Apr 2006 10:14:16 GMT Message-Id: <200604111014.k3BAEGk2071965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 94983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 10:14:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=94983 Change 94983 by soc-andrew@soc-andrew_serv on 2006/04/11 10:14:10 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#14 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#10 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#5 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.543 2006/03/20 14:24:56 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.545 2006/03/31 14:10:35 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -809,6 +809,10 @@ _mklocale= usr.bin/mklocale .endif +.if ${BOOTSTRAPPING} < 700015 +_gensnmptree= usr.sbin/bsnmpd/gensnmptree +.endif + .if ${MK_RESCUE} != "no" && \ ${BOOTSTRAPPING} < 600008 _crunchgen= usr.sbin/crunch/crunchgen @@ -818,10 +822,6 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif -.if ${BOOTSTRAPPING} < 700014 -_gensnmptree= usr.sbin/bsnmpd/gensnmptree -.endif - bootstrap-tools: .for _tool in \ ${_strfile} \ @@ -836,8 +836,8 @@ ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ + ${_gensnmptree} \ usr.sbin/config \ - ${_gensnmptree} \ ${_crunchgen} \ ${_pwd_mkdb} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.296 2006/02/20 21:46:54 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.299 2006/04/10 20:14:40 brueffer Exp $ Supported Devices @@ -115,6 +115,8 @@ &hwlist.isp; + &hwlist.mfi; + &hwlist.mlx; @@ -201,6 +203,8 @@ &hwlist.axe; + &hwlist.bce; + Broadcom BCM4401 based Fast Ethernet adapters (&man.bfe.4; driver) @@ -478,6 +482,8 @@ &hwlist.uart; + &hwlist.scc; + AST 4 port serial card using shared IRQ ARNET serial cards (&man.ar.4; driver) ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.903 2006/02/26 21:48:50 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.911 2006/04/10 20:30:35 brueffer Exp $ 2000 @@ -156,10 +156,96 @@ Kernel Changes + &man.acpi.4; now has basic support for HPET time counter. + + &man.acpi.ibm.4; driver now supports for setting the fan control + mode to manual or automatic, and adjusting the fan speed if the + fan control mode is manual. Note that manual control of the fan speed + needs to set a sysctl variable + dev.acpi_ibm.0.fan + to zero (manual) with extreme precaution. + This is because disabling automatic fan control might + overheat the hardware and lead to permanent damage. + + The &man.ddb.4; now supports show lock + command. If the argument has a valid lock class, + this displays various information about the lock and calls a + new function pointer in lock_class (lc_ddb_show) to dump class-specific + information about the lock as well (such as the owner of a mutex or + xlock'ed sx lock). + + The &man.ddb.4; now supports show sleepq + command. This takes a wait channel as an argument and looks + for a sleep queue associated with that wait channel. + + A bug in file descriptor handling such that simple + close(0); dup(fd) does not return + descriptor 0 in some cases, has been fixed. + + The &man.firmware.9; subsystem has been added. This allows + to load binary data into the kernel via a specially crafted module. + + The &man.gdb.1; remote debugging interface now supports + copying console messages to a remote debugger instance. + To enable this, set debug.gdbcons="1" + in loader.conf, enter boot -d; + gdb; step from the loader prompt, + then attach &man.gdb.1; from a remote machine. + The sysctl variable debug.gdbcons can be + used to turn on/off this functionality. + + &man.hwpmc.4; and &man.pmcstat.8; now support profiling + of dynamically loaded kernel modules and + dlopen()'ed shared objects. + &man.pmcstat.8; can now log over a network socket + to a remote host. + + The &man.random.4; entropy device driver is now MPSAFE. + + The SIGCHLD signal queuing has been + added. For each child process whose status has been changed, + a SIGCHLD instance is queued, if the signal is stilling pending, + and process changed status several times, signal information + is updated to reflect latest process status. + There is a loader tunable kern.sigqueue.queue_sigchild + which can control the behavior, setting it to zero disables the + SIGCHLD queuing feature. + A new sysctl variable kern.malloc_stats has been added. This allows to export kernel malloc statistics via a binary structure stream. + A new sysctl variable kern.elf[32|64].can_exec_dyn + has been added. This allows to execute a ET_DYN binary + (shared object) when the variable is set to 1. + This is set to 0 by default and useful for some + Linux scripts which expect to be able to execute + /lib/ld-linux.so.2. + + A new sysctl variable kern.elf[32|64].can_exec_dyn + has been removed. Instead the brandinfo + structure has been extended to be able to have + BI_CAN_EXEC_DYN flag for all brands that usually + allow executing ELF dynamic binaries. + + A new sysctl variable kern.forcesigexit + has been added. This forces a process + to sigexit if a trap signal is being hold by current thread or + ignored by current process and is enabled by default. + + RedZone, a buffer corruption protection for kernel's &man.malloc.9; + has been implemented. This detects both of buffer underflows and + buffer overflows bugs at runtime on &man.free.9; and &man.realloc.9;, + and prints backtraces from where memory was allocated and from where + it was freed. For more details, see &man.redzone.9; manual page. + + A new sysctl variable security.mac.biba.interfaces_equal + which makes all network interfaces be created with the label + biba/equal(equal-equal), has been added. + This is useful where programs such as &man.dhclient.8; and &man.ppp.8;. + which initialize network interfaces do not have any labeling support. + This variable is set as 0(disabled) by default. + A new sysctl variable vm.zone_stats has been added. This allows to export &man.uma.9; allocator statistics via a binary structure stream. @@ -181,6 +267,18 @@ src/sys/arch/conf/MAC for the Mandatory Access Control framework have been added. + POSIX_TIMERS support has been updated to 200112L. + + An experimental support for POSIX message queue has been + implemented. + + The support for Xbox, whose architecture is nearly identical + has been added. For details of the latest development, + see . + + DEFAULTS kernel configuration files + for each platform have been added. + Boot Loader Changes @@ -209,6 +307,12 @@ The &man.acpi.thermal.4; driver now supports passive cooling. + The &man.cardbus.4; driver now supports + /dev/cardbus%d.cis. + + The &man.ce.4; driver, which supports Cronyx Tau-PCI/32 adapters, + has been added. + Support for the PadLock Security Co-processor in VIA C3 processors has been added to the &man.crypto.9; subsystem. &merged; @@ -216,15 +320,49 @@ A bug which prevents the &man.ichsmb.4; kernel module from unloading has been fixed. + &man.ipmi.4;, an OpenIPMI compatible driver, + has been added. + OpenIPMI (Intelligent Platform Management Interface) is an open + standard designed to enable remote monitoring and control of server, + networking and telecommunication platforms. + + The &man.kbdmux.4; has been integrated into &man.syscons.4; and + kbd device driver. + By default &man.syscons.4; will look for the &man.kbdmux.4; + keyboard first, and then, if not found, look for any keyboard. + Switch to &man.kbdmux.4; can be done at boot time by loading + kbdmux kernel module via &man.loader.8;, + or at runtime via &man.kldload.8; and releasing the active + keyboard. + + The &man.kbdmux.4; has been included in the + GENERIC kernel by default. + Also, the Boot FreeBSD with USB keyboard + menu item in the boot loader menu has been removed + since this fixes USB keyboard probing problems. + The loader tunable debug.mpsafevfs is set to 1 by default. + The &man.scc.4; driver has been added. + This provides generic support for serial communications + controllers and delegates the control over each channel + and mode to a subordinate driver such as &man.uart.4;. + The smbios(4) driver support for amd64 has been added. The tnt4882(4) driver which supports National Instruments PCI-GPIB card has been added. + The &man.uart.4; driver has been included in the + GENERIC kernel by default. + When both &man.sio.4; and &man.uart.4; can handle a serial port, + &man.sio.4; will claim it. + + The &man.uart.4; driver now supports LOM (Lights Out Management) + and RSC (Remote System Control) devices as console. + A new loader tunable hw.apic.enable_extint has been added. This tunable can be used not to mask the ExtINT pin on the first @@ -243,16 +381,41 @@ The &man.snd.als4000.4; driver is now MPSAFE. + The &man.snd.atiixp.4; driver has been added. + This supports ATI IXP 200/300/400 series audio controllers. + + The &man.snd.atiixp.4; driver now supports + suspend and resume features. + The &man.snd.cmi.4; driver is now MPSAFE. + The &man.snd.solo.4; driver is now MPSAFE. + The &man.snd.via8233.4; driver is now MPSAFE. The &man.snd.via82c686.4; driver is now MPSAFE. + + The &man.speaker.4; driver now supports &os;/amd64. + + The &man.uaudio.4; driver now supports 24/32 bit audio + formats and conversion. Network Interface Support + The &man.ath.4; driver has been updated to + version 0.9.16.16. + + The &man.bce.4; driver, which supports Broadcom + NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet controllers, + has been added. For more details, see &man.bce.4;. + + The &man.bge.4; driver's Jumbo frame support is now MPSAFE. + + The &man.bge.4; driver now supports big-endian + architectures such as sparc64. + The &man.dc.4; driver is now MPSAFE. &merged; The &man.de.4; driver has been converted to the &man.bus.dma.9; @@ -262,8 +425,42 @@ The &man.el.4; driver has been removed. + The &man.em.4; driver now supports big-endian + architectures such as sparc64. + + The &man.em.4; driver has been updated to + version 3.2.18 from Intel, and now supports + 82571 and 82572 based adapters. + + The &man.em.4; driver now includes + initial support for suspend and resume features. + + The &man.em.4; driver has been improved on + its performance by using a fast interrupt handler and taskqueue + instead of ithread handler. This change can be disabled + by defining NO_EM_FASTINTR kernel option + for debugging purpose. + + The &man.iwi.4; driver now supports big-endian + architectures such as sparc64. + + The &man.le.4; driver, which supports AMD Am7900 LANCE + and Am79C9xx PCnet NICs and is based on NetBSD's implementation + has been added. While the &man.lnc.4; driver also support these + NICs, this driver has several advantages over it such as + MPSAFE, ALTQ, VLAN_MTU, ifmedia, and 32-bit DMA for PCI + variants. + The &man.my.4; driver is now MPSAFE. &merged; + The &man.myri10ge.4; driver, + which supports Myricom Myri10GE 10 Gigabit Ethernet + adapters, has been added. For more details, see + &man.myri10ge.4;. + + The &man.nve.4; driver has been updated to version 1.0-0310 + (23-Nov-2005). + The &man.pcn.4; driver is now MPSAFE. &merged; The &man.re.4; driver now supports D-Link DGE-528(T) @@ -272,15 +469,65 @@ The &man.sf.4; driver is now MPSAFE. &merged; The &man.ste.4; driver is now MPSAFE. + + The &man.ti.4; driver now supports big-endian + architectures such as sparc64. + + The &man.ufoma.4; driver for + FOMA (third generation mobile phone system by NTT DoCoMo, Inc. + in Japan) has been added. + This should support other third generation mobile phones + since the driver is based on USB Implementation Guideline + from MCPC (Mobile Computing Promotion Consortium) in Japan. + + The vgapci(4) driver has been added. This is a stub + device driver for VGA PCI devices and serves as a bus + so that other drivers such as drm(4), + &man.acpi.video.4;, and &man.agp.4; can attach to + it thus allowing multiple drivers for the same device. + Network Protocols + The &man.arp.8; retransmission algorithm has been + rewritten as that ARP requests are retransmitted without + suppression, while there is demand for such ARP entry. + Due to this change, a sysctl variable + net.link.ether.inet.host_down_time + has been removed. + + The &man.arp.8; now supports a sysctl variable + net.link.ether.inet.log_arp_permanent_modify + to suppress logging of attempts to modify + permanent ARP entries. + + The &man.arp.8; utility now allows + option with and options + to allow all entries for a given interface to be removed. + + An experimental BPF Just-In-Time compiler + has been implemented. To enable this, + options BPF_JITTER kernel option is needed, + and a sysctl variable net.bpf.jitter.enable + can be used to disable this feature. + The &man.gre.4; driver, which is for GRE encapsulation found in RFC 1701 and RFC 1702 now supports IPv6 over GRE. + The &man.if.bridge.4; bridge driver now supports + creating span ports, which transmit a copy of every frame + received by the bridge. This feature can be enabled + by using &man.ifconfig.8;. + + The &man.if.bridge.4; bridge driver now supports + RFC 3378 EtherIP. This change makes it possible to + add &man.gif.4; interfaces to bridges, which will then + send and receive IP protocol 97 packets. + Packets are Ethernet frames with an EtherIP header prepended. + The path MTU discovery for multicast packets in the &os; &man.ip6.4; stack has been disabled by default because notifying path MTU by a lot of routers in multicast @@ -292,8 +539,39 @@ The &man.ip6fw.8; is deprecated and will be removed in the future releases. + The &man.ipfw.4; now supports substitution of the action + argument with the value obtained from table lookup, + which allows to optimize the rulesets. + This is now applicable only to pipe, + queue, + divert, + tee, + netgraph, + and ngtee rules. + For example, the following rules will throw different + packets to different pipes: + + pipe 1000 config bw 1000Kbyte/s +pipe 4000 config bw 4000Kbyte/s +table 1 add x.x.x.x 1000 +table 1 add x.x.x.y 4000 +pipe tablearg ip from table(1) to any + The &man.natm.4;, Native Mode ATM protocol layer is now MPSAFE. + The &man.ng.bpf.4; Netgraph node now supports BPF Just-In-Time compiler. + Also, the sysctl has been changed from net.bpf.jitter.enable + to net.bpf_jitter.enable and this controls + both &man.bpf.4; and &man.ng.bpf.4; now. + + A bug where a connection of NFS over TCP would not reconnect + when the server sent FIN. This problem had occurred + with Solaris NFS servers. + + The sysctl variable net.inet.ip.portrange.reservedhigh + and net.inet.ip.portrange.reservedlow + can be used with IPv6 now. + A new sysctl variable net.inet.icmp.reply_from_interface has been added. This allows the &man.icmp.4; reply to non-local packets generated with @@ -331,6 +609,18 @@ The stealth forwarding now supports IPv6 as well as IPv4. This behavior can be controlled by using a new sysctl variable net.inet6.ip6.stealth. + + A bug that IPV6_V6ONLY socket option + does not work for UDP has been fixed. + + The TCP bandwidth-delay product limiting feature has + been disabled when the RTT is below a certain threshold. + This optimization does not make sense on a LAN as it has + trouble figuring out the maximal bandwidth due to the coarse + tick granularity. A new sysctl variable + net.inet.tcp.inflight.rttthresh specifies + the threshold in milliseconds below which this feature + will disengage. It defaults to 10ms. @@ -339,6 +629,16 @@ The &man.aac.4; driver now supports the Adaptec 2610SA SATA-RAID controller in some Hewlett-Packard machines. + The &man.amr.4; driver has been improved on its performance + and now supports full 64-bit DMA. While this feature is + enabled by default, this can be forced off by setting the + hw.amr.force_sg32 loader tunable for + debugging purpose. + + The &man.amr.4; driver now supports &man.ioctl.2; requests + necessary for Linux LSI MegaRaid tools on &os;'s Linux emulation + environment. + The &man.ata.4; driver now supports a workaround for some controllers whose DMA does not work properly in 48bit mode. For the suspicious controllers @@ -348,6 +648,51 @@ and Promise PDC40718 and PDC40719 chip found in Promise Fasttrak TX4300. + The &man.ata.4; driver now supports DMA for kernel crash dump + and crash dumping to &man.ataraid.4; device. + + The &man.ata.4; driver now supports USB mass storage class + devices. To enable it, a line device atausb + in the kernel configuration file or loading the + atausb kernel module is needed. + Note that this conflicts &man.umass.4; and cannot coexist with + each other. + + The &man.ataraid.4; driver now supports + JMicron ATA RAID metadata. + + The GEOM_MIRROR class now supports + kernel crash dump to the GEOM providers. + + The GEOM_MIRROR and GEOM_RAID3 + classes now support sysctl variables + kern.geom.mirror.disconnect_on_failure + and + kern.geom.graid3.disconnect_on_failure + to control whether failed components will be disconnected or not. + The default value is 1 to preserve the current + behavior, and if it is set to 0 such components + are not disconnected and the kernel will try to still use them + (only first error will be logged). + This is helpful when we have two broken components, but in + different places, so actually all data is available. + The broken components will be visible in gmirror list + or graid3 list output with flag + BROKEN. + + The GEOM_MIRROR and GEOM_RAID3 + classes now use parallel I/O request for synchronization + to improve the performance. New sysctl variables + kern.geom.mirror.sync_requests and + kern.geom.raid3.sync_requests + define how many parallel I/O requests should be used. + Also, sysctl variables + kern.geom.mirror.reqs_per_sync, + kern.geom.mirror.syncs_per_sec, + kern.geom.raid3.reqs_per_sync, and + kern.geom.raid3.syncs_per_sec + are deprecated and have been removed. + A new GEOM class GEOM_ZERO has been added. It creates very huge provider (41PB) /dev/gzero and mainly for performance testing. @@ -358,9 +703,16 @@ The GEOM_LABEL class now supports Ext2FS and ReiserFS. - The &man.hptmv.4; driver has been updated and now supports + The GEOM class kernel module g_md.ko + has been renamed to geom_md.ko + for consistency. + + The &man.hptmv.4; driver has been updated and now supports amd64 as well as PAE. + The &man.mfi.4; driver, which supports + LSI MegaRAID SAS controller family has been added. + The &man.mpt.4; driver has been updated to support various new features such as RAID volume and RAID member state/settings reporting, periodic volume re-synchronization @@ -368,11 +720,36 @@ re-synchronization rate, volume member write cache status, and volume transaction queue depth. + The &man.mpt.4; driver now supports SAS HBA (partially), + 64-bit PCI, and large data transfer. + + The &man.twa.4; has been updated to the 9.3.0.1 + release on the 3ware website. + A new GEOM-based disk encryption facility, GEOM_ELI, has been added. It uses the &man.crypto.9; framework for hardware acceleration and supports different cryptographic algorithms. See &man.geli.8; for more information. &merged; + The &man.geli.8; now supports loading keyfiles before root + file system is mounted. For example, the following entries + can be used in /boot/loader.conf to enable + it: + + geli_da0_keyfile0_load="YES" +geli_da0_keyfile0_type="da0:geli_keyfile0" +geli_da0_keyfile0_name="/boot/keys/da0.key0" +geli_da0_keyfile1_load="YES" +geli_da0_keyfile1_type="da0:geli_keyfile1" +geli_da0_keyfile1_name="/boot/keys/da0.key1" +geli_da0_keyfile2_load="YES" +geli_da0_keyfile2_type="da0:geli_keyfile2" +geli_da0_keyfile2_name="/boot/keys/da0.key2" + +geli_da1s3a_keyfile0_load="YES" +geli_da1s3a_keyfile0_type="da1s3a:geli_keyfile0" +geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key" + The &man.umass.4; driver now supports PLAY_MSF, PLAY_TRACK, @@ -387,12 +764,30 @@ A part of the FreeBSD NFS subsystem (the interface with the protocol stack and callouts) is now MPSAFE. + + An initial support of SGI's XFS filesystem has been + added. Contributed Software - + Intel ACPI-CA + has been updated to 20051021. + + DRM has + been updated to a snapshot from DRI CVS as of 20051202. + + TrustedBSD OpenBSM distribution, + version 1.0 alpha 5, an implementation of the documented Sun Basic + Security Module (BSM) Audit API and file format, as well as local + extensions to support the Mac OS X and FreeBSD operating systems + has been added. This also includes command line tools for audit + trail reduction and conversion to text, as well as documentation + of the commands, file format, and APIs. + For this functionality, the AUDIT kernel option, + /var/audit directory, and + audit group have been added. @@ -406,16 +801,69 @@ &man.getaddrinfo.3; function on 64-bit architecture including &os;/alpha, &os;/amd64, &os;/ia64, and &os;/sparc64. + OpenBSM userland tools including &man.audit.8;, + &man.auditd.8;, + &man.auditreduce.1;, + &man.praudit.1; have been added. + The &man.bsdiff.1; and &man.bspatch.1; utilities have been added. These are tools for constructing and applying binary patches. + The &man.bsnmpd.1; utility now supports the Host Resources + MIB described in RFC 2790. + The &man.cmp.1; utility now supports an flag to compare the symbolic link itself rather than the file that the link points to. + The &man.config.8; utility now supports nocpu + directive. + + The &man.config.8; utility now reads DEFAULTS + kernel configuration file if it exists in the current directory + before the specified configuration file. + + The &man.csh.1; utility now supports NLS catalog. + Note that this requires installing + shells/tcsh_nls. + + The csup(1) utility has been imported. + This is an implementation of CVSup-compatible client written + in C language. Note that it currently supports checkout mode + only. + + The &man.devd.8; utility now supports a option + to specify a configuration file. + + The &man.ftpd.8; utility now creates a PID file + /var/run/ftpd.pid even when + no option is specified. + + The &man.gbde.8; utility now supports + and options + to specify a key file in addition to a passphrase. + + The &man.getfacl.1; utility now supports + a flag to suppress the per-file header + comment listing the file name, owner, and group. + The &man.gpt.8; utility now supports setting GPT partition labels. + The &man.gvinum.8; utility now supports commands + to rename objects and to move a subdisk from + one drive to another. + + The &man.gvinum.8; utility now supports + resetconfig sub-command. + + An implementation of Generic Security Service API (GSS-API) + version 2 and its C binding described in RFC2743 and RFC2744 + has been added. This is a new extensible GSS-API layer which + can support GSS-API plugins, similar the the Solaris + implementation, and the Kerberos 5 GSS mechanism has + been rewritten as a plugin library for the new implementation. + The &man.ifconfig.8; utility now supports a flag to allow printing potentially sensitive keying material to standard output. @@ -430,12 +878,41 @@ argument still is supported for backward compatibility, but now it is deprecated and its use is discouraged. + The &man.jail.8; utility pports a option to + write out a JidFile, similar to a PidFile, containing + the jailid, path, hostname, IP and the command used to start + the jail. + + The &man.kdump.1; now supports a + flag, which causes kdump to print an additional field holding + the threadid. + + The &man.kdump.1; now supports a + flag to suppress the display of I/O data. + The &man.kenv.1; utility now supports a flag to suppress warnings. + The &man.kgdb.1; now supports a + option to open kmem-based targets in read-write mode. + This allows one to use kgdb on /dev/mem + and be able to patch memory on a live system. + + The &man.libarchive.3; library now supports + POSIX.1e-style Extended Attribute. + + The libc library now includes + initial implementation of symbol maps and symbol version + definitions. + The libedit library has been updated from the NetBSD source tree as of August 2005. + The libm library now includes + initial implementation of symbol maps and symbol version + definitions. + The &man.libmemstat.3; library has been added. This is for use by debugging and monitoring applications in tracking kernel memory statistics. It provides an @@ -443,10 +920,53 @@ statistics, wrapped around the binary stream sysctl variables for the allocators. &merged; + The &man.ln.1; utility now supports + an flag which allows to delete existing + empty directories, when creating symbolic links. + + The &man.locate.1; utility now supports + a flag to make this utility + interoperable with &man.xargs.1;'s flag. + + The &man.ls.1; utility now supports + an flag to disable the automatic + flag for the superuser. + + The &man.ls.1; utility now supports + an flag to use the file creation + time for sorting. + + The &man.mdconfig.8; utility now supports XML + output of the device listing. Currently + list and query + sub-command support this feature. + + The &man.mdconfig.8; utility's option + now supports specifying multiple devices separated + by comma character. + + The &man.mdmfs.8; utility now supports a flag + to allow skipping &man.newfs.8; process + when using a vnode-backed disk. + + The &man.mdmfs.8; utility now supports a flag + to allow to specify location of the &man.mdconfig.8; + utility instead of using the default one + (/sbin/mdconfig). + A new function &man.memmem.3; has been implemented in libc. This is the binary equivalent to &man.strstr.3; and found in glibc. + The &man.mergemaster.8; utility now supports + an option to explicitly specify + an architecture to pass through to the underlying makefiles. + + The &man.mount.8; nodev option has + been removed. + + The &man.mount.8; now supports &man.mqueuefs.5;. + The &man.moused.8; now supports an flag to enable horizontal virtual scrolling similar to a flag for vertical virtual scrolling. @@ -455,6 +975,19 @@ flag for interface stats mode, which prints all interface statistics in human readable form. + The &man.netstat.1; utility now supports + printing &man.ipsec.4; protocol statistics if the + kernel was compiled with FAST_IPSEC + rather than the KAME IPSEC stack. + Note that the output of netstat -s -p ipsec + differs depending on which stack is compiled into + the kernel since they each keep different stats. + + The &man.periodic.8; daily script now supports + to show the status of &man.gmirror.8;, &man.graid3.8;, + &man.gstripe.8;, and &man.gconcat.8; devices. + Note that these are disabled by default. + A new functions, &man.pidfile.3;, which allow reliable pidfiles handling have been implemented in libutil. @@ -472,15 +1005,58 @@ is also specified, the pidfile file must be locked with the &man.flock.2; syscall or created with &man.pidfile.3;. + The &man.pkill.1; utility now supports a + flag which works like + of &man.rm.1;. When this flag is specified, &man.pkill.1; + will ask for confirmation before sending a signal to + each matching process. + The &man.powerd.8; program now supports a option which allows to specify pidfile. + The DNS resolver library in &os;'s libc + has been updated to BIND9's one. + + The &man.rfcomm.sppd.1; now supports service name + in addition to option with channel number. + The supported names are: DUN (Dial-Up Networking), FAX (Fax), + LAN (LAN Access Using PPP), and SP (Serial Port). + The &man.rpcgen.1; utility now generates headers and stub files which can be used with ANSI C compilers by default. + The &man.rtld.1; runtime linker now supports ELF symbol versioning + using GNU semantics. This implementation aims to be compatible + with symbol versioning support as implemented by GNU libc and + documented in + and LSB 3.0. Also, dlvsym() + function has been added to + allow lookups for a specific version of a given symbol. + + The &man.sh.1; utility now supports times + built-in command. + + The &man.strtonum.3; library function has been implemented + based on OpenBSD's implementation. This is an improved version of + &man.strtoll.3;. + The &man.sysctl.8; utility now supports a flag to suppress a limited set of warnings and errors. + The &man.truss.1; utility now supports an + flag for the same functionality as the strace utility + (devel/strace). + + The &man.truss.1; utility now supports &os;/ppc. + + The &man.usbd.8; utility has been removed. + The &man.devd.8; utility and its configuration + file now support functionality which is equivalent to it. + + The &man.xargs.1; utility now supports a + flag which makes the command execution when the standard input + does not contain any non-whitespace-characters. + The shared library version number of all libraries have been updated due to some possible ABI changes. The libraries include: snmp_*, libdialog, libg2c, libobjc, @@ -500,6 +1076,24 @@ <filename>/etc/rc.d</filename> Scripts + The auditd script for + OpenBSM &man.auditd.8; has been added. + + The bluetooth script + has been added. This script will be called from + &man.devd.8; in response to device attachment/detachment + events and to stop/start particular device without unplugging + it by hand. The configuration parameters are in + /etc/defaults/bluetooth.device.conf, + and can be overridden by using + /etc/bluetooth/$device.conf + (where $device is ubt0, + btcc0, and so on.) + For more details, see &man.bluetooth.conf.5;. + + The ftpd script for + stand-alone &man.ftpd.8; has been added. + The gbde_swap script has been removed in favor a new encswap script which also supports &man.geli.8; for swap @@ -509,6 +1103,44 @@ scripts has been added for &man.geli.8; device configuration on boot. + The ike script for + IPsec IKE daemon has been removed because no such daemon + is included in the base system. + + The hcsecd and + sdpd scripts have been added + for &man.hcsecd.8; and &man.sdpd.8; daemons. + These daemons can run even if no Bluetooth devices + are attached to the system, but both daemons depend on + Bluetooth socket layer and thus disabled by default. + Bluetooth sockets layer must be either loaded + as a module or compiled into kernel before the daemons can run. + + The hostapd script for + &man.hostapd.8; has been added. + + The netif script now supports + ipv4_addrs_ifn, + which adds one or more IPv4 address from a ranged list in + CIRD notation. For example: + + ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28" + + The rcconf.sh in /etc/rc.d + has been removed and a variable early_late_divider, + which designates the script to separate the early and late stages + of the boot process, has been added. + + The rc.initdiskless now uses &man.tar.1; + instead of &man.pax.1; because the &man.pax.1; needs a writable + temporary directory. + + The pccard script has been removed + since OLDCARD is deprecated. + + The ppp-user script has been renamed to + ppp. + The removable_interfaces variable has been removed. @@ -528,18 +1160,56 @@ BIND has been updated from 9.3.1 to 9.3.2. &merged; + BSNMPD has been updated from + 1.11 to 1.12. + + GNU Readline library + has been updated from 5.0 to 5.1. + IPFilter has been updated from 4.1.8 to 4.1.10. + OpenSSH has been updated from + 4.2p1 to 4.3p1. + + hostapd + has been updated from version 0.3.9 to version 0.4.8. + + sendmail has been updated from + 8.13.4 to 8.13.6. &merged; + The timezone database has been updated from the tzdata2005l release to the tzdata2005r release. &merged; + WPA Supplicant + has been updated from version 0.3.9 to version 0.4.8. + + zlib + has been updated from version 1.2.2 to version 1.2.3. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 11 15:48:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 808A616A405; Tue, 11 Apr 2006 15:48:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41BC016A407 for ; Tue, 11 Apr 2006 15:48:03 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9DB143D48 for ; Tue, 11 Apr 2006 15:48:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BFm2ZR068081 for ; Tue, 11 Apr 2006 15:48:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BFm2XV068078 for perforce@freebsd.org; Tue, 11 Apr 2006 15:48:02 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 15:48:02 GMT Message-Id: <200604111548.k3BFm2XV068078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94989 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 15:48:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=94989 Change 94989 by imp@imp_hammer on 2006/04/11 15:47:25 need to include this so that we have a simpler interface. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/lib.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/lib.h#2 (text+ko) ==== @@ -4,4 +4,6 @@ int getc(int); int putc(int); +#include "at91rm9200_lowlevel.h" + #endif From owner-p4-projects@FreeBSD.ORG Tue Apr 11 16:06:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 233D816A407; Tue, 11 Apr 2006 16:06:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDD3B16A405 for ; Tue, 11 Apr 2006 16:06:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8818843D5A for ; Tue, 11 Apr 2006 16:06:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BG6PjP080578 for ; Tue, 11 Apr 2006 16:06:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BG6Pnu080575 for perforce@freebsd.org; Tue, 11 Apr 2006 16:06:25 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 16:06:25 GMT Message-Id: <200604111606.k3BG6Pnu080575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 16:06:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=94990 Change 94990 by imp@imp_hammer on 2006/04/11 16:05:44 Tweak for KB920x board. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#8 (text+ko) ==== @@ -63,10 +63,10 @@ // CSS = PLLB // Crude selection between 16MHz clock and 10MHz clock. - if (AT91C_BASE_CKGR->CKGR_MCFR & AT91C_CKGR_MAINF < 6000) +// if (AT91C_BASE_CKGR->CKGR_MCFR & AT91C_CKGR_MAINF < 6000) div = OSC_MAIN_FREQ_DIV_10; - else - div = OSC_MAIN_FREQ_DIV_16; +// else +// div = OSC_MAIN_FREQ_DIV_16; // set PLLA = 180MHz // assume main osc = 10Mhz @@ -80,7 +80,7 @@ // mul = 90 value = AT91C_BASE_CKGR->CKGR_PLLAR; value &= ~AT91C_CKGR_MULA; - value |= (OSC_MAIN_MULT -1) << 16; + value |= (OSC_MAIN_MULT - 1) << 16; AT91C_BASE_CKGR->CKGR_PLLAR = value; // wait for lock From owner-p4-projects@FreeBSD.ORG Tue Apr 11 16:42:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D290F16A40A; Tue, 11 Apr 2006 16:42:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92DB416A402 for ; Tue, 11 Apr 2006 16:42:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4444543D48 for ; Tue, 11 Apr 2006 16:42:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BGgiFm001388 for ; Tue, 11 Apr 2006 16:42:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BGgi2M001377 for perforce@freebsd.org; Tue, 11 Apr 2006 16:42:44 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 16:42:44 GMT Message-Id: <200604111642.k3BGgi2M001377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 16:42:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=94993 Change 94993 by imp@imp_Speedy on 2006/04/11 16:41:42 hacks for the tsc board Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#9 (text+ko) ==== @@ -26,15 +26,11 @@ #define BAUD 115200 -/* ****************************** GLOBALS *************************************/ - -/* ***********************PRIVATE FUNCTIONS/DATA ******************************/ - #define AT91C_US_ASYNC_MODE (AT91C_US_USMODE_NORMAL + AT91C_US_NBSTOP_1_BIT + AT91C_US_PAR_NONE + AT91C_US_CHRL_8_BITS + AT91C_US_CLKS_CLOCK) -/* ************************** GLOBAL FUNCTIONS ********************************/ +//#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +#define SDRAM_WIDTH AT91C_SDRC_DBW_32_BITS - /* * .KB_C_FN_DEFINITION_START * void DefaultSystemInit(void) @@ -64,9 +60,9 @@ // Crude selection between 16MHz clock and 10MHz clock. // if (AT91C_BASE_CKGR->CKGR_MCFR & AT91C_CKGR_MAINF < 6000) - div = OSC_MAIN_FREQ_DIV_10; +// div = OSC_MAIN_FREQ_DIV_10; // else -// div = OSC_MAIN_FREQ_DIV_16; + div = OSC_MAIN_FREQ_DIV_16; // set PLLA = 180MHz // assume main osc = 10Mhz @@ -132,12 +128,10 @@ ((6 << 27) & AT91C_SDRC_TXSR); - AT91C_BASE_SDRC->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_PRCGALL_CMD; + AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_PRCGALL_CMD; *p = 0; - AT91C_BASE_SDRC->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_RFSH_CMD; + AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_RFSH_CMD; *p = 0; *p = 0; *p = 0; @@ -147,16 +141,13 @@ *p = 0; *p = 0; - AT91C_BASE_SDRC->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_LMR_CMD; + AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_LMR_CMD; *p = 0; AT91C_BASE_SDRC->SDRC_TR = 7 * AT91C_MASTER_CLOCK / 1000000; - *p = 0; - AT91C_BASE_SDRC->SDRC_MR = - AT91C_SDRC_DBW_16_BITS | AT91C_SDRC_MODE_NORMAL_CMD; + AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_NORMAL_CMD; *p = 0; // Configure DBGU -use local routine optimized for space From owner-p4-projects@FreeBSD.ORG Tue Apr 11 17:23:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 018D116A406; Tue, 11 Apr 2006 17:23:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3CAB16A404 for ; Tue, 11 Apr 2006 17:23:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53B8B43D49 for ; Tue, 11 Apr 2006 17:23:38 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BHNcg7032109 for ; Tue, 11 Apr 2006 17:23:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BHNbP5032106 for perforce@freebsd.org; Tue, 11 Apr 2006 17:23:37 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 17:23:37 GMT Message-Id: <200604111723.k3BHNbP5032106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 94999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 17:23:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=94999 Change 94999 by imp@imp_hammer on 2006/04/11 17:23:09 Make it possible to compile for TSC board or KB920x board. Turns out we can't probe the SDRAM bus size, so back off from auto clock detection. I think these changes save 8 bytes. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#5 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#10 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#5 (text+ko) ==== @@ -2,7 +2,7 @@ SRCS=arm_init.s at91rm9200_lowlevel.c lib.c main.c xmodem.c NO_MAN= LDFLAGS=-e 0 -T linker.cfg -CFLAGS=-O2 -mcpu=arm9 -ffreestanding +CFLAGS=-O2 -mcpu=arm9 -ffreestanding -DBOOT0_TSC OBJS+= ${SRCS:N*.h:R:S/$/.o/g} CLEANFILES=${OBJS} ${PROG} ${PROG}.out ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#10 (text+ko) ==== @@ -28,9 +28,6 @@ #define AT91C_US_ASYNC_MODE (AT91C_US_USMODE_NORMAL + AT91C_US_NBSTOP_1_BIT + AT91C_US_PAR_NONE + AT91C_US_CHRL_8_BITS + AT91C_US_CLKS_CLOCK) -//#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS -#define SDRAM_WIDTH AT91C_SDRC_DBW_32_BITS - /* * .KB_C_FN_DEFINITION_START * void DefaultSystemInit(void) @@ -46,7 +43,6 @@ register unsigned value; int i; volatile unsigned short *p = (unsigned short *)SDRAM_BASE; - unsigned int div; AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC10; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC10; @@ -57,20 +53,12 @@ // main osc = 10Mhz // PLLB configured for 96MHz (48MHz after div) // CSS = PLLB - - // Crude selection between 16MHz clock and 10MHz clock. -// if (AT91C_BASE_CKGR->CKGR_MCFR & AT91C_CKGR_MAINF < 6000) -// div = OSC_MAIN_FREQ_DIV_10; -// else - div = OSC_MAIN_FREQ_DIV_16; - // set PLLA = 180MHz // assume main osc = 10Mhz // div = 5 , out = 2 (150MHz = 240MHz) value = AT91C_BASE_CKGR->CKGR_PLLAR; - value &= ~AT91C_CKGR_DIVA; - value &= ~AT91C_CKGR_OUTA; - value |= div | AT91C_CKGR_OUTA_2 | AT91C_CKGR_SRCA; + value &= ~(AT91C_CKGR_DIVA | AT91C_CKGR_OUTA); + value |= OSC_MAIN_FREQ_DIV | AT91C_CKGR_OUTA_2 | AT91C_CKGR_SRCA; AT91C_BASE_CKGR->CKGR_PLLAR = value; // mul = 90 @@ -80,18 +68,18 @@ AT91C_BASE_CKGR->CKGR_PLLAR = value; // wait for lock - while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_LOCKA)) ; + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_LOCKA)) + continue; // change divider = 3, pres = 1 value = AT91C_BASE_PMC->PMC_MCKR; - value &= ~AT91C_PMC_MDIV; - value |= AT91C_PMC_MDIV_3; - value &= ~AT91C_PMC_PRES; - value |= AT91C_PMC_PRES_CLK; + value &= ~(AT91C_PMC_MDIV | AT91C_PMC_PRES); + value |= AT91C_PMC_MDIV_3 | AT91C_PMC_PRES_CLK; AT91C_BASE_PMC->PMC_MCKR = value; // wait for update - while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) ; + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) + continue; // change CSS = PLLA value &= ~AT91C_PMC_CSS; @@ -99,7 +87,8 @@ AT91C_BASE_PMC->PMC_MCKR = value; // wait for update - while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) ; + while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) + continue; // setup SDRAM access // EBI chip-select register (CS1 = SDRAM controller) ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#4 (text+ko) ==== @@ -29,9 +29,18 @@ #define SDRAM_BASE 0x20000000 +#ifdef BOOT0_KB9202 /* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */ -#define OSC_MAIN_FREQ_DIV_10 5 /* for 10MHz osc */ -#define OSC_MAIN_FREQ_DIV_16 8 /* for 16MHz osc */ +#define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */ +#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +#endif + +#ifdef BOOT0_TSC +/* The following divisor sets PLLA frequency: e.g. 16/8 * 90 = 180MHz */ +#define OSC_MAIN_FREQ_DIV 8 /* for 16MHz osc */ +#define SDRAM_WIDTH AT91C_SDRC_DBW_32_BITS +#endif + #define OSC_MAIN_MULT 90 /* Constant for both */ /* Master clock frequency at power-up */ From owner-p4-projects@FreeBSD.ORG Tue Apr 11 17:23:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 720E716A47C; Tue, 11 Apr 2006 17:23:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DD1916A44A for ; Tue, 11 Apr 2006 17:23:39 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B48E843D48 for ; Tue, 11 Apr 2006 17:23:38 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BHNcgH032115 for ; Tue, 11 Apr 2006 17:23:38 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BHNc1h032112 for perforce@freebsd.org; Tue, 11 Apr 2006 17:23:38 GMT (envelope-from alc@freebsd.org) Date: Tue, 11 Apr 2006 17:23:38 GMT Message-Id: <200604111723.k3BHNc1h032112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 95000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 17:23:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=95000 Change 95000 by alc@alc_home on 2006/04/11 17:23:10 IF user/alc/superpages Catch up with the change to pmap_remove_pages()'s parameters. Clean up code. Avoid kernel pmap page table page leaks on promotion of kernel pages. Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#15 integrate Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#15 (text+ko) ==== @@ -208,6 +208,8 @@ static pv_entry_t get_pv_entry(pmap_t locked_pmap); static void pmap_clear_ptes(vm_page_t m, long bit); +static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, reservation_t reserv); static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva); static int pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -227,9 +229,6 @@ static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); -static void mach_promote(pmap_t pmap, pd_entry_t *pde, reservation_t reserv); -static boolean_t pmap_demote(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); - CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); @@ -1291,7 +1290,7 @@ * normal 4K page. */ if (pd != 0 && (*pd & (PG_PS | PG_V)) == (PG_PS | PG_V)) { - if (!pmap_demote(pmap, pd, va)) { + if (!pmap_demote_pde(pmap, pd, va)) { /* * Invalidation of the 2MB page mapping may have caused * the deallocation of the underlying PD page. @@ -1500,7 +1499,7 @@ pmap->pm_stats.resident_count--; pde = pmap_pde(pmap, va); if ((*pde & PG_PS) != 0 && - !pmap_demote(pmap, pde, va)) { + !pmap_demote_pde(pmap, pde, va)) { /* * All mappings within the same 2mpage were * destroyed and pv was freed. @@ -1796,13 +1795,19 @@ if (sva + NBPDR == va_next && eva >= va_next) { DPRINTF(("pmap_remove: superpage at %lx to destroy.\n", sva)); + + /* + * The TLB entry for a PG_G mapping is + * invalidated by pmap_remove_pde(). + */ + if ((ptpaddr & PG_G) == 0) + anyvalid = 1; pmap_remove_pde(pmap, pde, sva); - anyvalid = 1; continue; } else { DPRINTF(("pmap_remove: superpage at %lx to demote !!!\n", sva)); - if (!pmap_demote(pmap, pde, sva)) { + if (!pmap_demote_pde(pmap, pde, sva)) { anyvalid = 1; /* XXX */ continue; } @@ -1878,7 +1883,7 @@ pde = pmap_pde(pmap, pv->pv_va); if (*pde & PG_PS) { DPRINTF(("pmap_remove_all: superpage to demote !!!\n")); - if (!pmap_demote(pmap, pde, pv->pv_va)) { + if (!pmap_demote_pde(pmap, pde, pv->pv_va)) { /* * All mappings within the same 2mpage were * destroyed and pv was freed. @@ -2017,7 +2022,7 @@ anychanged = 1; continue; } else { - if (!pmap_demote(pmap, pde, sva)) { + if (!pmap_demote_pde(pmap, pde, sva)) { anychanged = 1; /* XXX */ continue; } @@ -2262,7 +2267,7 @@ m->reserv->refcnt == NBPDR / PAGE_SIZE) { DPRINTF(("%s: pmap %p va %lx XXX\n", __func__, pmap, va)); KASSERT(m->object->flags & OBJ_SUPERPAGES, ("pmap_enter: xxx")); - mach_promote(pmap, pmap_pde(pmap, va), m->reserv); + pmap_promote_pde(pmap, pmap_pde(pmap, va), m->reserv); } vm_page_unlock_queues(); @@ -2392,7 +2397,7 @@ DPRINTF(("%s: pmap %p va %lx XXX\n", __func__, pmap, va)); KASSERT(m->object->flags & OBJ_SUPERPAGES, ("pmap_enter_quick: xxx")); - mach_promote(pmap, pmap_pde(pmap, va), m->reserv); + pmap_promote_pde(pmap, pmap_pde(pmap, va), m->reserv); } out: PMAP_UNLOCK(pmap); @@ -2799,24 +2804,11 @@ npv = TAILQ_NEXT(pv, pv_plist); continue; } - if (sva <= trunc_2mpage(pv->pv_va) && - eva >= round_2mpage(pv->pv_va + 1)) { - DPRINTF(("pmap_remove_pages: superpage at %lx to destroy.\n", - trunc_2mpage(pv->pv_va))); - pmap_remove_pde(pmap, pde, trunc_2mpage(pv->pv_va)); - npv = TAILQ_FIRST(&pmap->pm_pvlist); - continue; - } - DPRINTF(("pmap_remove_pages: superpage at %lx to demote !!!\n", - pv->pv_va)); - if (!pmap_demote(pmap, pde, pv->pv_va)) { - /* - * All mappings within the same 2mpage were - * destroyed and pv was freed. - */ - npv = TAILQ_FIRST(&pmap->pm_pvlist); - continue; - } + DPRINTF(("pmap_remove_pages: superpage at %lx to destroy.\n", + trunc_2mpage(pv->pv_va))); + pmap_remove_pde(pmap, pde, trunc_2mpage(pv->pv_va)); + npv = TAILQ_FIRST(&pmap->pm_pvlist); + continue; } #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY @@ -2970,7 +2962,7 @@ if (*pde & PG_PS) { DPRINTF(("pmap_clear_ptes: superpage to demote !!!\n")); if ((*pde & bit) == 0 || - !pmap_demote(pmap, pde, pv->pv_va)) { + !pmap_demote_pde(pmap, pde, pv->pv_va)) { /* * All mappings within the same 2mpage were * destroyed and pv was freed. @@ -3267,7 +3259,7 @@ #define COMPATIBLE_PTE(a,b) ((a & COMPATIBLE_PTE_MASK) == (b & COMPATIBLE_PTE_MASK)) static void -mach_promote(pmap_t pmap, pd_entry_t *pde, reservation_t reserv) +pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, reservation_t reserv) { vm_paddr_t pa; pt_entry_t *pte, *first_pte, flags; @@ -3287,8 +3279,9 @@ pa += PAGE_SIZE; page_pa = PHYS_TO_VM_PAGE(*pte & PG_FRAME); - KASSERT(page_pa->reserv,("mach_promote: page has no reservation")); - KASSERT(page_pa->reserv == reserv,("mach_promote: reservation mismatch")); + KASSERT(page_pa->reserv,("pmap_promote_pde: page has no reservation")); + KASSERT(page_pa->reserv == reserv, + ("pmap_promote_pde: reservation mismatch")); if ((*pte & PG_V) == 0 || !COMPATIBLE_PTE(*pte, flags)) return; @@ -3306,15 +3299,10 @@ /* Invalidate old TLB entries */ pmap_invalidate_all(pmap); - /* - * XXX - * - * File system corruption occurs if pte pages belonging to the - * kernel pmap are freed. - */ - if (pmap != kernel_pmap) { + /* This leaks up to nkpt kernel pmap page table pages. XXX */ + if (pmap != kernel_pmap || tofree->wire_count == NPTEPG) { KASSERT(tofree->wire_count == NPTEPG, - ("pmap_promote: pte page wire count error")); + ("pmap_promote_pde: pte page wire count error")); tofree->wire_count = 0; vm_page_free(tofree); atomic_subtract_int(&cnt.v_wire_count, 1); @@ -3324,35 +3312,35 @@ } static boolean_t -pmap_demote(pmap_t pmap, pd_entry_t *pde0, vm_offset_t va) +pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t save_pde_value, new_pte_value ; pt_entry_t *pte_page_va, *new_pte_va; vm_paddr_t pte_page_pa; vm_page_t pte_page; - KASSERT((*pde0 & PG_PS) != 0, - ("pmap_demote: not a superpage, impossible to demote")); + KASSERT((*pde & PG_PS) != 0, + ("pmap_demote_pde: not a superpage, impossible to demote")); /* STEP 1 * Allocate the PTE page */ if ((pte_page = vm_page_alloc(NULL, pmap_pde_pindex(va), VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL | VM_ALLOC_WIRED)) == NULL) { - pmap_remove_pde(pmap, pde0, trunc_2mpage(va)); + pmap_remove_pde(pmap, pde, trunc_2mpage(va)); pmap_invalidate_all(pmap); return (FALSE); } pte_page->wire_count += NPTEPG - 1; KASSERT(pte_page->wire_count == NPTEPG, - ("pmap_demote: page table page %p has wire count %d", + ("pmap_demote_pde: page table page %p has wire count %d", pte_page, pte_page->wire_count)); if (pmap != kernel_pmap) pmap->pm_stats.resident_count++; pte_page_pa = VM_PAGE_TO_PHYS(pte_page); pte_page_va = (vm_offset_t *) PHYS_TO_DMAP(pte_page_pa); - pte_page_pa |= PG_U | PG_RW | PG_V | PG_A | PG_M; + pte_page_pa |= PG_M | PG_A | (*pde & PG_U) | PG_RW | PG_V; repeat: @@ -3360,7 +3348,7 @@ * Save the value of the pde entry * Define the value of the first pte entry */ - save_pde_value = *pde0; + save_pde_value = *pde; /* STEP 3 * Fill the PTE page with the physical address of the base pages @@ -3378,7 +3366,7 @@ * If not, assign the new pde value. * If yes, repeat the pte assignment loop. */ - if (!atomic_cmpset_long(pde0, save_pde_value, pte_page_pa)) + if (!atomic_cmpset_long(pde, save_pde_value, pte_page_pa)) goto repeat; /* From owner-p4-projects@FreeBSD.ORG Tue Apr 11 17:58:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9694216A402; Tue, 11 Apr 2006 17:58:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27BF216A400 for ; Tue, 11 Apr 2006 17:58:24 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E60A643D46 for ; Tue, 11 Apr 2006 17:58:23 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BHwMOQ049863 for ; Tue, 11 Apr 2006 17:58:23 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BHwM2B049845 for perforce@freebsd.org; Tue, 11 Apr 2006 17:58:22 GMT (envelope-from jmg@freebsd.org) Date: Tue, 11 Apr 2006 17:58:22 GMT Message-Id: <200604111758.k3BHwM2B049845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 17:58:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=95003 Change 95003 by jmg@jmg_arlene on 2006/04/11 17:57:27 move the api back to what it was originally, the assembly code was correct, missed the saving of the register earlier.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#15 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#15 (text+ko) ==== @@ -130,8 +130,8 @@ extern uint64_t hvio_iommu_demap(devhandle_t dev_hdl, tsbid_t tsbid, pages_t pages, pages_t *pages_demapped); extern uint64_t hvio_iommu_getmap(devhandle_t dev_hdl, tsbid_t tsbid, - r_addr_t *r_addr_p, - io_attributes_t *attributes_p); + io_attributes_t *attributes_p, + r_addr_t *r_addr_p); extern uint64_t hvio_iommu_getbypass(devhandle_t dev_hdl, r_addr_t ra, io_attributes_t io_attributes, io_addr_t *io_addr_p); From owner-p4-projects@FreeBSD.ORG Tue Apr 11 17:59:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34C0816A407; Tue, 11 Apr 2006 17:59:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 11E0116A402 for ; Tue, 11 Apr 2006 17:59:27 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C71B843D48 for ; Tue, 11 Apr 2006 17:59:26 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BHxQaP050548 for ; Tue, 11 Apr 2006 17:59:26 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BHxQu1050542 for perforce@freebsd.org; Tue, 11 Apr 2006 17:59:26 GMT (envelope-from jmg@freebsd.org) Date: Tue, 11 Apr 2006 17:59:26 GMT Message-Id: <200604111759.k3BHxQu1050542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 17:59:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=95005 Change 95005 by jmg@jmg_arlene on 2006/04/11 17:58:39 add in the offset, and add the offset to the length before rounding up so we get the entire mapping unmapped... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#11 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#11 (text+ko) ==== @@ -244,8 +244,8 @@ ("%s: va 0x%lx not in DVMA space", __func__, (u_long)va)); KASSERT(va + len >= va, ("%s: va 0x%lx + len 0x%lx wraps", __func__, (long)va, (long)len)); + len = round_page(len + (va & IO_PAGE_MASK)); va = trunc_io_page(va); - len = round_page(len); while (len > 0) { if ((error = hvio_iommu_demap(him->him_handle, VA_TO_TSBID(him, va), len >> IO_PAGE_SHIFT, &demapped))) { @@ -306,7 +306,7 @@ struct bus_dmamap_res *r; SLIST_FOREACH(r, &map->dm_reslist, dr_link) { - hviommu_remove(him, BDR_START(r), r->dr_used); + hviommu_remove(him, BDR_START(r) + r->dr_offset, r->dr_used); r->dr_used = 0; } } From owner-p4-projects@FreeBSD.ORG Tue Apr 11 18:48:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76E7F16A401; Tue, 11 Apr 2006 18:48:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A42116A402 for ; Tue, 11 Apr 2006 18:48:28 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8E2143D45 for ; Tue, 11 Apr 2006 18:48:27 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BImR81076304 for ; Tue, 11 Apr 2006 18:48:27 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BImRFf076301 for perforce@freebsd.org; Tue, 11 Apr 2006 18:48:27 GMT (envelope-from marcel@freebsd.org) Date: Tue, 11 Apr 2006 18:48:27 GMT Message-Id: <200604111848.k3BImRFf076301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95009 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 18:48:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=95009 Change 95009 by marcel@marcel_nfs on 2006/04/11 18:47:32 First commit of multiple to reduce the size of puc_devices: o All ports have the same RCLK. Use a single value that applies to all serial ports instead of having one per port. Non-standard cases (i.e. cards that do have different RCLK values per UART) will be handled dynamically once I'm done. This almost cuts the size in half. Affected files ... .. //depot/projects/uart/dev/puc/puc.c#20 edit .. //depot/projects/uart/dev/puc/pucdata.c#19 edit .. //depot/projects/uart/dev/puc/pucvar.h#15 edit Differences ... ==== //depot/projects/uart/dev/puc/puc.c#20 (text+ko) ==== @@ -312,7 +312,7 @@ rman_set_bushandle(rle->res, bh); } - pdev->serialfreq = sc->sc_desc.ports[i].serialfreq; + pdev->serialfreq = sc->sc_desc.serialfreq; childunit = puc_find_free_unit(typestr); sc->sc_ports[i].dev = device_add_child(dev, typestr, ==== //depot/projects/uart/dev/puc/pucdata.c#19 (text+ko) ==== @@ -45,8 +45,6 @@ #include #include -#define COM_FREQ DEFAULT_RCLK - int puc_config_win877(struct puc_softc *); const struct puc_device_description puc_devices[] = { @@ -54,133 +52,145 @@ { "Sunix SUN1889", { 0x0009, 0x7168, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, }, }, { "Diva Serial [GSP] Multiport UART", { 0x103c, 0x1048, 0x103c, 0x1282 }, { 0xffff, 0xffff, 0xffff, 0xffff }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, 0 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, 0 }, - { PUC_PORT_TYPE_COM, 0x10, 0x38, 0 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x38 }, }, }, { "Comtrol RocketPort 550/4 RJ45", { 0x11fe, 0x8014, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/Quad", { 0x11fe, 0x8015, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/8 RJ11 part A", { 0x11fe, 0x8010, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/8 RJ11 part B", { 0x11fe, 0x8011, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/8 Octa part A", { 0x11fe, 0x8012, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/8 Octa part B", { 0x11fe, 0x8013, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/8 part A", { 0x11fe, 0x8018, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/8 part B", { 0x11fe, 0x8019, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/16 part A", { 0x11fe, 0x8016, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Comtrol RocketPort 550/16 part B", { 0x11fe, 0x8017, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x20, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x28, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x30, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x38, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x40, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x48, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x50, COM_FREQ * 4 }, - { PUC_PORT_TYPE_COM, 0x10, 0x58, COM_FREQ * 4 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, + { PUC_PORT_TYPE_COM, 0x10, 0x20 }, + { PUC_PORT_TYPE_COM, 0x10, 0x28 }, + { PUC_PORT_TYPE_COM, 0x10, 0x30 }, + { PUC_PORT_TYPE_COM, 0x10, 0x38 }, + { PUC_PORT_TYPE_COM, 0x10, 0x40 }, + { PUC_PORT_TYPE_COM, 0x10, 0x48 }, + { PUC_PORT_TYPE_COM, 0x10, 0x50 }, + { PUC_PORT_TYPE_COM, 0x10, 0x58 }, }, }, @@ -198,9 +208,10 @@ { "Dolphin Peripherals 4014", { 0x10b5, 0x9050, 0xd84d, 0x6810 }, { 0xffff, 0xffff, 0xffff, 0xffff }, + 0, { - { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x24, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x24, 0x00 }, }, }, @@ -218,9 +229,10 @@ { "Dolphin Peripherals 4035", { 0x10b5, 0x9050, 0xd84d, 0x6808 }, { 0xffff, 0xffff, 0xffff, 0xffff }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, @@ -231,9 +243,10 @@ { "Dolphin Peripherals 4036", { 0x1409, 0x7168, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, }, }, @@ -261,9 +274,10 @@ { "SIIG Cyber I/O PCI 16C550 (10x family)", { 0x131f, 0x1010, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, @@ -271,9 +285,10 @@ { "SIIG Cyber I/O PCI 16C650 (10x family)", { 0x131f, 0x1011, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, @@ -281,9 +296,10 @@ { "SIIG Cyber I/O PCI 16C850 (10x family)", { 0x131f, 0x1012, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, @@ -291,8 +307,9 @@ { "SIIG Cyber Parallel PCI (10x family)", { 0x131f, 0x1020, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + 0, { - { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, }, }, @@ -300,9 +317,10 @@ { "SIIG Cyber Parallel Dual PCI (10x family)", { 0x131f, 0x1021, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + 0, { - { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, }, }, @@ -310,9 +328,10 @@ { "SIIG Cyber Serial Dual PCI 16C550 (10x family)", { 0x131f, 0x1030, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, @@ -320,9 +339,10 @@ { "SIIG Cyber Serial Dual PCI 16C650 (10x family)", { 0x131f, 0x1031, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, @@ -330,9 +350,10 @@ { "SIIG Cyber Serial Dual PCI 16C850 (10x family)", { 0x131f, 0x1032, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, @@ -340,10 +361,11 @@ { "SIIG Cyber 2S1P PCI 16C550 (10x family)", { 0x131f, 0x1034, 0, 0 }, /* XXX really? */ { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, }, }, @@ -351,10 +373,11 @@ { "SIIG Cyber 2S1P PCI 16C650 (10x family)", { 0x131f, 0x1035, 0, 0 }, /* XXX really? */ { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, }, }, @@ -362,10 +385,11 @@ { "SIIG Cyber 2S1P PCI 16C850 (10x family)", { 0x131f, 0x1036, 0, 0 }, /* XXX really? */ { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, }, }, @@ -373,11 +397,12 @@ { "SIIG Cyber 4S PCI 16C550 (10x family)", { 0x131f, 0x1050, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + { PUC_PORT_TYPE_COM, 0x20, 0x00 }, + { PUC_PORT_TYPE_COM, 0x24, 0x00 }, }, }, @@ -385,11 +410,12 @@ { "SIIG Cyber 4S PCI 16C650 (10x family)", { 0x131f, 0x1051, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + { PUC_PORT_TYPE_COM, 0x20, 0x00 }, + { PUC_PORT_TYPE_COM, 0x24, 0x00 }, }, }, @@ -397,11 +423,12 @@ { "SIIG Cyber 4S PCI 16C850 (10x family)", { 0x131f, 0x1052, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + { PUC_PORT_TYPE_COM, 0x20, 0x00 }, + { PUC_PORT_TYPE_COM, 0x24, 0x00 }, }, }, @@ -413,8 +440,9 @@ { "SIIG Cyber Parallel PCI (20x family)", { 0x131f, 0x2020, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + 0, { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, }, }, @@ -422,9 +450,10 @@ { "SIIG Cyber Parallel Dual PCI (20x family)", { 0x131f, 0x2021, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + 0, { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, }, }, @@ -432,10 +461,11 @@ { "SIIG Cyber 2P1S PCI 16C550 (20x family)", { 0x131f, 0x2040, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, @@ -443,10 +473,11 @@ { "SIIG Cyber 2P1S PCI 16C650 (20x family)", { 0x131f, 0x2041, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, @@ -454,10 +485,11 @@ { "SIIG Cyber 2P1S PCI 16C850 (20x family)", { 0x131f, 0x2042, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, @@ -465,9 +497,10 @@ { "SIIG Cyber I/O PCI 16C550 (20x family)", { 0x131f, 0x2010, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, }, }, @@ -475,9 +508,10 @@ { "SIIG Cyber I/O PCI 16C650 (20x family)", { 0x131f, 0x2011, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, }, }, @@ -485,9 +519,10 @@ { "SIIG Cyber I/O PCI 16C850 (20x family)", { 0x131f, 0x2012, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, }, }, @@ -495,9 +530,10 @@ { "SIIG Cyber Serial Dual PCI 16C550 (20x family)", { 0x131f, 0x2030, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, @@ -505,9 +541,10 @@ { "SIIG Cyber Serial Dual PCI 16C650 (20x family)", { 0x131f, 0x2031, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, @@ -515,9 +552,10 @@ { "SIIG Cyber Serial Dual PCI 16C850 (20x family)", { 0x131f, 0x2032, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, @@ -525,10 +563,11 @@ { "SIIG Cyber 2S1P PCI 16C550 (20x family)", { 0x131f, 0x2060, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, }, }, @@ -536,10 +575,11 @@ { "SIIG Cyber 2S1P PCI 16C650 (20x family)", { 0x131f, 0x2061, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, }, }, @@ -547,10 +587,11 @@ { "SIIG Cyber 2S1P PCI 16C850 (20x family)", { 0x131f, 0x2062, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, }, }, @@ -558,11 +599,12 @@ { "SIIG Cyber 4S PCI 16C550 (20x family)", { 0x131f, 0x2050, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, @@ -570,11 +612,12 @@ { "SIIG Cyber 4S PCI 16C650 (20x family)", { 0x131f, 0x2051, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, @@ -582,11 +625,12 @@ { "SIIG Cyber 4S PCI 16C850 (20x family)", { 0x131f, 0x2052, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, @@ -594,9 +638,10 @@ { "VScom PCI-200L", { 0x14d2, 0x8020, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, }, }, @@ -604,11 +649,12 @@ { "VScom PCI-400", { 0x10b5, 0x1077, 0x10b5, 0x1077 }, { 0xffff, 0xffff, 0xffff, 0xffff }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, }, }, @@ -616,15 +662,16 @@ { "VScom PCI-800", { 0x10b5, 0x1076, 0x10b5, 0x1076 }, { 0xffff, 0xffff, 0xffff, 0xffff }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x20, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x28, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x30, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x38, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, + { PUC_PORT_TYPE_COM, 0x18, 0x20 }, + { PUC_PORT_TYPE_COM, 0x18, 0x28 }, + { PUC_PORT_TYPE_COM, 0x18, 0x30 }, + { PUC_PORT_TYPE_COM, 0x18, 0x38 }, }, }, /* @@ -635,38 +682,42 @@ { "Titan PCI-800H", { 0x14d2, 0xa003, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Titan PCI-800H", { 0x14d2, 0xa004, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, { "Titan PCI-200H", { 0x14d2, 0xa005, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, }, }, { "Titan VScom PCI-200HV2", /* 2S */ { 0x14d2, 0xe020, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, /* @@ -681,15 +732,16 @@ { "Titan VScom PCI-800L", { 0x14d2, 0x8080, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x20, 0x08, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x20, 0x10, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x20, 0x18, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x20, 0x20, COM_FREQ * 8 }, - { PUC_PORT_TYPE_COM, 0x20, 0x28, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x20, 0x00 }, + { PUC_PORT_TYPE_COM, 0x20, 0x08 }, + { PUC_PORT_TYPE_COM, 0x20, 0x10 }, + { PUC_PORT_TYPE_COM, 0x20, 0x18 }, + { PUC_PORT_TYPE_COM, 0x20, 0x20 }, + { PUC_PORT_TYPE_COM, 0x20, 0x28 }, }, }, @@ -697,8 +749,9 @@ { "Lava Computers 2SP-PCI parallel port", { 0x1407, 0x8000, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + 0, { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, }, }, @@ -706,9 +759,10 @@ { "Lava Computers dual serial port", { 0x1407, 0x0100, 0, 0 }, { 0xffff, 0xfffc, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, @@ -716,9 +770,10 @@ { "Lava Computers Quattro-PCI serial port", { 0x1407, 0x0120, 0, 0 }, { 0xffff, 0xfffc, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, @@ -726,11 +781,12 @@ { "Lava Computers Octopus-550 8-port serial", { 0x1407, 0x0180, 0, 0 }, { 0xffff, 0xfffc, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, @@ -748,8 +804,9 @@ { "Oxford Semiconductor OX12PCI840 Parallel port", { 0x1415, 0x8403, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + 0, { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, }, }, @@ -757,11 +814,12 @@ { "Oxford Semiconductor OX16PCI954 UARTs", { 0x1415, 0x9501, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, @@ -769,11 +827,12 @@ { "Oxford Semiconductor OX16PCI954 UARTs", { 0x1415, 0x950a, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, @@ -784,11 +843,12 @@ { "Oxford Semiconductor OX9160/OX16PCI954 UARTs (function 1)", { 0x1415, 0x9511, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, @@ -796,8 +856,9 @@ { "Oxford Semiconductor OX16PCI954 Parallel port", { 0x1415, 0x9513, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + 0, { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, }, }, @@ -805,10 +866,11 @@ { "NetMos NM9835 Dual UART and 1284 Printer port", { 0x9710, 0x9835, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, + DEFAULT_RCLK, { - { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, }, }, @@ -816,11 +878,12 @@ { "NetMos NM9845 Quad UART", { 0x9710, 0x9845, 0, 0 }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 11 19:42:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ABFF16A405; Tue, 11 Apr 2006 19:42:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12CE816A401 for ; Tue, 11 Apr 2006 19:42:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4F9D43D49 for ; Tue, 11 Apr 2006 19:42:32 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BJgWg4008774 for ; Tue, 11 Apr 2006 19:42:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BJgWuP008765 for perforce@freebsd.org; Tue, 11 Apr 2006 19:42:32 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 19:42:32 GMT Message-Id: <200604111942.k3BJgWuP008765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 19:42:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=95015 Change 95015 by imp@imp_hammer on 2006/04/11 19:41:31 Better parameters Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#11 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ register unsigned value; int i; - volatile unsigned short *p = (unsigned short *)SDRAM_BASE; + volatile sdram_size_t *p = (sdram_size_t *)SDRAM_BASE; AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC10; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC10; @@ -105,16 +105,16 @@ AT91C_BASE_EBI->EBI_CSA = value; AT91C_BASE_SDRC->SDRC_CR = - AT91C_SDRC_NC_9 | - AT91C_SDRC_NR_13 | - AT91C_SDRC_NB_4_BANKS | - AT91C_SDRC_CAS_2 | - ((2 << 7) & AT91C_SDRC_TWR) | - ((5 << 11) & AT91C_SDRC_TRC) | - ((2 << 15) & AT91C_SDRC_TRP) | - ((2 << 19) & AT91C_SDRC_TRCD) | - ((4 << 23) & AT91C_SDRC_TRAS) | - ((6 << 27) & AT91C_SDRC_TXSR); + AT91C_SDRC_NC_9 | + AT91C_SDRC_NR_13 | + AT91C_SDRC_NB_4_BANKS | + AT91C_SDRC_CAS_2 | + ((2 << 7) & AT91C_SDRC_TWR) | + ((5 << 11) & AT91C_SDRC_TRC) | + ((2 << 15) & AT91C_SDRC_TRP) | + ((2 << 19) & AT91C_SDRC_TRCD) | + ((4 << 23) & AT91C_SDRC_TRAS) | + ((6 << 27) & AT91C_SDRC_TXSR); AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_PRCGALL_CMD; ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#5 (text+ko) ==== @@ -33,16 +33,18 @@ /* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */ #define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */ #define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +typedef unsigned short sdram_size_t; +#define OSC_MAIN_MULT 90 #endif #ifdef BOOT0_TSC -/* The following divisor sets PLLA frequency: e.g. 16/8 * 90 = 180MHz */ -#define OSC_MAIN_FREQ_DIV 8 /* for 16MHz osc */ +/* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */ +#define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */ #define SDRAM_WIDTH AT91C_SDRC_DBW_32_BITS +typedef unsigned int sdram_size_t; +#define OSC_MAIN_MULT 45 #endif -#define OSC_MAIN_MULT 90 /* Constant for both */ - /* Master clock frequency at power-up */ #define AT91C_MASTER_CLOCK 60000000 From owner-p4-projects@FreeBSD.ORG Tue Apr 11 19:45:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E34E16A403; Tue, 11 Apr 2006 19:45:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DDD216A402 for ; Tue, 11 Apr 2006 19:45:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB80043D49 for ; Tue, 11 Apr 2006 19:45:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BJjaKm009478 for ; Tue, 11 Apr 2006 19:45:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BJja8a009475 for perforce@freebsd.org; Tue, 11 Apr 2006 19:45:36 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Apr 2006 19:45:36 GMT Message-Id: <200604111945.k3BJja8a009475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 19:45:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=95016 Change 95016 by imp@imp_hammer on 2006/04/11 19:45:23 Kinky magic numbers, while kinky are somewhat unuseful. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ main(void) { #if 0 - char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ + char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ fn_t *fn = (fn_t *)addr; // AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC10; @@ -40,7 +40,7 @@ // AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; fn(); #else - int *addr = (int *)0x20000000; /* Load to base + 1MB */ + int *addr = (int *)SDRAM_BASE; /* Load to base + 1MB */ int i; while (1) { From owner-p4-projects@FreeBSD.ORG Tue Apr 11 21:49:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90B8D16A404; Tue, 11 Apr 2006 21:49:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52C1A16A402 for ; Tue, 11 Apr 2006 21:49:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCF3A43D68 for ; Tue, 11 Apr 2006 21:49:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BLnBQI083747 for ; Tue, 11 Apr 2006 21:49:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BLnBDX083744 for perforce@freebsd.org; Tue, 11 Apr 2006 21:49:11 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 11 Apr 2006 21:49:11 GMT Message-Id: <200604112149.k3BLnBDX083744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 95028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 21:49:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=95028 Change 95028 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/11 21:48:48 %o2 is moved into %o4 so the 32-bit quantity should be the *3rd* argument Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#16 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#16 (text+ko) ==== @@ -130,8 +130,7 @@ extern uint64_t hvio_iommu_demap(devhandle_t dev_hdl, tsbid_t tsbid, pages_t pages, pages_t *pages_demapped); extern uint64_t hvio_iommu_getmap(devhandle_t dev_hdl, tsbid_t tsbid, - io_attributes_t *attributes_p, - r_addr_t *r_addr_p); + io_attributes_t *attributes_p, r_addr_t *r_addr_p); extern uint64_t hvio_iommu_getbypass(devhandle_t dev_hdl, r_addr_t ra, io_attributes_t io_attributes, io_addr_t *io_addr_p); From owner-p4-projects@FreeBSD.ORG Tue Apr 11 22:15:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 358AA16A406; Tue, 11 Apr 2006 22:15:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1264416A404 for ; Tue, 11 Apr 2006 22:15:45 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D35F243D45 for ; Tue, 11 Apr 2006 22:15:44 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BMFiR3000985 for ; Tue, 11 Apr 2006 22:15:44 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BMFiIh000979 for perforce@freebsd.org; Tue, 11 Apr 2006 22:15:44 GMT (envelope-from jmg@freebsd.org) Date: Tue, 11 Apr 2006 22:15:44 GMT Message-Id: <200604112215.k3BMFiIh000979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 22:15:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=95032 Change 95032 by jmg@jmg_arlene on 2006/04/11 22:15:38 remove the entire mapping, not just part of it... and assert that va and len are page aligned... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#12 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#12 (text+ko) ==== @@ -233,7 +233,6 @@ return him; } -/* XXX - vm_size_t better be signed */ static void hviommu_remove(struct hviommu *him, vm_offset_t va, vm_size_t len) { @@ -244,8 +243,8 @@ ("%s: va 0x%lx not in DVMA space", __func__, (u_long)va)); KASSERT(va + len >= va, ("%s: va 0x%lx + len 0x%lx wraps", __func__, (long)va, (long)len)); - len = round_page(len + (va & IO_PAGE_MASK)); - va = trunc_io_page(va); + KASSERT((va & IO_PAGE_MASK) == 0 && (len & IO_PAGE_MASK) == 0, + ("%s: va %#lx or len %#lx not page aligned", __func__, va, len)); while (len > 0) { if ((error = hvio_iommu_demap(him->him_handle, VA_TO_TSBID(him, va), len >> IO_PAGE_SHIFT, &demapped))) { @@ -306,7 +305,7 @@ struct bus_dmamap_res *r; SLIST_FOREACH(r, &map->dm_reslist, dr_link) { - hviommu_remove(him, BDR_START(r) + r->dr_offset, r->dr_used); + hviommu_remove(him, BDR_START(r), BDR_SIZE(r)); r->dr_used = 0; } } From owner-p4-projects@FreeBSD.ORG Tue Apr 11 22:53:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F78316A403; Tue, 11 Apr 2006 22:53:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD02816A400 for ; Tue, 11 Apr 2006 22:53:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9523D43D46 for ; Tue, 11 Apr 2006 22:53:31 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BMrVBc020073 for ; Tue, 11 Apr 2006 22:53:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BMrVf7020067 for perforce@freebsd.org; Tue, 11 Apr 2006 22:53:31 GMT (envelope-from jb@freebsd.org) Date: Tue, 11 Apr 2006 22:53:31 GMT Message-Id: <200604112253.k3BMrVf7020067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95035 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 22:53:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=95035 Change 95035 by jb@jb_freebsd2 on 2006/04/11 22:53:09 sgsmsg is a prebuild-tool (in FreeBSD terms) which is required to generate message header files that OpenSolaris code references. SGS stands for 'Software Generation System' in Sun lingo. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 11 22:59:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE5F516A404; Tue, 11 Apr 2006 22:59:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE59C16A402 for ; Tue, 11 Apr 2006 22:59:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66E4843D45 for ; Tue, 11 Apr 2006 22:59:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BMxdM5024722 for ; Tue, 11 Apr 2006 22:59:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BMxdba024719 for perforce@freebsd.org; Tue, 11 Apr 2006 22:59:39 GMT (envelope-from jb@freebsd.org) Date: Tue, 11 Apr 2006 22:59:39 GMT Message-Id: <200604112259.k3BMxdba024719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 22:59:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=95036 Change 95036 by jb@jb_freebsd2 on 2006/04/11 22:58:46 It's actually a bootstrap-tool. We only have prebuild-libs. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#2 (text+ko) ==== @@ -2,6 +2,7 @@ .include "../../Makefile.inc" +# This program is required as a bootstrap tool for 'make buildworld' PROG= sgsmsg SRCS= avl.c sgsmsg.c string_table.c findprime.c From owner-p4-projects@FreeBSD.ORG Tue Apr 11 23:19:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A910916A403; Tue, 11 Apr 2006 23:19:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C2E016A401 for ; Tue, 11 Apr 2006 23:19:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24AFD43D46 for ; Tue, 11 Apr 2006 23:19:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BNJ3ib036347 for ; Tue, 11 Apr 2006 23:19:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BNJ2QV036339 for perforce@freebsd.org; Tue, 11 Apr 2006 23:19:02 GMT (envelope-from jb@freebsd.org) Date: Tue, 11 Apr 2006 23:19:02 GMT Message-Id: <200604112319.k3BNJ2QV036339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2006 23:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=95037 Change 95037 by jb@jb_freebsd2 on 2006/04/11 23:18:50 Defines the paths to the userland- and kernel- OpenSolaris sources relative to the child lib, usr.bin or usr.sbin directories. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile.inc#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 02:55:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69F5516A407; Wed, 12 Apr 2006 02:55:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 444B616A404 for ; Wed, 12 Apr 2006 02:55:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82FC243D55 for ; Wed, 12 Apr 2006 02:55:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C2tOFv060387 for ; Wed, 12 Apr 2006 02:55:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C2tO09060384 for perforce@freebsd.org; Wed, 12 Apr 2006 02:55:24 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 02:55:24 GMT Message-Id: <200604120255.k3C2tO09060384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 02:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=95041 Change 95041 by jb@jb_freebsd2 on 2006/04/12 02:55:22 Change the location of the header files which translate the FreeBSD definitions into OpenSolaris ones. It's better to put these in the /usr/src/contrib/opensolaris tree so that they aren't present on a FreeBSD system unless the OpenSolaris code is being used. Then a compiler commands can use: -I${.CURDIR}/../(..)/contrib and the customised OpenSolaris source can use things like: #include "opensolaris/compat/sys/types.h" to get things defined like OpenSolaris would (such as uint_t instead of FreeBSD's u_int_t). Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#3 (text+ko) ==== @@ -11,12 +11,13 @@ CFLAGS+= -I${.CURDIR}/../../.. \ + -I${.CURDIR}/../../../contrib \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/common .if ${MACHINE_ARCH} == "i386" -CFLAGS+=-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel +CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel .endif .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common From owner-p4-projects@FreeBSD.ORG Wed Apr 12 07:45:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CC7D16A404; Wed, 12 Apr 2006 07:45:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F00416A401 for ; Wed, 12 Apr 2006 07:45:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A0D843D45 for ; Wed, 12 Apr 2006 07:45:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C7ji0Q028207 for ; Wed, 12 Apr 2006 07:45:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C7jipR028204 for perforce@freebsd.org; Wed, 12 Apr 2006 07:45:44 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 07:45:44 GMT Message-Id: <200604120745.k3C7jipR028204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 07:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=95056 Change 95056 by jb@jb_freebsd2 on 2006/04/12 07:45:36 Add sgsmsg as a bootstrap-tool iff !NO_CDDL and !NO_DTRACE. NO_CDDL is intended to allow buildworld without and CDDL code. NO_DTRACE is intended to stop buildworld from building files with CTF (C Type Format) data which is half way between a stripped binary and one with debug symbols. The CTF data is needed by DTrace. Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#3 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#3 (text+ko) ==== @@ -825,8 +825,13 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif +.if !defined(NO_CDDL) && !defined(NO_DTRACE) +_sgsmsg= cddl/usr.bin/sgsmsg +.endif + bootstrap-tools: .for _tool in \ + ${_sgsmsg} \ ${_strfile} \ ${_gperf} \ ${_groff} \ @@ -870,6 +875,10 @@ _rescue= rescue/rescue .endif +.if !defined(NO_CDDL) && !defined(NO_DTRACE) +_dtrace_tools= cddl/usr.bin +.endif + build-tools: .for _tool in \ bin/csh \ @@ -888,6 +897,7 @@ .endfor .for _tool in \ gnu/usr.bin/cc/cc_tools \ + ${_dtrace_tools} \ ${_kerberos5_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \ cd ${.CURDIR}/${_tool}; \ @@ -1011,6 +1021,10 @@ _prebuild_libs+= lib/libypclnt .endif +.if !defined(NO_CDDL) && !defined(NO_DTRACE) +_prebuild_libs+= cddl/lib +.endif + _generic_libs+= usr.bin/lex/lib .if ${MACHINE} == "i386" From owner-p4-projects@FreeBSD.ORG Wed Apr 12 07:46:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECDDB16A408; Wed, 12 Apr 2006 07:46:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B49DF16A405 for ; Wed, 12 Apr 2006 07:46:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 344F543D69 for ; Wed, 12 Apr 2006 07:46:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C7kk8Q028244 for ; Wed, 12 Apr 2006 07:46:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C7kk5h028241 for perforce@freebsd.org; Wed, 12 Apr 2006 07:46:46 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 07:46:46 GMT Message-Id: <200604120746.k3C7kk5h028241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 07:46:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=95057 Change 95057 by jb@jb_freebsd2 on 2006/04/12 07:46:36 Temporary subdir list. Work in progress. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile#4 (text+ko) ==== @@ -3,7 +3,8 @@ SUBDIR= .if !defined(NO_CDDL) -SUBDIR+= lib usr.bin usr.sbin +SUBDIR+= lib usr.bin +#SUBDIR+= lib usr.bin usr.sbin .endif .include From owner-p4-projects@FreeBSD.ORG Wed Apr 12 07:53:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22DB016A406; Wed, 12 Apr 2006 07:53:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1DA516A404 for ; Wed, 12 Apr 2006 07:53:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7651943D48 for ; Wed, 12 Apr 2006 07:53:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C7rQDe030599 for ; Wed, 12 Apr 2006 07:53:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C7rLPM030528 for perforce@freebsd.org; Wed, 12 Apr 2006 07:53:21 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 07:53:21 GMT Message-Id: <200604120753.k3C7rLPM030528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 07:53:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=95059 Change 95059 by jb@jb_freebsd2 on 2006/04/12 07:52:20 Integrate latest -current. Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/mk/doc.local.mk#2 integrate .. //depot/projects/dtrace/src/bin/sh/eval.c#2 integrate .. //depot/projects/dtrace/src/bin/sh/exec.c#2 integrate .. //depot/projects/dtrace/src/bin/sh/exec.h#2 integrate .. //depot/projects/dtrace/src/bin/sh/options.c#2 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/dtrace/src/etc/gettytab#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/amd#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/sshd#2 integrate .. //depot/projects/dtrace/src/etc/rc.subr#2 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/vis.3#2 integrate .. //depot/projects/dtrace/src/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/dtrace/src/lib/libutil/pidfile.c#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/dtrace/src/rescue/rescue/Makefile#2 integrate .. //depot/projects/dtrace/src/sbin/dump/traverse.c#2 integrate .. //depot/projects/dtrace/src/secure/lib/libcrypto/Makefile#2 integrate .. //depot/projects/dtrace/src/share/examples/scsi_target/scsi_cmds.c#2 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#2 integrate .. //depot/projects/dtrace/src/share/man/man4/bce.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_asus.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/miibus.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/syncache.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/uscanner.4#2 integrate .. //depot/projects/dtrace/src/share/man/man9/crypto.9#2 integrate .. //depot/projects/dtrace/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/dtrace/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/dtrace/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/dtrace/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/boot/pc98/libpc98/gatea20.c#2 delete .. //depot/projects/dtrace/src/sys/conf/files#2 integrate .. //depot/projects/dtrace/src/sys/conf/options#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/dtrace/src/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/geom.h#2 integrate .. //depot/projects/dtrace/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_proto.c#2 integrate .. //depot/projects/dtrace/src/sys/modules/bce/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/frag6.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/dtrace/src/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/dtrace/src/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/dtrace/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/dtrace/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/dtrace/src/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/dtrace/src/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/dtrace/src/sys/posix4/ksched.c#2 integrate .. //depot/projects/dtrace/src/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.h#2 integrate .. //depot/projects/dtrace/src/tools/regression/bin/sh/builtins/var-assign.0#1 branch .. //depot/projects/dtrace/src/tools/regression/geom_gpt/gctl.t#2 integrate .. //depot/projects/dtrace/src/tools/regression/geom_gpt/test.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/sockets/rtsocket/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/rtsocket/rtsocket.c#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_socket/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_socket/unix_socket.c#1 branch .. //depot/projects/dtrace/src/usr.bin/truncate/truncate.1#2 integrate .. //depot/projects/dtrace/src/usr.bin/truncate/truncate.c#2 integrate .. //depot/projects/dtrace/www/de/docs/books.sgml#2 integrate .. //depot/projects/dtrace/www/de/news/news.xml#2 integrate .. //depot/projects/dtrace/www/de/news/press.xml#2 integrate .. //depot/projects/dtrace/www/de/platforms/amd64.sgml#2 integrate .. //depot/projects/dtrace/www/de/platforms/arm.sgml#2 integrate .. //depot/projects/dtrace/www/de/platforms/i386.sgml#2 integrate .. //depot/projects/dtrace/www/en/events/events.xml#2 integrate .. //depot/projects/dtrace/www/en/news/news.xml#2 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/Makefile#2 integrate .. //depot/projects/dtrace/www/en/projects/projects.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode-2005.sgml#1 branch .. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#2 integrate .. //depot/projects/dtrace/www/en/snapshots/index.sgml#2 integrate Differences ... ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.63 2006/04/06 16:44:06 jkois Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.578 2006/03/25 09:46:32 jkois Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.64 2006/04/10 18:42:41 jkois Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.579 2006/04/09 13:01:44 jkois Exp $ - basiert auf: 1.778 + basiert auf: 1.779 --> @@ -33,7 +33,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.578 2006/03/25 09:46:32 jkois Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.579 2006/04/09 13:01:44 jkois Exp $ 1995 @@ -1150,11 +1150,7 @@ DALNET ist in den USA unter irc.dal.net sowie in Europa unter irc.eu.dal.net - verfügbar. Die Betreiber des Channels bieten - auch eine Internetseite mit nützlichen - Informationen zum Channel sowie zu &os;, die unter - - erreichbar ist. + verfügbar. ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.18 2006/02/18 14:54:27 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.42 2006/02/18 09:58:04 jkois Exp $ - basiert auf: 1.111 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.19 2006/04/10 18:42:42 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.45 2006/04/10 18:27:16 jkois Exp $ + basiert auf: 1.113 --> @@ -258,8 +258,8 @@ Ein voller Satz von C, - C++, Fortran und - Perl Entwicklungswerkzeugen. Viele + C++ und Fortran- + Entwicklungswerkzeugen. Viele zusätzliche Programmiersprachen für Wissenschaft und Entwicklung sind aus der Ports- und Packages-Sammlung zu haben. @@ -812,8 +812,7 @@ hervorging, erfolgte am 13. März 2000. Bisher gab es mehrere Veröffentlichungen aus diesem Zweig: 4.0-RELEASE erschien im März 2000. - Das letzte &rel2.current;-RELEASE erschien im - &rel2.current.date;. + Das letzte Release, 4.11-RELEASE, erschien im Januar 2005. Das lang erwartete 5.0-RELEASE wurde am 19. Januar 2003 veröffentlicht. Nach nahezu @@ -829,15 +828,21 @@ Der Zweig RELENG_5 wurde im August 2004 erzeugt. Das erste Release dieses Zweiges ist 5.3-RELEASE. Dabei handelt es sich auch um das erste 5-STABLE-Release. Das aktuelle - &rel.current;-RELEASE (dem weitere RELENG_5-Versionen folgen - werden) erschien im &rel.current.date;. + &rel2.current;-RELEASE (dem weitere RELENG_5-Versionen folgen + werden) erschien im &rel2.current.date;. + + Der Zweig RELENG_6 wurde im Juli 2005 erzeugt. 6.0-RELEASE, + das erste Release des 6.X-Zweiges, wurde im November 2005 + veröffentlicht. Das aktuelle &rel.current;-RELEASE (dem + weitere RELENG_6-Versionen folgen werden) erschien im + &rel.current.date;. Zurzeit werden Projekte mit langem Entwicklungshorizont - im Zweig 6.0-CURRENT verfolgt und Schnappschüsse - von 6.0 auf CD-ROM (und natürlich im Netz) werden bei + im Zweig 7.X-CURRENT verfolgt, Schnappschüsse + von 7.X auf CD-ROM (und natürlich im Netz) werden bei fortlaufender Entwicklung auf dem - Snapshot-Server zur Verfügung gestellt. + url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/"> + Snapshot-Server zur Verfügung gestellt. ==== //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.42 2006/03/13 21:13:27 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.111 2006/03/03 19:24:33 jkois Exp $ - basiert auf: 1.411 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.43 2006/04/10 18:42:42 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.112 2006/04/09 13:14:30 jkois Exp $ + basiert auf: 1.412 --> @@ -2618,6 +2618,16 @@ + + RELENG_6_1 + + + Der Zweig, auf dem sicherheitsrelevante oder kritische + Fehlerbehebungen für FreeBSD 6.1 + durchgeführt werden. + + + RELENG_6_0 ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -196,7 +196,7 @@ A full complement of C, - C++, Fortran + C++, and Fortran development tools. Many additional languages for advanced research and development are also available in the ports and packages @@ -618,7 +618,7 @@ There will be additional releases from the RELENG_5 branch. Tree was branched in July 2005, for RELENG_6. 6.0-RELEASE, the - first release of the 6.x branch was released in November 2005. The + first release of the 6.X branch was released in November 2005. The most recent &rel.current;-RELEASE came out in &rel.current.date;. There will be additional releases from the RELENG_6 branch. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -129,7 +129,7 @@ 7 1 0xc24db000 d000 linux.ko kernel options - LINUX + COMPAT_LINUX If for some reason you do not want to or cannot load the KLD, ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2557,6 +2557,15 @@ + RELENG_6_1 + + + The release branch for FreeBSD-6.1, used only for + security advisories and other critical fixes. + + + + RELENG_6_0 ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.14 2005/10/16 06:21:25 hrs Exp $ - Original revision: 1.110 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.15 2006/04/11 20:14:45 blackend Exp $ + Original revision: 1.114 --> @@ -226,8 +226,8 @@ Des outils complets de développement - C, C++, - Fortran, et Perl. De + C, C++, et + Fortran. De nombreux autres langages pour la recherche de pointe et le développement sont aussi disponibles dans les catalogues des logiciels portés et pré-compilés. @@ -671,8 +671,8 @@ la branche 4.X-STABLE. Il y a eu plusieurs versions jusqu'ici: la 4.0-RELEASE est sortie en Mars 2000, et la - dernière version, la &rel2.current;-RELEASE est sortie - en &rel2.current.date;. + dernière version, la 4.11-RELEASE est sortie + en Janvier 2005. La tant attendue 5.0-RELEASE a été annoncée le 19 Janvier 2003. Etant le point @@ -688,12 +688,20 @@ La branche RELENG_5 créée en Août 2004, suivie par la 5.3-RELEASE, marque le début de la branche 5-STABLE. La version la plus récente, la - 5.4-RELEASE, est sortie en Mai 2005. D'autres versions de la + &rel2.current;-RELEASE, est sortie en &rel2.current.date;. D'autres versions de la branche RELENG_5 sont prévues. + La branche RELENG_6 a été + créée en Juillet 2005. La version 6.0-RELEASE, + la première version issue de la branche 6.X a + été rendue publique en Novembre 2005. La + version la plus récente, la &rel.current;-RELEASE, est + sortie en &rel.current.date;. De nouvelles versions sont + prévues pour la branche RELENG_6. + Pour le moment, les projets de développement à long terme continuent - à se faire dans la branche (tronc) 6.X-CURRENT, et des - “instantanées” de la 6.X sur CDROM (et, bien + à se faire dans la branche (tronc) 7.X-CURRENT, et des + “instantanées” de la 7.X sur CDROM (et, bien sûr, sur le net) sont continuellement misent à disposition sur le serveur @@ -801,12 +809,12 @@ L'arborescence centrale des sources de FreeBSD est gérée sous CVS + url="http://ximbiot.com/cvs/wiki/">CVS (Concurrent Version System), un système librement disponible de gestion de version des sources qui est livré avec FreeBSD. Les archives - CVS d'origine sont sur une machine à Santa Clara + CVS principales sont sur une machine à Santa Clara CA, USA, d'où elles sont répliquées sur de nombreuses machines miroir à travers le monde. L'arborescence CVS qui contient les branches @@ -1247,9 +1247,7 @@ actuelle, le “toolkit” Qt le supporte, donc l'intégralité de l'environnement KDE peut utiliser des polices - anticrénelées (voir la sur - KDE pour plus de détails). + anticrénelées. GTK+ et GNOME peuvent également faire usage de l'anticrénelage via le système Font (voir la KDE utiles - KDE dispose d'une suite - bureautique basée sur la technologie “KParts” - comprenant un tableur, un logiciel de présentation, un - organiseur, un client pour forums de discussions et plus. - KDE est fourni également avec un + KDE est fourni avec un navigateur web appelé Konqueror, qui représente un solide concurrent aux autres navigateurs web sous &unix;. Plus d'information sur @@ -1863,132 +1857,12 @@ GNOME, ou quelque chose d'autre) exécuter après l'ouverture de session. - Pour commencer, exécutez le panneau de - contrôle de KDE, - kcontrol, en tant que - root. Il est généralement - considéré comme imprudent d'exécuter - l'intégralité de l'environnement X avec les - privilèges de root. A la place, - exécutez - le gestionnaire de fenêtres en tant qu'utilisateur ordinaire, - ouvrez une fenêtre de terminal (comme - xterm ou konsole de - KDE), devenez root - avec su (l'utilisateur doit être dans - le groupe wheel dans le fichier - /etc/group pour cela), puis ensuite - tapez kcontrol. + Pour activer kdm, la ligne + ttyv8 du fichier + /etc/ttys doit être + modifiée. La ligne doit ressembler à: - Cliquez sur l'icone sur la gauche marquée - System, puis sur Login - manager. Sur la droite il y a diverses options - configurables, que le manuel de KDE - expliquera plus en détail. Cliquez sur - sessions sur la droite. Cliquez - New type pour ajouter divers - gestionnaires de fenêtres et environnements de travail. Ce - sont juste des étiquettes, donc il peuvent afficher - KDE et GNOME - plutôt que startkde ou - gnome-session. Ajoutez une - étiquette failsafe. - - Essayez les autres menus également, ils sont - principalement cosmétique et explicites. Quand vous - avez terminé, cliquez sur Apply en bas, - et quittez le centre de contrôle. - - Pour être sûr que - kdm comprenne ce que les - étiquettes (KDE, - GNOME etc...) signifient, éditez - les fichiers utilisés par XDM. - Dans KDE 2.2 ceci a - été modifié: kdm - utilise désormais ses propres fichiers de configuration. - Veuillez consulter la documentation de KDE - 2.2 pour plus de détails. - - Dans une fenêtre de terminal, en tant que - root, éditez le fichier - /usr/X11R6/lib/X11/xdm/Xsession. Il y a - une section au milieu comme celle-ci: - -case $# in -1) - case $1 in - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - esac -esac - Quelques lignes doivent être ajoutées - à cette section. En supposant que les étiquettes - utilisées étaient “KDE” et - “GNOME“, utilisez ce qui suit: -case $# in -1) - case $1 in - kde) - exec /usr/local/bin/startkde - ;; - GNOME) - exec /usr/X11R6/bin/gnome-session - ;; - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - esac -esac - - Pour avoir le fond d'écran de l'environnement - KDE durant la procédure - de connexion, la ligne suivante doit être - ajoutée au fichier - /usr/X11R6/lib/X11/xdm/Xsetup_0: - - /usr/local/bin/krootimage - - Maintenant, vérifiez que kdm - est listé dans /etc/ttys pour - être exécuté au prochain - démarrage. Pour cela, suivez simplement les instructions - de la section précedente sur - XDM et remplacez les - références au programme - /usr/X11R6/bin/xdm par - /usr/local/bin/kdm. - - - - Polices de caractères anticrénelage - - KDE - polices de caractères - anticrénelage - X11 supporte - l'anticrénelage par l'intermédiaire de son extension - “RENDER”, et introduit avec la version 2.3, Qt - (le “toolkit” utilisé par - KDE) supporte cette extension. La - configuration de ceci est décrite dans la sur les polices X11 anticrénelage. - Donc avec des logiciels à jour, l'anticrénelage est - possible sous un environnement KDE. - Rendez vous dans le menu de KDE2, aller dans - - Preferences - Look and Feel - Fonts - , et cliquez sur la boîte - à cocher - Use Anti-Aliasing for Fonts and Icons. - Pour une application Qt qui ne fait pas partie de - KDE, la variable d'environnement - QT_XFT doit être fixée à la - valeur true avant de lancer le programme. - + ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure ==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#2 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.372 2006/04/02 07:46:02 hrs Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.373 2006/04/10 20:03:54 brueffer Exp $ --> @@ -3240,6 +3240,7 @@ + ==== //depot/projects/dtrace/doc/zh_CN.GB2312/share/mk/doc.local.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/zh_CN.GB2312/share/mk/doc.local.mk,v 1.4 2006/04/07 14:47:52 hrs Exp $ +# $FreeBSD: doc/zh_CN.GB2312/share/mk/doc.local.mk,v 1.5 2006/04/10 14:56:37 delphij Exp $ # Original Revision: 1.1 SP_ENCODING?= ${LANGCODE:C,^.*\.,,} @@ -10,7 +10,7 @@ CJKTEXSTY_PDFTEX_FLAGS?= -c -e ${SP_ENCODING} -f song # Don't use "?=" in the following two lines. -# They have been pre-defined in "doc.project.mk". +# They have been pre-defined in "doc.project.mk" and should be overridden here. # XXX: broken as of RELEASE_6_1_0 #HTML2TXT= ${PREFIX}/bin/html2text #HTML2TXTOPTS= -nobs -style pretty @@ -30,7 +30,7 @@ # Then, PMake expands variables just when they are ACTUALLY USED. PDFJADETEX_PREPROCESS= ${CJKTEXSTY} ${CJKTEXSTY_PDFTEX_FLAGS} -JADETEX_PREPROCESS= ${CJKTEXSTY} ${CJKTEXSTY_PDFTEX_FLAGS} +JADETEX_PREPROCESS= ${CJKTEXSTY} ${CJKTEXSTY_TEX_FLAGS} # For Chinese-specific switch "output.for.print". print.index: ${SRCS} ${LOCAL_IMAGES_TXT} ==== //depot/projects/dtrace/src/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.50 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.51 2006/04/09 12:20:42 stefanf Exp $"); #include #include @@ -658,8 +658,10 @@ /* Now locate the command. */ if (argc == 0) { + /* Variable assignment(s) without command */ cmdentry.cmdtype = CMDBUILTIN; cmdentry.u.index = BLTINCMD; + cmdentry.special = 1; } else { static const char PATH[] = "PATH="; char *path = pathval(); @@ -705,7 +707,8 @@ argv++; if (--argc == 0) break; - if ((cmdentry.u.index = find_builtin(*argv)) < 0) { + if ((cmdentry.u.index = find_builtin(*argv, + &cmdentry.special)) < 0) { outfmt(&errout, "%s: not found\n", *argv); exitstatus = 127; flushout(&errout); @@ -812,7 +815,6 @@ memout.bufsize = 64; mode |= REDIR_BACKQ; } - redirect(cmd->ncmd.redirect, mode); savecmdname = commandname; cmdenviron = varlist.list; e = -1; @@ -823,6 +825,9 @@ } savehandler = handler; handler = &jmploc; + redirect(cmd->ncmd.redirect, mode); + if (cmdentry.special) + listsetvar(cmdenviron); commandname = argv[0]; argptr = argv + 1; optptr = NULL; /* initialize nextopt */ @@ -842,14 +847,7 @@ handler = savehandler; if (e != -1) { if ((e != EXERROR && e != EXEXEC) - || cmdentry.u.index == BLTINCMD - || cmdentry.u.index == DOTCMD - || cmdentry.u.index == EVALCMD -#ifndef NO_HISTORY - || cmdentry.u.index == HISTCMD -#endif - || cmdentry.u.index == EXECCMD - || cmdentry.u.index == COMMANDCMD) + || cmdentry.special) exraise(e); FORCEINTON; } @@ -925,14 +923,12 @@ */ /* - * No command given, or a bltin command with no arguments. Set the - * specified variables. + * No command given, or a bltin command with no arguments. */ int bltincmd(int argc __unused, char **argv __unused) { - listsetvar(cmdenviron); /* * Preserve exitstatus of a previous possible redirection * as POSIX mandates ==== //depot/projects/dtrace/src/bin/sh/exec.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.28 2005/10/29 07:19:11 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.29 2006/04/09 12:21:20 stefanf Exp $"); #include #include @@ -84,6 +84,7 @@ struct tblentry { struct tblentry *next; /* next entry in hash chain */ union param param; /* definition of builtin function */ + int special; /* flag for special builtin commands */ short cmdtype; /* index identifying command */ char rehash; /* if set, cd done since entry created */ char cmdname[ARB]; /* name of command */ @@ -317,6 +318,7 @@ struct stat statb; int e; int i; + int spec; /* If name contains a slash, don't use the hash table */ if (strchr(name, '/') != NULL) { @@ -330,11 +332,12 @@ goto success; /* If %builtin not in path, check for builtin next */ - if (builtinloc < 0 && (i = find_builtin(name)) >= 0) { + if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) { INTOFF; cmdp = cmdlookup(name, 1); cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; + cmdp->special = spec; INTON; goto success; } @@ -356,12 +359,13 @@ index++; if (pathopt) { if (prefix("builtin", pathopt)) { - if ((i = find_builtin(name)) < 0) + if ((i = find_builtin(name, &spec)) < 0) goto loop; INTOFF; cmdp = cmdlookup(name, 1); cmdp->cmdtype = CMDBUILTIN; cmdp->param.index = i; + cmdp->special = spec; INTON; goto success; } else if (prefix("func", pathopt)) { @@ -430,6 +434,7 @@ cmdp->rehash = 0; entry->cmdtype = cmdp->cmdtype; entry->u = cmdp->param; + entry->special = cmdp->special; } @@ -439,13 +444,15 @@ */ int -find_builtin(char *name) +find_builtin(char *name, int *special) { const struct builtincmd *bp; for (bp = builtincmd ; bp->name ; bp++) { - if (*bp->name == *name && equal(bp->name, name)) + if (*bp->name == *name && equal(bp->name, name)) { + *special = bp->special; return bp->code; + } } return -1; } ==== //depot/projects/dtrace/src/bin/sh/exec.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD: src/bin/sh/exec.h,v 1.14 2005/10/29 07:19:11 stefanf Exp $ + * $FreeBSD: src/bin/sh/exec.h,v 1.15 2006/04/09 12:21:20 stefanf Exp $ */ /* values of cmdtype */ @@ -52,6 +52,7 @@ int index; union node *func; } u; + int special; }; @@ -62,7 +63,7 @@ char *padvance(char **, char *); int hashcmd(int, char **); void find_command(char *, struct cmdentry *, int, char *); -int find_builtin(char *); +int find_builtin(char *, int *); void hashcd(void); void changepath(const char *); void deletefuncs(void); ==== //depot/projects/dtrace/src/bin/sh/options.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.24 2005/10/29 18:41:35 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $"); #include #include @@ -374,7 +374,7 @@ if (argc > 1) n = number(argv[1]); if (n > shellparam.nparam) - error("can't shift that many"); + return 1; INTOFF; shellparam.nparam -= n; for (ap1 = shellparam.p ; --n >= 0 ; ap1++) { ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.277 2006/02/14 04:16:56 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.278 2006/04/11 09:02:07 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -229,6 +229,7 @@ ### Network daemon (NFS): All need rpcbind_enable="YES" ### amd_enable="NO" # Run amd service with $amd_flags (or NO). +amd_program="/usr/sbin/amd" # path to amd, if you want a different one. amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" amd_map_program="NO" # Can be set to "ypcat -k amd.master" nfs_client_enable="NO" # This host is an NFS client (or NO). ==== //depot/projects/dtrace/src/etc/gettytab#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/gettytab,v 1.23 2006/01/22 15:33:16 matteo Exp $ +# $FreeBSD: src/etc/gettytab,v 1.24 2006/04/11 09:54:23 des Exp $ # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 # # Most of the table entries here are just copies of the old getty table, @@ -204,6 +204,16 @@ autologin|al.9600:\ :al=root:tc=std.9600: +al.19200:\ + :al=root:tc=std.19200: +al.38400:\ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 12 08:38:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7251A16A402; Wed, 12 Apr 2006 08:38:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E95E16A404 for ; Wed, 12 Apr 2006 08:38:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC46743D45 for ; Wed, 12 Apr 2006 08:38:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C8cKLB056835 for ; Wed, 12 Apr 2006 08:38:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C8cKr8056822 for perforce@freebsd.org; Wed, 12 Apr 2006 08:38:20 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 08:38:20 GMT Message-Id: <200604120838.k3C8cKr8056822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 08:38:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=95060 Change 95060 by jb@jb_freebsd2 on 2006/04/12 08:38:11 Begin sucking in a few OpenSolaris headers. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cmn_err.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_386.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elftypes.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/link.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 09:09:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68A7316A406; Wed, 12 Apr 2006 09:09:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DC6716A401 for ; Wed, 12 Apr 2006 09:09:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E20243D66 for ; Wed, 12 Apr 2006 09:09:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C9918W080804 for ; Wed, 12 Apr 2006 09:09:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C991OT080801 for perforce@freebsd.org; Wed, 12 Apr 2006 09:09:01 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 09:09:01 GMT Message-Id: <200604120909.k3C991OT080801@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 09:09:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=95061 Change 95061 by jb@jb_freebsd2 on 2006/04/12 09:08:01 Add some compatibility headers to munge FreeBSD's definitions into those expected by OpenSolaris. The file names here match the Solaris header files in which the things are defined natively. I guess that means that these are covered by the CDDL. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#4 edit .. //depot/projects/dtrace/src/contrib/opensolaris/compat/assert.h#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/mman.h#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/param.h#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/stat.h#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/synch.h#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/types.h#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/compat/thread.h#1 add Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#4 (text+ko) ==== @@ -13,8 +13,7 @@ CFLAGS+= -I${.CURDIR}/../../.. \ -I${.CURDIR}/../../../contrib \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ - -I${OPENSOLARIS_SYS_DISTDIR}/common + -I${OPENSOLARIS_SYS_DISTDIR}/uts/common .if ${MACHINE_ARCH} == "i386" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel From owner-p4-projects@FreeBSD.ORG Wed Apr 12 09:17:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FAFD16A408; Wed, 12 Apr 2006 09:17:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 416B316A403 for ; Wed, 12 Apr 2006 09:17:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B549443D48 for ; Wed, 12 Apr 2006 09:17:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C9HFPX086024 for ; Wed, 12 Apr 2006 09:17:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C9HEVr085994 for perforce@freebsd.org; Wed, 12 Apr 2006 09:17:15 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 09:17:15 GMT Message-Id: <200604120917.k3C9HEVr085994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 09:17:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=95062 Change 95062 by jb@jb_freebsd2 on 2006/04/12 09:16:53 Suck more headers. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_SPARC.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_amd64.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 09:18:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F1BA16A405; Wed, 12 Apr 2006 09:18:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CE1F16A403 for ; Wed, 12 Apr 2006 09:18:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCE2143D58 for ; Wed, 12 Apr 2006 09:18:17 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C9IHvE086680 for ; Wed, 12 Apr 2006 09:18:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C9IHC7086674 for perforce@freebsd.org; Wed, 12 Apr 2006 09:18:17 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 09:18:17 GMT Message-Id: <200604120918.k3C9IHC7086674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 09:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=95063 Change 95063 by jb@jb_freebsd2 on 2006/04/12 09:17:31 Add FreeBSD compatibility includes to make this file compile. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#2 (text) ==== @@ -93,7 +93,12 @@ #include #include +#if defined(__FreeBSD__) +#include +#include +#else #include +#endif #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 12 14:50:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 563D916A404; Wed, 12 Apr 2006 14:50:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E60C816A405 for ; Wed, 12 Apr 2006 14:50:35 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 503AC43D45 for ; Wed, 12 Apr 2006 14:50:31 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CEoVso071654 for ; Wed, 12 Apr 2006 14:50:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CEoUJh071640 for perforce@freebsd.org; Wed, 12 Apr 2006 14:50:30 GMT (envelope-from marcel@freebsd.org) Date: Wed, 12 Apr 2006 14:50:30 GMT Message-Id: <200604121450.k3CEoUJh071640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 14:50:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=95068 Change 95068 by marcel@marcel_nfs on 2006/04/12 14:49:30 Replace the rmask and rval arrays with vendor, device, subvendor and subdevice variables. When subvendor is 0xffff, don't test the subvendor and subdevice values. This strips 24 bytes from the description. While here, sort the list on vendor, device, subvendor and subdevice. Affected files ... .. //depot/projects/uart/dev/puc/puc_pci.c#10 edit .. //depot/projects/uart/dev/puc/pucdata.c#20 edit .. //depot/projects/uart/dev/puc/pucvar.h#16 edit Differences ... ==== //depot/projects/uart/dev/puc/puc_pci.c#10 (text+ko) ==== @@ -85,42 +85,37 @@ int puc_config_win877(struct puc_softc *); static const struct puc_device_description * -puc_find_description(uint32_t vend, uint32_t prod, uint32_t svend, - uint32_t sprod) +puc_pci_match(device_t dev, const struct puc_device_description *desc) { - int i; + uint16_t device, subdev, subven, vendor; -#define checkreg(val, index) \ - (((val) & puc_devices[i].rmask[(index)]) == puc_devices[i].rval[(index)]) - - for (i = 0; puc_devices[i].name != NULL; i++) { - if (checkreg(vend, PUC_REG_VEND) && - checkreg(prod, PUC_REG_PROD) && - checkreg(svend, PUC_REG_SVEND) && - checkreg(sprod, PUC_REG_SPROD)) - return (&puc_devices[i]); - } - -#undef checkreg - - return (NULL); + vendor = pci_get_vendor(dev); + device = pci_get_device(dev); + while (desc->vendor != 0xffff && + (desc->vendor != vendor || desc->device != device)) + desc++; + if (desc->vendor == 0xffff) + return (NULL); + if (desc->subvendor == 0xffff) + return (desc); + subven = pci_get_subvendor(dev); + subdev = pci_get_subdevice(dev); + while (desc->vendor == vendor && desc->device == device && + (desc->subvendor != subven || desc->subdevice != subdev)) + desc++; + return ((desc->vendor == vendor && desc->device == device) + ? desc : NULL); } static int puc_pci_probe(device_t dev) { - uint32_t v1, v2, d1, d2; const struct puc_device_description *desc; if ((pci_read_config(dev, PCIR_HDRTYPE, 1) & PCIM_HDRTYPE) != 0) return (ENXIO); - v1 = pci_read_config(dev, PCIR_VENDOR, 2); - d1 = pci_read_config(dev, PCIR_DEVICE, 2); - v2 = pci_read_config(dev, PCIR_SUBVEND_0, 2); - d2 = pci_read_config(dev, PCIR_SUBDEV_0, 2); - - desc = puc_find_description(v1, d1, v2, d2); + desc = puc_pci_match(dev, puc_devices); if (desc == NULL) return (ENXIO); device_set_desc(dev, desc->name); @@ -130,13 +125,8 @@ static int puc_pci_attach(device_t dev) { - uint32_t v1, v2, d1, d2; - v1 = pci_read_config(dev, PCIR_VENDOR, 2); - d1 = pci_read_config(dev, PCIR_DEVICE, 2); - v2 = pci_read_config(dev, PCIR_SUBVEND_0, 2); - d2 = pci_read_config(dev, PCIR_SUBDEV_0, 2); - return (puc_attach(dev, puc_find_description(v1, d1, v2, d2))); + return (puc_attach(dev, puc_pci_match(dev, puc_devices))); } static device_method_t puc_pci_methods[] = { ==== //depot/projects/uart/dev/puc/pucdata.c#20 (text+ko) ==== @@ -42,16 +42,14 @@ #include #include -#include #include int puc_config_win877(struct puc_softc *); const struct puc_device_description puc_devices[] = { - { "Sunix SUN1889", - { 0x0009, 0x7168, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x0009, 0x7168, 0xffff, 0, + "Sunix SUN1889", DEFAULT_RCLK * 8, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -59,9 +57,8 @@ }, }, - { "Diva Serial [GSP] Multiport UART", - { 0x103c, 0x1048, 0x103c, 0x1282 }, - { 0xffff, 0xffff, 0xffff, 0xffff }, + { 0x103c, 0x1048, 0x103c, 0x1282, + "Diva Serial [GSP] Multiport UART", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -70,33 +67,95 @@ }, }, - { "Comtrol RocketPort 550/4 RJ45", - { 0x11fe, 0x8014, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x10b5, 0x1076, 0x10b5, 0x1076, + "VScom PCI-800", + DEFAULT_RCLK * 8, + { + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, + { PUC_PORT_TYPE_COM, 0x18, 0x20 }, + { PUC_PORT_TYPE_COM, 0x18, 0x28 }, + { PUC_PORT_TYPE_COM, 0x18, 0x30 }, + { PUC_PORT_TYPE_COM, 0x18, 0x38 }, + }, + }, + + { 0x10b5, 0x1077, 0x10b5, 0x1077, + "VScom PCI-400", + DEFAULT_RCLK * 8, + { + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, + }, + }, + + /* + * Boca Research Turbo Serial 658 (8 serial port) card. + * Appears to be the same as Chase Research PLC PCI-FAST8 + * and Perle PCI-FAST8 Multi-Port serial cards. + */ + { 0x10b5, 0x9050, 0x12e0, 0x0021, + "Boca Research Turbo Serial 658", DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, + { PUC_PORT_TYPE_COM, 0x18, 0x20 }, + { PUC_PORT_TYPE_COM, 0x18, 0x28 }, + { PUC_PORT_TYPE_COM, 0x18, 0x30 }, + { PUC_PORT_TYPE_COM, 0x18, 0x38 }, }, }, - { "Comtrol RocketPort 550/Quad", - { 0x11fe, 0x8015, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x10b5, 0x9050, 0x12e0, 0x0031, + "Boca Research Turbo Serial 654", DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, + }, + }, + + /* + * Dolphin Peripherals 4035 (dual serial port) card. PLX 9050, with + * a seemingly-lame EEPROM setup that puts the Dolphin IDs + * into the subsystem fields, and claims that it's a + * network/misc (0x02/0x80) device. + */ + { 0x10b5, 0x9050, 0xd84d, 0x6808, + "Dolphin Peripherals 4035", + DEFAULT_RCLK, + { + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + }, + }, + + /* + * Dolphin Peripherals 4014 (dual parallel port) card. PLX 9050, with + * a seemingly-lame EEPROM setup that puts the Dolphin IDs + * into the subsystem fields, and claims that it's a + * network/misc (0x02/0x80) device. + */ + { 0x10b5, 0x9050, 0xd84d, 0x6810, + "Dolphin Peripherals 4014", + 0, + { + { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x24, 0x00 }, }, }, - { "Comtrol RocketPort 550/8 RJ11 part A", - { 0x11fe, 0x8010, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x11fe, 0x8010, 0xffff, 0, + "Comtrol RocketPort 550/8 RJ11 part A", DEFAULT_RCLK * 4, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -105,9 +164,9 @@ { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, - { "Comtrol RocketPort 550/8 RJ11 part B", - { 0x11fe, 0x8011, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + + { 0x11fe, 0x8011, 0xffff, 0, + "Comtrol RocketPort 550/8 RJ11 part B", DEFAULT_RCLK * 4, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -117,9 +176,8 @@ }, }, - { "Comtrol RocketPort 550/8 Octa part A", - { 0x11fe, 0x8012, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x11fe, 0x8012, 0xffff, 0, + "Comtrol RocketPort 550/8 Octa part A", DEFAULT_RCLK * 4, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -128,9 +186,9 @@ { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, - { "Comtrol RocketPort 550/8 Octa part B", - { 0x11fe, 0x8013, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + + { 0x11fe, 0x8013, 0xffff, 0, + "Comtrol RocketPort 550/8 Octa part B", DEFAULT_RCLK * 4, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -140,9 +198,8 @@ }, }, - { "Comtrol RocketPort 550/8 part A", - { 0x11fe, 0x8018, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x11fe, 0x8014, 0xffff, 0, + "Comtrol RocketPort 550/4 RJ45", DEFAULT_RCLK * 4, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -151,9 +208,9 @@ { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, - { "Comtrol RocketPort 550/8 part B", - { 0x11fe, 0x8019, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + + { 0x11fe, 0x8015, 0xffff, 0, + "Comtrol RocketPort 550/Quad", DEFAULT_RCLK * 4, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -163,9 +220,8 @@ }, }, - { "Comtrol RocketPort 550/16 part A", - { 0x11fe, 0x8016, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x11fe, 0x8016, 0xffff, 0, + "Comtrol RocketPort 550/16 part A", DEFAULT_RCLK * 4, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -174,9 +230,9 @@ { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, - { "Comtrol RocketPort 550/16 part B", - { 0x11fe, 0x8017, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + + { 0x11fe, 0x8017, 0xffff, 0, + "Comtrol RocketPort 550/16 part B", DEFAULT_RCLK * 4, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -194,69 +250,29 @@ }, }, - /* - * XXX no entry because I have no data: - * XXX Dolphin Peripherals 4006 (single parallel) - */ - - /* - * Dolphin Peripherals 4014 (dual parallel port) card. PLX 9050, with - * a seemingly-lame EEPROM setup that puts the Dolphin IDs - * into the subsystem fields, and claims that it's a - * network/misc (0x02/0x80) device. - */ - { "Dolphin Peripherals 4014", - { 0x10b5, 0x9050, 0xd84d, 0x6810 }, - { 0xffff, 0xffff, 0xffff, 0xffff }, - 0, + { 0x11fe, 0x8018, 0xffff, 0, + "Comtrol RocketPort 550/8 part A", + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x24, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, - /* - * XXX Dolphin Peripherals 4025 (single serial) - * (clashes with Dolphin Peripherals 4036 (2s variant) - */ - - /* - * Dolphin Peripherals 4035 (dual serial port) card. PLX 9050, with - * a seemingly-lame EEPROM setup that puts the Dolphin IDs - * into the subsystem fields, and claims that it's a - * network/misc (0x02/0x80) device. - */ - { "Dolphin Peripherals 4035", - { 0x10b5, 0x9050, 0xd84d, 0x6808 }, - { 0xffff, 0xffff, 0xffff, 0xffff }, - DEFAULT_RCLK, + { 0x11fe, 0x8019, 0xffff, 0, + "Comtrol RocketPort 550/8 part B", + DEFAULT_RCLK * 4, { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, - }, - - /* - * Dolphin Peripherals 4036 (dual serial port) card. - * (Dolpin 4025 has the same ID but only one port) - */ - { "Dolphin Peripherals 4036", - { 0x1409, 0x7168, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - DEFAULT_RCLK * 8, - { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x10, 0x10 }, + { PUC_PORT_TYPE_COM, 0x10, 0x18 }, }, }, /* - * XXX no entry because I have no data: - * XXX Dolphin Peripherals 4078 (dual serial and single parallel) - */ - - - /* * SIIG Boards. * * SIIG provides documentation for their boards at: @@ -266,14 +282,8 @@ * use in their documentation. */ - /* - * SIIG "10x" family boards. - */ - - /* SIIG Cyber I/O PCI 16C550 (10x family): 1S, 1P */ - { "SIIG Cyber I/O PCI 16C550 (10x family)", - { 0x131f, 0x1010, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1010, 0xffff, 0, + "SIIG Cyber I/O PCI 16C550 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -281,10 +291,8 @@ }, }, - /* SIIG Cyber I/O PCI 16C650 (10x family): 1S, 1P */ - { "SIIG Cyber I/O PCI 16C650 (10x family)", - { 0x131f, 0x1011, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1011, 0xffff, 0, + "SIIG Cyber I/O PCI 16C650 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -292,10 +300,8 @@ }, }, - /* SIIG Cyber I/O PCI 16C850 (10x family): 1S, 1P */ - { "SIIG Cyber I/O PCI 16C850 (10x family)", - { 0x131f, 0x1012, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1012, 0xffff, 0, + "SIIG Cyber I/O PCI 16C850 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -303,20 +309,16 @@ }, }, - /* SIIG Cyber Parallel PCI (10x family): 1P */ - { "SIIG Cyber Parallel PCI (10x family)", - { 0x131f, 0x1020, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1020, 0xffff, 0, + "SIIG Cyber Parallel PCI (10x family)", 0, { { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, }, }, - /* SIIG Cyber Parallel Dual PCI (10x family): 2P */ - { "SIIG Cyber Parallel Dual PCI (10x family)", - { 0x131f, 0x1021, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1021, 0xffff, 0, + "SIIG Cyber Parallel Dual PCI (10x family)", 0, { { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, @@ -324,10 +326,8 @@ }, }, - /* SIIG Cyber Serial Dual PCI 16C550 (10x family): 2S */ - { "SIIG Cyber Serial Dual PCI 16C550 (10x family)", - { 0x131f, 0x1030, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1030, 0xffff, 0, + "SIIG Cyber Serial Dual PCI 16C550 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -335,10 +335,8 @@ }, }, - /* SIIG Cyber Serial Dual PCI 16C650 (10x family): 2S */ - { "SIIG Cyber Serial Dual PCI 16C650 (10x family)", - { 0x131f, 0x1031, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1031, 0xffff, 0, + "SIIG Cyber Serial Dual PCI 16C650 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -346,10 +344,8 @@ }, }, - /* SIIG Cyber Serial Dual PCI 16C850 (10x family): 2S */ - { "SIIG Cyber Serial Dual PCI 16C850 (10x family)", - { 0x131f, 0x1032, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1032, 0xffff, 0, + "SIIG Cyber Serial Dual PCI 16C850 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -357,10 +353,8 @@ }, }, - /* SIIG Cyber 2S1P PCI 16C550 (10x family): 2S, 1P */ - { "SIIG Cyber 2S1P PCI 16C550 (10x family)", - { 0x131f, 0x1034, 0, 0 }, /* XXX really? */ - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1034, 0xffff, 0, /* XXX really? */ + "SIIG Cyber 2S1P PCI 16C550 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -369,10 +363,8 @@ }, }, - /* SIIG Cyber 2S1P PCI 16C650 (10x family): 2S, 1P */ - { "SIIG Cyber 2S1P PCI 16C650 (10x family)", - { 0x131f, 0x1035, 0, 0 }, /* XXX really? */ - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1035, 0xffff, 0, /* XXX really? */ + "SIIG Cyber 2S1P PCI 16C650 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -381,10 +373,8 @@ }, }, - /* SIIG Cyber 2S1P PCI 16C850 (10x family): 2S, 1P */ - { "SIIG Cyber 2S1P PCI 16C850 (10x family)", - { 0x131f, 0x1036, 0, 0 }, /* XXX really? */ - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1036, 0xffff, 0, /* XXX really? */ + "SIIG Cyber 2S1P PCI 16C850 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -393,10 +383,8 @@ }, }, - /* SIIG Cyber 4S PCI 16C550 (10x family): 4S */ - { "SIIG Cyber 4S PCI 16C550 (10x family)", - { 0x131f, 0x1050, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1050, 0xffff, 0, + "SIIG Cyber 4S PCI 16C550 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -406,10 +394,8 @@ }, }, - /* SIIG Cyber 4S PCI 16C650 (10x family): 4S */ - { "SIIG Cyber 4S PCI 16C650 (10x family)", - { 0x131f, 0x1051, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1051, 0xffff, 0, + "SIIG Cyber 4S PCI 16C650 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -419,10 +405,8 @@ }, }, - /* SIIG Cyber 4S PCI 16C850 (10x family): 4S */ - { "SIIG Cyber 4S PCI 16C850 (10x family)", - { 0x131f, 0x1052, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x1052, 0xffff, 0, + "SIIG Cyber 4S PCI 16C850 (10x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -432,24 +416,43 @@ }, }, - /* - * SIIG "20x" family boards. - */ + { 0x131f, 0x2010, 0xffff, 0, + "SIIG Cyber I/O PCI 16C550 (20x family)", + DEFAULT_RCLK, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + }, + }, + + { 0x131f, 0x2011, 0xffff, 0, + "SIIG Cyber I/O PCI 16C650 (20x family)", + DEFAULT_RCLK, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + }, + }, + + { 0x131f, 0x2012, 0xffff, 0, + "SIIG Cyber I/O PCI 16C850 (20x family)", + DEFAULT_RCLK, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + }, + }, - /* SIIG Cyber Parallel PCI (20x family): 1P */ - { "SIIG Cyber Parallel PCI (20x family)", - { 0x131f, 0x2020, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2020, 0xffff, 0, + "SIIG Cyber Parallel PCI (20x family)", 0, { { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, }, }, - /* SIIG Cyber Parallel Dual PCI (20x family): 2P */ - { "SIIG Cyber Parallel Dual PCI (20x family)", - { 0x131f, 0x2021, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2021, 0xffff, 0, + "SIIG Cyber Parallel Dual PCI (20x family)", 0, { { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, @@ -457,112 +460,98 @@ }, }, - /* SIIG Cyber 2P1S PCI 16C550 (20x family): 1S, 2P */ - { "SIIG Cyber 2P1S PCI 16C550 (20x family)", - { 0x131f, 0x2040, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2030, 0xffff, 0, + "SIIG Cyber Serial Dual PCI 16C550 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, - /* SIIG Cyber 2P1S PCI 16C650 (20x family): 1S, 2P */ - { "SIIG Cyber 2P1S PCI 16C650 (20x family)", - { 0x131f, 0x2041, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2031, 0xffff, 0, + "SIIG Cyber Serial Dual PCI 16C650 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, - /* SIIG Cyber 2P1S PCI 16C850 (20x family): 1S, 2P */ - { "SIIG Cyber 2P1S PCI 16C850 (20x family)", - { 0x131f, 0x2042, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2032, 0xffff, 0, + "SIIG Cyber Serial Dual PCI 16C850 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, - /* SIIG Cyber I/O PCI 16C550 (20x family): 1S, 1P */ - { "SIIG Cyber I/O PCI 16C550 (20x family)", - { 0x131f, 0x2010, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2040, 0xffff, 0, + "SIIG Cyber 2P1S PCI 16C550 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, - /* SIIG Cyber I/O PCI 16C650 (20x family): 1S, 1P */ - { "SIIG Cyber I/O PCI 16C650 (20x family)", - { 0x131f, 0x2011, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2041, 0xffff, 0, + "SIIG Cyber 2P1S PCI 16C650 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, - /* SIIG Cyber I/O PCI 16C850 (20x family): 1S, 1P */ - { "SIIG Cyber I/O PCI 16C850 (20x family)", - { 0x131f, 0x2012, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2042, 0xffff, 0, + "SIIG Cyber 2P1S PCI 16C850 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, + { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, }, }, - /* SIIG Cyber Serial Dual PCI 16C550 (20x family): 2S */ - { "SIIG Cyber Serial Dual PCI 16C550 (20x family)", - { 0x131f, 0x2030, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2050, 0xffff, 0, + "SIIG Cyber 4S PCI 16C550 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, - /* SIIG Cyber Serial Dual PCI 16C650 (20x family): 2S */ - { "SIIG Cyber Serial Dual PCI 16C650 (20x family)", - { 0x131f, 0x2031, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2051, 0xffff, 0, + "SIIG Cyber 4S PCI 16C650 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, - /* SIIG Cyber Serial Dual PCI 16C850 (20x family): 2S */ - { "SIIG Cyber Serial Dual PCI 16C850 (20x family)", - { 0x131f, 0x2032, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2052, 0xffff, 0, + "SIIG Cyber 4S PCI 16C850 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, { PUC_PORT_TYPE_COM, 0x14, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, }, }, - /* SIIG Cyber 2S1P PCI 16C550 (20x family): 2S, 1P */ - { "SIIG Cyber 2S1P PCI 16C550 (20x family)", - { 0x131f, 0x2060, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2060, 0xffff, 0, + "SIIG Cyber 2S1P PCI 16C550 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -571,10 +560,8 @@ }, }, - /* SIIG Cyber 2S1P PCI 16C650 (20x family): 2S, 1P */ - { "SIIG Cyber 2S1P PCI 16C650 (20x family)", - { 0x131f, 0x2061, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2061, 0xffff, 0, + "SIIG Cyber 2S1P PCI 16C650 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -583,10 +570,8 @@ }, }, - /* SIIG Cyber 2S1P PCI 16C850 (20x family): 2S, 1P */ - { "SIIG Cyber 2S1P PCI 16C850 (20x family)", - { 0x131f, 0x2062, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x131f, 0x2062, 0xffff, 0, + "SIIG Cyber 2S1P PCI 16C850 (20x family)", DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, @@ -595,73 +580,56 @@ }, }, - /* SIIG Cyber 4S PCI 16C550 (20x family): 4S */ - { "SIIG Cyber 4S PCI 16C550 (20x family)", - { 0x131f, 0x2050, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - DEFAULT_RCLK, + { 0x1393, 0x1040, 0xffff, 0, + "Moxa Technologies, Smartio C104H/PCI", + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, }, }, - /* SIIG Cyber 4S PCI 16C650 (20x family): 4S */ - { "SIIG Cyber 4S PCI 16C650 (20x family)", - { 0x131f, 0x2051, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - DEFAULT_RCLK, + { 0x1393, 0x1041, 0xffff, 0, + "Moxa Technologies, Smartio CP-104UL/PCI", + DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, }, }, - /* SIIG Cyber 4S PCI 16C850 (20x family): 4S */ - { "SIIG Cyber 4S PCI 16C850 (20x family)", - { 0x131f, 0x2052, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, - }, - - /* VScom PCI-200L: 2S */ - { "VScom PCI-200L", - { 0x14d2, 0x8020, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + { 0x1393, 0x1141, 0xffff, 0, + "Moxa Technologies, Industio CP-114", DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, { PUC_PORT_TYPE_COM, 0x18, 0x00 }, + { PUC_PORT_TYPE_COM, 0x18, 0x08 }, + { PUC_PORT_TYPE_COM, 0x18, 0x10 }, + { PUC_PORT_TYPE_COM, 0x18, 0x18 }, }, }, - /* VScom PCI-400: 4S */ - { "VScom PCI-400", - { 0x10b5, 0x1077, 0x10b5, 0x1077 }, - { 0xffff, 0xffff, 0xffff, 0xffff }, + { 0x1393, 0x1680, 0xffff, 0, + "Moxa Technologies, C168H/PCI", DEFAULT_RCLK * 8, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, { PUC_PORT_TYPE_COM, 0x18, 0x08 }, { PUC_PORT_TYPE_COM, 0x18, 0x10 }, { PUC_PORT_TYPE_COM, 0x18, 0x18 }, + { PUC_PORT_TYPE_COM, 0x18, 0x20 }, + { PUC_PORT_TYPE_COM, 0x18, 0x28 }, + { PUC_PORT_TYPE_COM, 0x18, 0x30 }, + { PUC_PORT_TYPE_COM, 0x18, 0x38 }, }, }, - /* VScom PCI-800: 8S */ - { "VScom PCI-800", - { 0x10b5, 0x1076, 0x10b5, 0x1076 }, - { 0xffff, 0xffff, 0xffff, 0xffff }, + { 0x1393, 0x1681, 0xffff, 0, + "Moxa Technologies, C168U/PCI", DEFAULT_RCLK * 8, { { PUC_PORT_TYPE_COM, 0x18, 0x00 }, @@ -674,122 +642,72 @@ { PUC_PORT_TYPE_COM, 0x18, 0x38 }, }, }, - /* - * VScom PCI-800H. Uses 8 16950 UART, behind a PCI chips that offers - * 4 com port on PCI device 0 and 4 on PCI device 1. PCI device 0 has - * device ID 3 and PCI device 1 device ID 4. - */ - { "Titan PCI-800H", - { 0x14d2, 0xa003, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, + + { 0x13a8, 0x0158, 0xffff, 0, + "Cronyx Omega2-PCI", DEFAULT_RCLK * 8, { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, + { PUC_PORT_TYPE_COM, 0x010, 0x000 }, + { PUC_PORT_TYPE_COM, 0x010, 0x200 }, + { PUC_PORT_TYPE_COM, 0x010, 0x400 }, + { PUC_PORT_TYPE_COM, 0x010, 0x600 }, + { PUC_PORT_TYPE_COM, 0x010, 0x800 }, + { PUC_PORT_TYPE_COM, 0x010, 0xA00 }, + { PUC_PORT_TYPE_COM, 0x010, 0xC00 }, + { PUC_PORT_TYPE_COM, 0x010, 0xE00 }, }, }, - { "Titan PCI-800H", - { 0x14d2, 0xa004, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - DEFAULT_RCLK * 8, + + { 0x1407, 0x0100, 0xffff, 0, /* MASK */ + "Lava Computers dual serial port", + DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, - { "Titan PCI-200H", - { 0x14d2, 0xa005, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - DEFAULT_RCLK * 8, + + { 0x1407, 0x0120, 0xffff, 0, /* MASK */ + "Lava Computers Quattro-PCI serial port", + DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, + { PUC_PORT_TYPE_COM, 0x14, 0x00 }, }, }, - { "Titan VScom PCI-200HV2", /* 2S */ - { 0x14d2, 0xe020, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - DEFAULT_RCLK * 8, + { 0x1407, 0x0180, 0xffff, 0, /* MASK */ + "Lava Computers Octopus-550 8-port serial", + DEFAULT_RCLK, { { PUC_PORT_TYPE_COM, 0x10, 0x00 }, { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - }, - }, - /* - * VScom (Titan?) PCI-800L. More modern variant of the - * PCI-800. Uses 6 discrete 16550 UARTs, plus another >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 12 16:02:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D19E16A407; Wed, 12 Apr 2006 16:02:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BF9216A401; Wed, 12 Apr 2006 16:02:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81AEE43D4C; Wed, 12 Apr 2006 16:02:41 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k3CG2djk025689; Wed, 12 Apr 2006 12:02:40 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Marcel Moolenaar Date: Wed, 12 Apr 2006 12:02:28 -0400 User-Agent: KMail/1.9.1 References: <200604121450.k3CEoUJh071640@repoman.freebsd.org> In-Reply-To: <200604121450.k3CEoUJh071640@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200604121202.29736.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1394/Wed Apr 12 09:45:54 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.0 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 95068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 16:02:42 -0000 On Wednesday 12 April 2006 10:50, Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=95068 > > Change 95068 by marcel@marcel_nfs on 2006/04/12 14:49:30 > > Replace the rmask and rval arrays with vendor, device, subvendor > and subdevice variables. When subvendor is 0xffff, don't test the > subvendor and subdevice values. This strips 24 bytes from the > description. > While here, sort the list on vendor, device, subvendor and > subdevice. I guess you expanded any entries that were using masks other than 0xffff? (I think there were only a handful if any). -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Wed Apr 12 18:59:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E19BC16A406; Wed, 12 Apr 2006 18:59:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CB9716A401 for ; Wed, 12 Apr 2006 18:59:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38B5843D79 for ; Wed, 12 Apr 2006 18:59:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CIxhXO015500 for ; Wed, 12 Apr 2006 18:59:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CIxhGA015494 for perforce@freebsd.org; Wed, 12 Apr 2006 18:59:43 GMT (envelope-from jhb@freebsd.org) Date: Wed, 12 Apr 2006 18:59:43 GMT Message-Id: <200604121859.k3CIxhGA015494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 95074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 18:59:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=95074 Change 95074 by jhb@jhb_slimer on 2006/04/12 18:59:16 Don't adjust the thread's priority in msleep (and tsleep) if the priority value is 0. Affected files ... .. //depot/projects/smpng/sys/kern/kern_synch.c#100 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_synch.c#100 (text+ko) ==== @@ -195,9 +195,11 @@ /* * Adjust this thread's priority. */ - mtx_lock_spin(&sched_lock); - sched_prio(td, priority & PRIMASK); - mtx_unlock_spin(&sched_lock); + if (priority & PRIMASK != 0) { + mtx_lock_spin(&sched_lock); + sched_prio(td, priority & PRIMASK); + mtx_unlock_spin(&sched_lock); + } if (timo && catch) rval = sleepq_timedwait_sig(ident); From owner-p4-projects@FreeBSD.ORG Wed Apr 12 19:22:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E044F16A40B; Wed, 12 Apr 2006 19:22:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D3C516A406 for ; Wed, 12 Apr 2006 19:22:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E815D43D93 for ; Wed, 12 Apr 2006 19:22:13 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CJMDqD029004 for ; Wed, 12 Apr 2006 19:22:13 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CJMD2f028996 for perforce@freebsd.org; Wed, 12 Apr 2006 19:22:13 GMT (envelope-from jhb@freebsd.org) Date: Wed, 12 Apr 2006 19:22:13 GMT Message-Id: <200604121922.k3CJMD2f028996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 95075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 19:22:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=95075 Change 95075 by jhb@jhb_slimer on 2006/04/12 19:21:13 Change [tm]sleep() calls that don't want to change curthread's priority to pass 0 instead of 'curthread->td_priority' as there are races in the latter. Affected files ... .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#15 edit .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#11 edit .. //depot/projects/smpng/sys/kern/kern_intr.c#74 edit .. //depot/projects/smpng/sys/kern/kern_poll.c#20 edit .. //depot/projects/smpng/sys/kern/kern_thr.c#32 edit .. //depot/projects/smpng/sys/kern/kern_umtx.c#23 edit .. //depot/projects/smpng/sys/kern/sched_4bsd.c#53 edit .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#29 edit .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#6 edit .. //depot/projects/smpng/sys/modules/crash/crash.c#32 edit .. //depot/projects/smpng/sys/modules/crash2/crash2.c#7 edit .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#28 edit Differences ... ==== //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#15 (text+ko) ==== @@ -646,15 +646,8 @@ static void pmc_force_context_switch(void) { - u_char curpri; - mtx_lock_spin(&sched_lock); - curpri = curthread->td_priority; - mtx_unlock_spin(&sched_lock); - - (void) tsleep((void *) pmc_force_context_switch, curpri, - "pmcctx", 1); - + (void) tsleep((void *) pmc_force_context_switch, 0, "pmcctx", 1); } /* ==== //depot/projects/smpng/sys/dev/random/randomdev_soft.c#11 (text+ko) ==== @@ -211,8 +211,7 @@ * Command the hash/reseed thread to end and wait for it to finish */ random_kthread_control = -1; - tsleep((void *)&random_kthread_control, curthread->td_priority, "term", - 0); + tsleep((void *)&random_kthread_control, 0, "term", 0); /* Destroy the harvest fifos */ while (!STAILQ_EMPTY(&emptyfifo.head)) { @@ -285,8 +284,7 @@ /* Found nothing, so don't belabour the issue */ if (!active) - tsleep(&harvestfifo, curthread->td_priority, "-", - hz / 10); + tsleep(&harvestfifo, 0, "-", hz / 10); } ==== //depot/projects/smpng/sys/kern/kern_intr.c#74 (text+ko) ==== @@ -371,8 +371,7 @@ /* Create a thread if we need one. */ while (ie->ie_thread == NULL && !(flags & INTR_FAST)) { if (ie->ie_flags & IE_ADDING_THREAD) - msleep(ie, &ie->ie_lock, curthread->td_priority, - "ithread", 0); + msleep(ie, &ie->ie_lock, 0, "ithread", 0); else { ie->ie_flags |= IE_ADDING_THREAD; mtx_unlock(&ie->ie_lock); @@ -458,8 +457,7 @@ TAILQ_REMOVE(&ie->ie_handlers, handler, ih_next); mtx_unlock_spin(&sched_lock); while (handler->ih_flags & IH_DEAD) - msleep(handler, &ie->ie_lock, curthread->td_priority, "iev_rmh", - 0); + msleep(handler, &ie->ie_lock, 0, "iev_rmh", 0); intr_event_update(ie); #ifdef notyet /* @@ -683,7 +681,7 @@ ie->ie_name); ie->ie_warned = 1; } - tsleep(&ie->ie_count, curthread->td_priority, "istorm", 1); + tsleep(&ie->ie_count, 0, "istorm", 1); } else ie->ie_count++; ==== //depot/projects/smpng/sys/kern/kern_poll.c#20 (text+ko) ==== @@ -577,13 +577,11 @@ { struct thread *td = curthread; struct rtprio rtp; - int pri; rtp.prio = RTP_PRIO_MAX; /* lowest priority */ rtp.type = RTP_PRIO_IDLE; mtx_lock_spin(&sched_lock); rtp_to_pri(&rtp, td->td_ksegrp); - pri = td->td_priority; mtx_unlock_spin(&sched_lock); for (;;) { @@ -595,7 +593,7 @@ mtx_unlock_spin(&sched_lock); } else { idlepoll_sleeping = 1; - tsleep(&idlepoll_sleeping, pri, "pollid", hz * 3); + tsleep(&idlepoll_sleeping, 0, "pollid", hz * 3); } } } ==== //depot/projects/smpng/sys/kern/kern_thr.c#32 (text+ko) ==== @@ -368,8 +368,8 @@ } PROC_LOCK(td->td_proc); if ((td->td_flags & TDF_THRWAKEUP) == 0) - error = msleep((void *)td, &td->td_proc->p_mtx, - td->td_priority | PCATCH, "lthr", hz); + error = msleep((void *)td, &td->td_proc->p_mtx, PCATCH, "lthr", + hz); if (td->td_flags & TDF_THRWAKEUP) { mtx_lock_spin(&sched_lock); td->td_flags &= ~TDF_THRWAKEUP; ==== //depot/projects/smpng/sys/kern/kern_umtx.c#23 (text+ko) ==== @@ -168,7 +168,7 @@ while (umtxq_chains[chain].uc_flags & UCF_BUSY) { umtxq_chains[chain].uc_flags |= UCF_WANT; msleep(&umtxq_chains[chain], umtxq_mtx(chain), - curthread->td_priority, "umtxq_busy", 0); + 0, "umtxq_busy", 0); } umtxq_chains[chain].uc_flags |= UCF_BUSY; } @@ -424,8 +424,7 @@ */ umtxq_lock(&uq->uq_key); if (old == owner && (td->td_flags & TDF_UMTXQ)) { - error = umtxq_sleep(td, &uq->uq_key, - td->td_priority | PCATCH, + error = umtxq_sleep(td, &uq->uq_key, PCATCH, "umtx", timo); } umtxq_busy(&uq->uq_key); @@ -547,7 +546,7 @@ umtxq_lock(&uq->uq_key); if (td->td_flags & TDF_UMTXQ) error = umtxq_sleep(td, &uq->uq_key, - td->td_priority | PCATCH, "ucond", 0); + PCATCH, "ucond", 0); if (!(td->td_flags & TDF_UMTXQ)) error = 0; else @@ -560,8 +559,7 @@ for (;;) { umtxq_lock(&uq->uq_key); if (td->td_flags & TDF_UMTXQ) { - error = umtxq_sleep(td, &uq->uq_key, - td->td_priority | PCATCH, + error = umtxq_sleep(td, &uq->uq_key, PCATCH, "ucond", tvtohz(&tv)); } if (!(td->td_flags & TDF_UMTXQ)) { ==== //depot/projects/smpng/sys/kern/sched_4bsd.c#53 (text+ko) ==== @@ -543,7 +543,7 @@ for (;;) { schedcpu(); - tsleep(&nowake, curthread->td_priority, "-", hz); + tsleep(&nowake, 0, "-", hz); } } ==== //depot/projects/smpng/sys/kern/subr_taskqueue.c#29 (text+ko) ==== @@ -356,7 +356,7 @@ TQ_LOCK(tq); do { taskqueue_run(tq); - TQ_SLEEP(tq, tq, &tq->tq_mutex, curthread->td_priority, "-", 0); + TQ_SLEEP(tq, tq, &tq->tq_mutex, 0, "-", 0); } while ((tq->tq_flags & TQ_FLAGS_ACTIVE) != 0); /* rendezvous with thread that asked us to terminate */ ==== //depot/projects/smpng/sys/kern/uipc_mqueue.c#6 (text+ko) ==== @@ -1657,7 +1657,7 @@ } mq->mq_senders++; error = msleep(&mq->mq_senders, &mq->mq_mutex, - curthread->td_priority | PCATCH, "mqsend", timo); + PCATCH, "mqsend", timo); mq->mq_senders--; if (error == EAGAIN) error = ETIMEDOUT; @@ -1809,7 +1809,7 @@ } mq->mq_receivers++; error = msleep(&mq->mq_receivers, &mq->mq_mutex, - curthread->td_priority | PCATCH, "mqrecv", timo); + PCATCH, "mqrecv", timo); mq->mq_receivers--; if (error == EAGAIN) error = ETIMEDOUT; ==== //depot/projects/smpng/sys/modules/crash/crash.c#32 (text+ko) ==== @@ -160,7 +160,7 @@ { rw_init(&baz, "baz"); rw_rlock(&baz); - tsleep(&baz, curthread->td_priority, "-", 1); + tsleep(&baz, 0, "-", 1); rw_runlock(&baz); rw_destroy(&baz); } @@ -674,7 +674,7 @@ printf("Should panic\n"); THREAD_NO_SLEEPING(); - tsleep(&test1_mtx, curthread->td_priority, "sleep", 1); + tsleep(&test1_mtx, 0, "sleep", 1); THREAD_SLEEPING_OK(); } CRASH_EVENT("sleep while sleeping is prohibited", test_no_sleeping); ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#7 (text+ko) ==== @@ -101,7 +101,7 @@ { mtx_lock(&bar); - tsleep(&bar, curthread->td_priority, "bar", hz/100); + tsleep(&bar, 0, "bar", hz/100); mtx_unlock(&bar); } CRASH2_EVENT("sleep holding bar", bar_sleep, bar_sleep, bar_sleep, bar_sleep); ==== //depot/projects/smpng/sys/vm/vm_zeroidle.c#28 (text+ko) ==== @@ -140,9 +140,7 @@ static void vm_pagezero(void __unused *arg) { - struct thread *td; - td = curthread; idlezero_enable = idlezero_enable_default; for (;;) { @@ -159,7 +157,7 @@ vm_page_lock_queues(); wakeup_needed = TRUE; msleep(&zero_state, &vm_page_queue_mtx, - PDROP | td->td_priority, "pgzero", hz * 300); + PDROP, "pgzero", hz * 300); } } } From owner-p4-projects@FreeBSD.ORG Wed Apr 12 19:37:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AB2D16A404; Wed, 12 Apr 2006 19:37:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33D8816A400 for ; Wed, 12 Apr 2006 19:37:33 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E009843D46 for ; Wed, 12 Apr 2006 19:37:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CJbWBP037943 for ; Wed, 12 Apr 2006 19:37:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CJbW27037938 for perforce@freebsd.org; Wed, 12 Apr 2006 19:37:32 GMT (envelope-from jhb@freebsd.org) Date: Wed, 12 Apr 2006 19:37:32 GMT Message-Id: <200604121937.k3CJbW27037938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 95076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 19:37:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=95076 Change 95076 by jhb@jhb_slimer on 2006/04/12 19:36:50 Destroy bar on unload. Submitted by: jet.baldwin.cx (via panic) Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#8 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#8 (text+ko) ==== @@ -298,6 +298,7 @@ } mtx_destroy(&event_mtx); cv_destroy(&event_cv); + mtx_destroy(&bar); rw_destroy(&foo); return (0); } From owner-p4-projects@FreeBSD.ORG Wed Apr 12 19:46:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 074F216A40B; Wed, 12 Apr 2006 19:46:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D181216A409 for ; Wed, 12 Apr 2006 19:46:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8192543D46 for ; Wed, 12 Apr 2006 19:46:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CJklCg042516 for ; Wed, 12 Apr 2006 19:46:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CJkl4p042513 for perforce@freebsd.org; Wed, 12 Apr 2006 19:46:47 GMT (envelope-from jhb@freebsd.org) Date: Wed, 12 Apr 2006 19:46:47 GMT Message-Id: <200604121946.k3CJkl4p042513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 95079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 19:46:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=95079 Change 95079 by jhb@jhb_twclab on 2006/04/12 19:45:46 Compile. Affected files ... .. //depot/projects/smpng/sys/kern/kern_synch.c#101 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_synch.c#101 (text+ko) ==== @@ -195,7 +195,7 @@ /* * Adjust this thread's priority. */ - if (priority & PRIMASK != 0) { + if ((priority & PRIMASK) != 0) { mtx_lock_spin(&sched_lock); sched_prio(td, priority & PRIMASK); mtx_unlock_spin(&sched_lock); From owner-p4-projects@FreeBSD.ORG Wed Apr 12 21:22:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CA5A16A404; Wed, 12 Apr 2006 21:22:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1723016A408 for ; Wed, 12 Apr 2006 21:22:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8AEC43D83 for ; Wed, 12 Apr 2006 21:22:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CLMkG1005184 for ; Wed, 12 Apr 2006 21:22:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CLMkV5005178 for perforce@freebsd.org; Wed, 12 Apr 2006 21:22:46 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 21:22:46 GMT Message-Id: <200604122122.k3CLMkV5005178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 21:22:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=95085 Change 95085 by jb@jb_freebsd2 on 2006/04/12 21:22:33 Include compatibility header via !defined(sun). Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#2 (text) ==== @@ -40,6 +40,9 @@ #endif #ifndef _ASM #include +#if !defined(sun) +#include +#endif #include #include /* for Elf*_Dyn */ #endif /* _ASM */ From owner-p4-projects@FreeBSD.ORG Wed Apr 12 21:26:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62E4B16A407; Wed, 12 Apr 2006 21:26:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 292C616A400 for ; Wed, 12 Apr 2006 21:26:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D175343D45 for ; Wed, 12 Apr 2006 21:26:52 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CLQqBH005844 for ; Wed, 12 Apr 2006 21:26:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CLQqa6005841 for perforce@freebsd.org; Wed, 12 Apr 2006 21:26:52 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 21:26:52 GMT Message-Id: <200604122126.k3CLQqa6005841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95087 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 21:26:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=95087 Change 95087 by jb@jb_freebsd2 on 2006/04/12 21:26:08 Use '!defined(sun)' rather than 'defined(__FreeBSD__)'. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#3 (text) ==== @@ -93,7 +93,7 @@ #include #include -#if defined(__FreeBSD__) +#if !defined(sun) #include #include #else From owner-p4-projects@FreeBSD.ORG Wed Apr 12 21:42:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEAAA16A40D; Wed, 12 Apr 2006 21:42:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 701DD16A408 for ; Wed, 12 Apr 2006 21:42:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E418043D76 for ; Wed, 12 Apr 2006 21:42:13 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CLgDCF015500 for ; Wed, 12 Apr 2006 21:42:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CLgDLp015477 for perforce@freebsd.org; Wed, 12 Apr 2006 21:42:13 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 21:42:13 GMT Message-Id: <200604122142.k3CLgDLp015477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 21:42:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=95089 Change 95089 by jb@jb_freebsd2 on 2006/04/12 21:41:35 These are really kernel compatibility headers, so add them in the sys/contrib tree instead. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/mman.h#1 add .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/param.h#1 add .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/stat.h#1 add .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/synch.h#1 add .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/types.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 21:43:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1752516A407; Wed, 12 Apr 2006 21:43:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB85A16A405 for ; Wed, 12 Apr 2006 21:43:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4CDB43D4C for ; Wed, 12 Apr 2006 21:43:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CLhFqw016292 for ; Wed, 12 Apr 2006 21:43:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CLhFUe016289 for perforce@freebsd.org; Wed, 12 Apr 2006 21:43:15 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 21:43:15 GMT Message-Id: <200604122143.k3CLhFUe016289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 21:43:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=95090 Change 95090 by jb@jb_freebsd2 on 2006/04/12 21:42:37 Delete files that were added to the wrong contrib tree. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/mman.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/param.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/stat.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/synch.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/compat/sys/types.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 21:44:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5D6416A404; Wed, 12 Apr 2006 21:44:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9518716A400 for ; Wed, 12 Apr 2006 21:44:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D38F43D45 for ; Wed, 12 Apr 2006 21:44:17 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CLiHHb016327 for ; Wed, 12 Apr 2006 21:44:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CLiH2q016324 for perforce@freebsd.org; Wed, 12 Apr 2006 21:44:17 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 21:44:17 GMT Message-Id: <200604122144.k3CLiH2q016324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 21:44:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=95091 Change 95091 by jb@jb_freebsd2 on 2006/04/12 21:43:26 Suck some more OpenSolaris headers. Gosh they have a lot of header locations in their source tree. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/head/libelf.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/head/note.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/head/syms.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:02:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B43B16A404; Wed, 12 Apr 2006 22:02:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 25E4416A401 for ; Wed, 12 Apr 2006 22:02:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1AC643D6D for ; Wed, 12 Apr 2006 22:02:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CM2dOd026244 for ; Wed, 12 Apr 2006 22:02:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CM2dlf026238 for perforce@freebsd.org; Wed, 12 Apr 2006 22:02:39 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:02:39 GMT Message-Id: <200604122202.k3CM2dlf026238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:02:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=95092 Change 95092 by jb@jb_freebsd2 on 2006/04/12 22:02:00 Suck some 'Software Generation System' headers. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/_libelf.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/sgs.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/string_table.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:03:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F094B16A407; Wed, 12 Apr 2006 22:03:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CEE5416A400 for ; Wed, 12 Apr 2006 22:03:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 878A543D70 for ; Wed, 12 Apr 2006 22:03:41 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CM3fYC028107 for ; Wed, 12 Apr 2006 22:03:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CM3fLn028104 for perforce@freebsd.org; Wed, 12 Apr 2006 22:03:41 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:03:41 GMT Message-Id: <200604122203.k3CM3fLn028104@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:03:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=95093 Change 95093 by jb@jb_freebsd2 on 2006/04/12 22:03:01 OpenSolaris source distribution has headers all over the place. Include a couple more places. Sigh. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#5 (text+ko) ==== @@ -12,6 +12,8 @@ CFLAGS+= -I${.CURDIR}/../../.. \ -I${.CURDIR}/../../../contrib \ + -I${.CURDIR}/../../../sys/contrib \ + -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:04:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C688516A405; Wed, 12 Apr 2006 22:04:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CDB816A400 for ; Wed, 12 Apr 2006 22:04:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4742C43D55 for ; Wed, 12 Apr 2006 22:04:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CM4hQf028147 for ; Wed, 12 Apr 2006 22:04:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CM4gAE028144 for perforce@freebsd.org; Wed, 12 Apr 2006 22:04:42 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:04:42 GMT Message-Id: <200604122204.k3CM4gAE028144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:04:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=95094 Change 95094 by jb@jb_freebsd2 on 2006/04/12 22:04:25 Include compatibility headers via '!defined(sun)'. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:06:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2099016A404; Wed, 12 Apr 2006 22:06:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCD3916A403 for ; Wed, 12 Apr 2006 22:06:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CEE843D68 for ; Wed, 12 Apr 2006 22:06:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CM6kVT028321 for ; Wed, 12 Apr 2006 22:06:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CM6jHT028318 for perforce@freebsd.org; Wed, 12 Apr 2006 22:06:45 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:06:45 GMT Message-Id: <200604122206.k3CM6jHT028318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:06:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=95095 Change 95095 by jb@jb_freebsd2 on 2006/04/12 22:05:53 Let FreeBSD's system headers work out the endian order rather than going it the Solaris way. The defined name is the same, so this prevents a redefinition. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 (text) ==== @@ -224,7 +224,9 @@ /* * Define the appropriate "processor characteristics" */ +#if defined(sun) #define _LITTLE_ENDIAN +#endif #define _STACK_GROWS_DOWNWARD #define _LONG_LONG_LTOH #define _BIT_FIELDS_LTOH @@ -288,7 +290,9 @@ /* * Define the appropriate "processor characteristics" */ +#if defined(sun) #define _LITTLE_ENDIAN +#endif #define _STACK_GROWS_DOWNWARD #define _LONG_LONG_LTOH #define _BIT_FIELDS_LTOH @@ -373,7 +377,9 @@ * Define the appropriate "processor characteristics" shared between * all Solaris on SPARC systems. */ +#if defined(sun) #define _BIG_ENDIAN +#endif #define _STACK_GROWS_DOWNWARD #define _LONG_LONG_HTOL #define _BIT_FIELDS_HTOL From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:12:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5303716A404; Wed, 12 Apr 2006 22:12:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E2E616A401; Wed, 12 Apr 2006 22:12:24 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from ns1.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC20443D45; Wed, 12 Apr 2006 22:12:23 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from [192.168.5.6] (dhcp06.vpn.xcllnt.net [192.168.5.6]) by ns1.xcllnt.net (8.13.4/8.13.4) with ESMTP id k3CMCMN1074703; Wed, 12 Apr 2006 15:12:22 -0700 (PDT) (envelope-from marcel@xcllnt.net) In-Reply-To: <200604121202.29736.jhb@freebsd.org> References: <200604121450.k3CEoUJh071640@repoman.freebsd.org> <200604121202.29736.jhb@freebsd.org> Mime-Version: 1.0 (Apple Message framework v749.3) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: <014B1689-1A9A-4AC3-BE76-AF8E35FF0A9C@xcllnt.net> Content-Transfer-Encoding: 7bit From: Marcel Moolenaar Date: Wed, 12 Apr 2006 14:11:16 -0700 To: John Baldwin X-Mailer: Apple Mail (2.749.3) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 95068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:12:24 -0000 On Apr 12, 2006, at 9:02 AM, John Baldwin wrote: > On Wednesday 12 April 2006 10:50, Marcel Moolenaar wrote: >> http://perforce.freebsd.org/chv.cgi?CH=95068 >> >> Change 95068 by marcel@marcel_nfs on 2006/04/12 14:49:30 >> >> Replace the rmask and rval arrays with vendor, device, subvendor >> and subdevice variables. When subvendor is 0xffff, don't test the >> subvendor and subdevice values. This strips 24 bytes from the >> description. >> While here, sort the list on vendor, device, subvendor and >> subdevice. > > I guess you expanded any entries that were using masks other than > 0xffff? (I think there were only a handful if any). Not yet. I looked at the latest pucdata.c in NetBSD and more entries with masks other than 0xffff have been added. While the handful we had looked like mistakes (was 0xfffc, should probably be 0xfffe), the new ones don't. I need to investigate, because if the mask is used as a quick and dirty way to add multiple boards with a single entry then I'm not sure it's a good thing. For different boards, different descriptions are better. In that case I will expand. Otherwise I may end up bringing back the mask. The entries in question have a /* MASK */ comment as a reminder. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:12:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A45416A407; Wed, 12 Apr 2006 22:12:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7889116A401 for ; Wed, 12 Apr 2006 22:12:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31E1A43D45 for ; Wed, 12 Apr 2006 22:12:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CMCsWi030584 for ; Wed, 12 Apr 2006 22:12:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CMCsD9030578 for perforce@freebsd.org; Wed, 12 Apr 2006 22:12:54 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:12:54 GMT Message-Id: <200604122212.k3CMCsD9030578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:12:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=95096 Change 95096 by jb@jb_freebsd2 on 2006/04/12 22:12:39 Generic AVL tree implementation. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:30:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F74316A412; Wed, 12 Apr 2006 22:30:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E483F16A410 for ; Wed, 12 Apr 2006 22:30:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B121A43D46 for ; Wed, 12 Apr 2006 22:30:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CMUFjQ039201 for ; Wed, 12 Apr 2006 22:30:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CMUFRW039193 for perforce@freebsd.org; Wed, 12 Apr 2006 22:30:15 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:30:15 GMT Message-Id: <200604122230.k3CMUFRW039193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:30:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=95097 Change 95097 by jb@jb_freebsd2 on 2006/04/12 22:29:50 Suck the 'C Type Format' sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/libctf.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_decl.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_error.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_types.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_util.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:33:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4228516A407; Wed, 12 Apr 2006 22:33:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 093D516A404 for ; Wed, 12 Apr 2006 22:33:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD53943D6D for ; Wed, 12 Apr 2006 22:33:19 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CMXJgb041914 for ; Wed, 12 Apr 2006 22:33:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CMXJJK041911 for perforce@freebsd.org; Wed, 12 Apr 2006 22:33:19 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:33:19 GMT Message-Id: <200604122233.k3CMXJJK041911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:33:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=95098 Change 95098 by jb@jb_freebsd2 on 2006/04/12 22:32:31 Cast the returned value of strerror() to 'const char *'. On Solaris strerror() returns a const, but on FreeBSD it doesn't although it would make sense to. SUSv3 doesn't declare it with 'const' though, so I guess this is why we don't. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#2 (text) ==== @@ -66,7 +66,7 @@ const char * ctf_strerror(int err) { - return (strerror(err)); + return ((const char *) strerror(err)); } /*PRINTFLIKE1*/ From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:35:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8184D16A408; Wed, 12 Apr 2006 22:35:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48E3516A406 for ; Wed, 12 Apr 2006 22:35:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D466C43D45 for ; Wed, 12 Apr 2006 22:35:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CMZM67043751 for ; Wed, 12 Apr 2006 22:35:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CMZMXd043745 for perforce@freebsd.org; Wed, 12 Apr 2006 22:35:22 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:35:22 GMT Message-Id: <200604122235.k3CMZMXd043745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:35:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=95099 Change 95099 by jb@jb_freebsd2 on 2006/04/12 22:35:18 Only include Solaris system macros on Solaris. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#2 (text) ==== @@ -27,7 +27,9 @@ #pragma ident "@(#)ctf_create.c 1.6 06/01/07 SMI" +#if defined(sun) #include +#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:39:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAE9016A404; Wed, 12 Apr 2006 22:39:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B72816A402 for ; Wed, 12 Apr 2006 22:39:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEF2343D5D for ; Wed, 12 Apr 2006 22:39:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CMdTLG046565 for ; Wed, 12 Apr 2006 22:39:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CMdTH5046559 for perforce@freebsd.org; Wed, 12 Apr 2006 22:39:29 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:39:29 GMT Message-Id: <200604122239.k3CMdTH5046559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:39:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=95101 Change 95101 by jb@jb_freebsd2 on 2006/04/12 22:39:25 Only include Solaris system macros on Solaris. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#2 (text) ==== @@ -32,7 +32,9 @@ #include #include +#if defined(sun) #include +#endif #include #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:41:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 624B316A405; Wed, 12 Apr 2006 22:41:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4085716A401 for ; Wed, 12 Apr 2006 22:41:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECF1E43D45 for ; Wed, 12 Apr 2006 22:41:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CMfWt9048085 for ; Wed, 12 Apr 2006 22:41:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CMfWZ7048077 for perforce@freebsd.org; Wed, 12 Apr 2006 22:41:32 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:41:32 GMT Message-Id: <200604122241.k3CMfWZ7048077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:41:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=95102 Change 95102 by jb@jb_freebsd2 on 2006/04/12 22:41:12 Include a compatibility header via '!defined(sun)'. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#2 (text) ==== @@ -43,6 +43,9 @@ #pragma ident "@(#)ctf_api.h 1.4 05/06/08 SMI" #include +#if !defined(sun) +#include +#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:45:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6404716A407; Wed, 12 Apr 2006 22:45:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39E8916A402 for ; Wed, 12 Apr 2006 22:45:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1A3D43D78 for ; Wed, 12 Apr 2006 22:45:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CMjdsa049614 for ; Wed, 12 Apr 2006 22:45:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CMjc3h049611 for perforce@freebsd.org; Wed, 12 Apr 2006 22:45:38 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:45:38 GMT Message-Id: <200604122245.k3CMjc3h049611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=95103 Change 95103 by jb@jb_freebsd2 on 2006/04/12 22:45:16 Only include Solaris system macros on Solaris. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#2 (text) ==== @@ -27,7 +27,9 @@ #pragma ident "@(#)ctf_lookup.c 1.6 06/01/07 SMI" +#if defined(sun) #include +#endif #include /* From owner-p4-projects@FreeBSD.ORG Wed Apr 12 22:48:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F12216A403; Wed, 12 Apr 2006 22:48:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C07A016A400 for ; Wed, 12 Apr 2006 22:48:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BC9443D45 for ; Wed, 12 Apr 2006 22:48:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CMmhE8049746 for ; Wed, 12 Apr 2006 22:48:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CMmhYC049743 for perforce@freebsd.org; Wed, 12 Apr 2006 22:48:43 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 22:48:43 GMT Message-Id: <200604122248.k3CMmhYC049743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 22:48:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=95104 Change 95104 by jb@jb_freebsd2 on 2006/04/12 22:48:18 The 'C Type Format' library. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:08:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AE3716A402; Wed, 12 Apr 2006 23:08:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DE2B16A400 for ; Wed, 12 Apr 2006 23:08:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0718343D46 for ; Wed, 12 Apr 2006 23:08:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CN8AKN061443 for ; Wed, 12 Apr 2006 23:08:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CN8AIe061440 for perforce@freebsd.org; Wed, 12 Apr 2006 23:08:10 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:08:10 GMT Message-Id: <200604122308.k3CN8AIe061440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:08:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=95106 Change 95106 by jb@jb_freebsd2 on 2006/04/12 23:07:34 Message sources that are read by 'sgsmsg' to generate msg.c and msg.h for libelf. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/libelf.32.msg#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/libelf.msg#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:21:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CA7416A405; Wed, 12 Apr 2006 23:21:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C0D516A401 for ; Wed, 12 Apr 2006 23:21:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BC2643D5C for ; Wed, 12 Apr 2006 23:21:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNL1Rs069898 for ; Wed, 12 Apr 2006 23:21:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNL063069867 for perforce@freebsd.org; Wed, 12 Apr 2006 23:21:00 GMT (envelope-from imp@freebsd.org) Date: Wed, 12 Apr 2006 23:21:00 GMT Message-Id: <200604122321.k3CNL063069867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=95107 Change 95107 by imp@imp_harmony on 2006/04/12 23:19:44 IFC @95102 Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/arm/src/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#9 integrate .. //depot/projects/arm/src/sys/arm/arm/undefined.c#8 integrate .. //depot/projects/arm/src/sys/arm/at91/at91.c#15 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#14 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_usartreg.h#7 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#49 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#22 integrate .. //depot/projects/arm/src/sys/arm/include/pmap.h#7 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/lib.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/lib.h#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/xmodem.c#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/xmodem.h#1 branch .. //depot/projects/arm/src/sys/boot/arm/at91/inc/AT91RM9200.h#1 branch .. //depot/projects/arm/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/arm/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/Makefile#5 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/arm/src/sys/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/arm/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/gatea20.c#3 delete .. //depot/projects/arm/src/sys/conf/files#24 integrate .. //depot/projects/arm/src/sys/conf/options#17 integrate .. //depot/projects/arm/src/sys/conf/options.arm#7 integrate .. //depot/projects/arm/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#9 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/amr/amrvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/arm/src/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/arm/src/sys/dev/drm/drm-preprocess.sh#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm.h#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drv.h#4 integrate .. //depot/projects/arm/src/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drm.h#4 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_state.c#6 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_ds.c#4 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_ds.h#4 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_mm.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/arm/src/sys/dev/em/README#4 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#17 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.h#5 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/arm/src/sys/dev/safe/safe.c#3 integrate .. //depot/projects/arm/src/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/arm/src/sys/geom/geom.h#3 integrate .. //depot/projects/arm/src/sys/geom/geom_bsd.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/arm/src/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_disk.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_slice.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.h#8 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror_ctl.c#6 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#14 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.h#8 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/arm/src/sys/i386/i386/io_apic.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/arm/src/sys/i386/isa/npx.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_event.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/arm/src/sys/kern/uipc_proto.c#3 integrate .. //depot/projects/arm/src/sys/modules/bce/Makefile#1 branch .. //depot/projects/arm/src/sys/net/if_arc.h#3 integrate .. //depot/projects/arm/src/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/arm/src/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/arm/src/sys/netinet6/frag6.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_output.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/arm/src/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/arm/src/sys/netipsec/xform_esp.c#5 integrate .. //depot/projects/arm/src/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/arm/src/sys/netnatm/natm.c#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/arm/src/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/arm/src/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/arm/src/sys/posix4/ksched.c#2 integrate .. //depot/projects/arm/src/sys/posix4/p1003_1b.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/arm/src/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/arm/src/sys/sys/filedesc.h#3 integrate .. //depot/projects/arm/src/sys/sys/mac.h#3 integrate .. //depot/projects/arm/src/sys/sys/mac_policy.h#3 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#5 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.h#2 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/pmap.c#6 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.188 2006/04/03 21:16:07 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.189 2006/04/12 04:22:50 alc Exp $"); #include #include @@ -696,22 +696,7 @@ * Low level helper routines..... ***************************************************/ - - /* - * this routine defines the region(s) of memory that should - * not be tested for the modified bit. - */ -static PMAP_INLINE int -pmap_track_modified(vm_offset_t va) -{ - if ((va < kmi.clean_sva) || (va >= kmi.clean_eva)) - return 1; - else - return 0; -} - -/* * Routine: pmap_extract * Function: * Extract the physical page address associated @@ -1346,10 +1331,8 @@ ("get_pv_entry: wired pte %#lx", tpte)); if ((tpte & PG_FOR) == 0) vm_page_flag_set(m, PG_REFERENCED); - if ((tpte & PG_FOW) == 0) { - if (pmap_track_modified(va)) - vm_page_dirty(m); - } + if ((tpte & PG_FOW) == 0) + vm_page_dirty(m); pmap_invalidate_page(pmap, va); TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -1449,10 +1432,8 @@ pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(pmap_pte_pa(&oldpte)); - if ((oldpte & PG_FOW) == 0) { - if (pmap_track_modified(va)) - vm_page_dirty(m); - } + if ((oldpte & PG_FOW) == 0) + vm_page_dirty(m); if ((oldpte & PG_FOR) == 0) vm_page_flag_set(m, PG_REFERENCED); return pmap_remove_entry(pmap, m, va); @@ -1581,10 +1562,8 @@ /* * Update the vm_page_t clean and reference bits. */ - if ((tpte & PG_FOW) == 0) { - if (pmap_track_modified(pv->pv_va)) - vm_page_dirty(m); - } + if ((tpte & PG_FOW) == 0) + vm_page_dirty(m); if ((tpte & PG_FOR) == 0) vm_page_flag_set(m, PG_REFERENCED); @@ -1666,8 +1645,7 @@ if ((oldpte & PG_FOW) == 0) { if (m == NULL) m = PHYS_TO_VM_PAGE(pmap_pte_pa(pte)); - if (pmap_track_modified(sva)) - vm_page_dirty(m); + vm_page_dirty(m); oldpte |= PG_FOW; } oldpte = (oldpte & ~PG_PROT) | newprot; @@ -1763,8 +1741,7 @@ * so we go ahead and sense modify status. */ if (origpte & PG_MANAGED) { - if ((origpte & PG_FOW) != PG_FOW - && pmap_track_modified(va)) + if ((origpte & PG_FOW) != PG_FOW) vm_page_dirty(m); } @@ -1788,6 +1765,8 @@ * called at interrupt time. */ if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva, + ("pmap_enter: managed mapping within the clean submap")); pmap_insert_entry(pmap, va, mpte, m); managed |= PG_MANAGED; } @@ -1850,6 +1829,9 @@ register pt_entry_t *pte; int managed; + KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || + (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, + ("pmap_enter_quick: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); @@ -2168,8 +2150,7 @@ pmap->pm_stats.resident_count--; if ((tpte & PG_FOW) == 0) - if (pmap_track_modified(pv->pv_va)) - vm_page_dirty(m); + vm_page_dirty(m); npv = TAILQ_NEXT(pv, pv_plist); TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); @@ -2209,14 +2190,6 @@ * setting RO do we need to clear the VAC? */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - /* - * don't write protect pager mappings - */ - if (!setem && bit == (PG_UWE|PG_KWE)) { - if (!pmap_track_modified(pv->pv_va)) - continue; - } - PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); ==== //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -89,6 +89,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -207,9 +208,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -226,9 +225,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -313,6 +310,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.543 2006/04/04 20:17:35 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.544 2006/04/12 04:22:50 alc Exp $"); /* * Manages physical address maps. @@ -619,20 +619,6 @@ * Low level helper routines..... ***************************************************/ - -/* - * this routine defines the region(s) of memory that should - * not be tested for the modified bit. - */ -static PMAP_INLINE int -pmap_track_modified(vm_offset_t va) -{ - if ((va < kmi.clean_sva) || (va >= kmi.clean_eva)) - return 1; - else - return 0; -} - #ifdef SMP /* * For SMP, these functions have to use the IPI mechanism for coherence. @@ -1532,8 +1518,7 @@ KASSERT((tpte & PG_RW), ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", va, tpte)); - if (pmap_track_modified(va)) - vm_page_dirty(m); + vm_page_dirty(m); } pmap_invalidate_page(pmap, va); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -1751,8 +1736,7 @@ KASSERT((oldpte & PG_RW), ("pmap_remove_pte: modified page not writable: va: %#lx, pte: %#lx", va, oldpte)); - if (pmap_track_modified(va)) - vm_page_dirty(m); + vm_page_dirty(m); } if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); @@ -1940,8 +1924,7 @@ KASSERT((tpte & PG_RW), ("pmap_remove_all: modified page not writable: va: %#lx, pte: %#lx", pv->pv_va, tpte)); - if (pmap_track_modified(pv->pv_va)) - vm_page_dirty(m); + vm_page_dirty(m); } pmap_invalidate_page(pmap, pv->pv_va); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -2030,8 +2013,7 @@ vm_page_flag_set(m, PG_REFERENCED); pbits &= ~PG_A; } - if ((pbits & PG_M) != 0 && - pmap_track_modified(sva)) { + if ((pbits & PG_M) != 0) { if (m == NULL) m = PHYS_TO_VM_PAGE(pbits & PG_FRAME); @@ -2182,6 +2164,8 @@ * Enter on the PV list if part of our managed memory. */ if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva, + ("pmap_enter: managed mapping within the clean submap")); pmap_insert_entry(pmap, va, m); pa |= PG_MANAGED; } @@ -2227,8 +2211,7 @@ KASSERT((origpte & PG_RW), ("pmap_enter: modified page not writable: va: %#lx, pte: %#lx", va, origpte)); - if ((origpte & PG_MANAGED) && - pmap_track_modified(va)) + if ((origpte & PG_MANAGED) != 0) vm_page_dirty(om); if ((newpte & PG_RW) == 0) invlva = TRUE; @@ -2258,6 +2241,9 @@ pt_entry_t *pte; vm_paddr_t pa; + KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || + (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, + ("pmap_enter_quick: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); @@ -2836,13 +2822,6 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - /* - * if the bit being tested is the modified bit, then - * mark clean_map and ptes as never - * modified. - */ - if (!pmap_track_modified(pv->pv_va)) - continue; pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); @@ -2898,14 +2877,6 @@ * setting RO do we need to clear the VAC? */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - /* - * don't write protect pager mappings - */ - if (bit == PG_RW) { - if (!pmap_track_modified(pv->pv_va)) - continue; - } - pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); @@ -2983,9 +2954,6 @@ TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - if (!pmap_track_modified(pv->pv_va)) - continue; - pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); ==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#9 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.451 2006/03/31 23:04:48 emax Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.452 2006/04/10 20:04:22 ps Exp $ cpu HAMMER ident GENERIC @@ -192,6 +192,7 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes ==== //depot/projects/arm/src/sys/arm/arm/cpufunc.c#7 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.9 2005/05/25 13:46:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.10 2006/04/09 23:07:31 cognet Exp $"); #include ==== //depot/projects/arm/src/sys/arm/arm/swtch.S#6 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.18 2005/10/04 20:47:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.19 2006/04/09 20:16:47 cognet Exp $"); /* @@ -467,7 +467,7 @@ bl _C_LABEL(fork_exit) /* Kill irq"s */ mrs r0, cpsr - orr r0, r0, #(I32_bit) + orr r0, r0, #(I32_bit|F32_bit) msr cpsr_c, r0 DO_AST PULLFRAME ==== //depot/projects/arm/src/sys/arm/arm/trap.c#9 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.23 2006/03/01 20:43:51 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.24 2006/04/09 20:16:47 cognet Exp $"); #include @@ -271,9 +271,13 @@ /* Grab the current pcb */ pcb = td->td_pcb; /* Re-enable interrupts if they were enabled previously */ - if (td->td_md.md_spinlock_count == 0 && - __predict_true(tf->tf_spsr & I32_bit) == 0) - enable_interrupts(I32_bit); + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(tf->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(tf->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + /* Invoke the appropriate handler, if necessary */ if (__predict_false(data_aborts[fsr & FAULT_TYPE_MASK].func != NULL)) { @@ -487,6 +491,7 @@ mode = TRAP_USERMODE(tf) ? "user" : "kernel"; + disable_interrupts(I32_bit|F32_bit); if (td != NULL) { printf("Fatal %s mode data abort: '%s'\n", mode, data_aborts[fsr & FAULT_TYPE_MASK].desc); @@ -730,9 +735,13 @@ thread_user_enter(td); } fault_pc = tf->tf_pc; - if (td->td_md.md_spinlock_count == 0 && - __predict_true((tf->tf_spsr & I32_bit) == 0)) - enable_interrupts(I32_bit); + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(tf->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(tf->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + /* See if the cpu state needs to be fixed up */ @@ -1012,9 +1021,13 @@ * Since all syscalls *should* come from user mode it will always * be safe to enable them, but check anyway. */ - if (td->td_md.md_spinlock_count == 0 && !(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); - + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(frame->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(frame->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + syscall(td, frame, insn); } ==== //depot/projects/arm/src/sys/arm/arm/undefined.c#8 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.12 2006/03/01 18:33:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.13 2006/04/09 20:16:47 cognet Exp $"); #include #include @@ -189,7 +189,7 @@ /* Enable interrupts if they were enabled before the exception. */ if (!(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); + enable_interrupts(I32_bit|F32_bit); frame->tf_pc -= INSN_SIZE; PCPU_LAZY_INC(cnt.v_trap); ==== //depot/projects/arm/src/sys/arm/at91/at91.c#15 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.3 2006/03/18 01:35:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.4 2006/04/06 04:32:29 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.2 2006/04/06 04:31:19 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_usartreg.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.2 2006/04/06 04:29:24 imp Exp $ */ #ifndef AT91USARTREG_H_ #define AT91USARTREG_H_ ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#49 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.5 2006/03/18 01:43:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.6 2006/04/06 04:30:23 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#22 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.3 2006/03/22 21:16:09 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.5 2006/04/06 20:47:54 cognet Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/include/pmap.h#7 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.15 2006/03/01 23:04:25 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.16 2006/04/09 20:03:03 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/arm/src/sys/arm/sa11x0/uart_dev_sa1110.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.2 2005/01/05 21:58:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.3 2006/04/06 20:47:54 cognet Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_timer.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_timer.c,v 1.9 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_timer.c,v 1.10 2006/04/06 17:11:08 cognet Exp $"); #include #include @@ -76,6 +76,11 @@ static uint32_t counts_per_hz; +#ifdef XSCALE_DISABLE_CCNT +static uint32_t offset; +static uint32_t last = -1; +#endif + static int ticked = 0; #ifndef COUNTS_PER_SEC @@ -88,7 +93,11 @@ i80321_timer_get_timecount, /* get_timecount */ NULL, /* no poll_pps */ ~0u, /* counter_mask */ +#ifdef XSCALE_DISABLE_CCNT + COUNTS_PER_SEC, +#else COUNTS_PER_SEC * 3, /* frequency */ +#endif "i80321 timer", /* name */ 1000 /* quality */ }; @@ -241,11 +250,26 @@ static unsigned i80321_timer_get_timecount(struct timecounter *tc) { +#ifdef XSCALE_DISABLE_CCNT + uint32_t cur = tcr0_read(); + + if (cur > last && last != -1) { + offset += counts_per_hz; + if (ticked > 0) + ticked--; + } + if (ticked) { + offset += ticked * counts_per_hz; + ticked = 0; + } + return (counts_per_hz - cur + offset); +#else uint32_t ret; __asm __volatile("mrc p14, 0, %0, c1, c0, 0\n" : "=r" (ret)); return (ret); +#endif } /* @@ -327,12 +351,14 @@ tc_init(&i80321_timer_timecounter); restore_interrupts(oldirqstate); rid = 0; +#ifndef XSCALE_DISABLE_CCNT /* Enable the clock count register. */ __asm __volatile("mrc p14, 0, %0, c0, c0, 0\n" : "=r" (rid)); rid &= ~(1 << 3); rid |= (1 << 2) | 1; __asm __volatile("mcr p14, 0, %0, c0, c0, 0\n" : : "r" (rid)); +#endif } ==== //depot/projects/arm/src/sys/boot/i386/boot2/boot1.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.30 2004/08/28 08:32:23 yar Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.31 2006/04/11 20:09:42 jhb Exp $ */ /* Memory Locations */ @@ -212,8 +212,7 @@ jnz seta20.2 # Yes movb $0xdf,%al # Enable outb %al,$0x60 # A20 -seta20.3: - sti # Enable interrupts +seta20.3: sti # Enable interrupts jmp start+MEM_JMP-MEM_ORG # Start BTX ==== //depot/projects/arm/src/sys/boot/i386/cdboot/cdboot.s#2 (text+ko) ==== @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.13 2004/06/22 21:55:22 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.16 2006/04/11 17:36:08 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -400,7 +400,7 @@ ff.checkname: lea DIR_NAME(%bx),%di # Address name in record push %si # Save repe cmpsb # Compare name - jcxz ff.match # We have a winner! + je ff.match # We have a winner! pop %si # Restore jmp ff.nextrec # Keep looking. ff.match: add $2,%sp # Discard saved %si @@ -485,10 +485,17 @@ ret # -# Enable A20 +# Enable A20. Put an upper limit on the amount of time we wait for the +# keyboard controller to get ready (65K x ISA access time). If +# we wait more than that amount, the hardware is probably +# legacy-free and simply doesn't have a keyboard controller. +# Thus, the A20 line is already enabled. # seta20: cli # Disable interrupts -seta20.1: in $0x64,%al # Get status + xor %cx,%cx # Clear +seta20.1: inc %cx # Increment, overflow? + jz seta20.3 # Yes + in $0x64,%al # Get status test $0x2,%al # Busy? jnz seta20.1 # Yes mov $0xd1,%al # Command: Write @@ -498,7 +505,7 @@ jnz seta20.2 # Yes mov $0xdf,%al # Enable out %al,$0x60 # A20 - sti # Enable interrupts +seta20.3: sti # Enable interrupts ret # To caller # ==== //depot/projects/arm/src/sys/boot/i386/libi386/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.41 2006/03/14 19:02:00 jkim Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.42 2006/04/11 20:11:30 jhb Exp $ # LIB= i386 INTERNALLIB= @@ -6,7 +6,7 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ comconsole.c devicename.c elf32_freebsd.c \ - elf64_freebsd.c gatea20.c \ + elf64_freebsd.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ smbios.c time.c vidconsole.c amd64_tramp.S ==== //depot/projects/arm/src/sys/boot/i386/libi386/libi386.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.24 2006/03/09 22:49:44 jkim Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.25 2006/04/11 20:11:30 jhb Exp $ */ @@ -104,8 +104,6 @@ void smbios_detect(void); -void gateA20(void); - int i386_autoload(void); int bi_getboothowto(char *kargs); ==== //depot/projects/arm/src/sys/boot/i386/pxeldr/pxeldr.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.13 2004/05/14 20:29:30 ru Exp $ + * $FreeBSD: src/sys/boot/i386/pxeldr/pxeldr.S,v 1.14 2006/04/11 20:53:49 sobomax Exp $ */ /* @@ -227,10 +227,17 @@ jmp putstr # keep looping /* - * Enable A20 + * Enable A20. Put an upper limit on the amount of time we wait for the + * keyboard controller to get ready (65K x ISA access time). If + * we wait more than that amount, the hardware is probably + * legacy-free and simply doesn't have a keyboard controller. + * Thus, the A20 line is already enabled. */ seta20: cli # Disable interrupts -seta20.1: inb $0x64,%al # Get status + xor %cx,%cx # Clear +seta20.1: inc %cx # Increment, overflow? + jz seta20.3 # Yes + inb $0x64,%al # Get status testb $0x2,%al # Busy? jnz seta20.1 # Yes movb $0xd1,%al # Command: Write @@ -240,7 +247,7 @@ jnz seta20.2 # Yes movb $0xdf,%al # Enable outb %al,$0x60 # A20 - sti # Enable interrupts +seta20.3: sti # Enable interrupts retw # To caller /* ==== //depot/projects/arm/src/sys/boot/pc98/libpc98/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.23 2005/12/20 08:54:30 sobomax Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.24 2006/04/11 20:11:30 jhb Exp $ # LIB= pc98 INTERNALLIB= @@ -7,7 +7,7 @@ SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \ bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \ - gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ + i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c BOOT_COMCONSOLE_PORT?= 0x238 ==== //depot/projects/arm/src/sys/conf/files#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1107 2006/03/30 21:39:36 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1108 2006/04/10 20:04:21 ps Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -475,6 +475,7 @@ dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi pccard +dev/bce/if_bce.c optional bce dev/bfe/if_bfe.c optional bfe dev/bge/if_bge.c optional bge dev/bktr/bktr_audio.c optional bktr pci ==== //depot/projects/arm/src/sys/conf/options#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.533 2006/04/03 18:14:01 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.534 2006/04/10 20:04:21 ps Exp $ # # On the handling of kernel options # @@ -636,6 +636,9 @@ ED_3C503 opt_ed.h ED_SIC opt_ed.h +# bce driver +BCE_DEBUG opt_bce.h + # bge driver BGE_FAKE_AUTONEG opt_bge.h >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:22:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 502EB16A404; Wed, 12 Apr 2006 23:22:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17A0916A402 for ; Wed, 12 Apr 2006 23:22:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7C5A43D98 for ; Wed, 12 Apr 2006 23:22:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNM32Y070652 for ; Wed, 12 Apr 2006 23:22:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNM2UA070646 for perforce@freebsd.org; Wed, 12 Apr 2006 23:22:02 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:22:02 GMT Message-Id: <200604122322.k3CNM2UA070646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:22:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=95108 Change 95108 by jb@jb_freebsd2 on 2006/04/12 23:21:01 Suck (some) libelf sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/ar.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/begin.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/checksum.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/clscook.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/cntl.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/cook.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/data.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/decl.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/end.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/error.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/fill.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/flag.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/gelf.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getarhdr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getarsym.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getbase.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getdata.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getehdr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getident.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getphdr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getscn.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getshdr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getshnum.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getshstrndx.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/hash.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/input.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/kind.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/member.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/ndxscn.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newdata.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newehdr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newphdr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newscn.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/next.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/nextscn.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/output.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rand.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawdata.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawfile.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawput.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/strptr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/syn.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/xlate.m4#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/xlate64.m4#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:22:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB91016A409; Wed, 12 Apr 2006 23:22:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 89C5016A407 for ; Wed, 12 Apr 2006 23:22:20 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 156D343DA0 for ; Wed, 12 Apr 2006 23:22:03 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNM32v070661 for ; Wed, 12 Apr 2006 23:22:03 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNM3bq070655 for perforce@freebsd.org; Wed, 12 Apr 2006 23:22:03 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 12 Apr 2006 23:22:03 GMT Message-Id: <200604122322.k3CNM3bq070655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 95109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:22:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=95109 Change 95109 by soc-andrew@soc-andrew_serv on 2006/04/12 23:21:45 Use the net/luasocket and devel/lua50-posix (PR 94987) packages rather than the local version Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#41 edit .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#9 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#41 (text+ko) ==== @@ -340,6 +340,9 @@ CVS_PORTSARGS+= -r ${PORTSRELEASETAG} .endif +PACKAGE_SITE?= ftp://ftp.freebsd.org +PACKAGE_DIR?= pub/FreeBSD/ports/${MACHINE_ARCH}/packages-7-current/Latest + WORLDDIR?= ${.CURDIR}/.. release rerelease: @@ -495,6 +498,8 @@ NO_CPU_CFLAGS \ NO_CPU_COPTFLAGS \ NO_FLOPPIES \ + PACKAGE_DIR \ + PACKAGE_SITE \ RELEASETAG \ RELNOTES_LANG \ SEPARATE_LIVEFS \ @@ -821,11 +826,24 @@ @cp -Rp ${RD}/kernels/GENERIC/ ${RD}/bsdinstaller/root/boot/kernel # Install Lua into the package root - # XXX Make the ftp site changeable ( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/lua.tbz \ - ftp://ftp.freebsd.org/pub/FreeBSD/ports/${MACHINE_ARCH}/packages-7-current/Latest/lua.tbz && \ - pkg_add -R -P ${RD}/bsdinstaller/root/usr/local ${RD}/bsdinstaller/lua.tbz ) + ${PACKAGE_SITE}/${PACKAGE_DIR}/lua.tbz && \ + pkg_add -R -P ${RD}/bsdinstaller/root/usr/local \ + ${RD}/bsdinstaller/lua.tbz ) rm ${RD}/bsdinstaller/lua.tbz + + ( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/luasocket.tbz \ + ${PACKAGE_SITE}/${PACKAGE_DIR}/luasocket.tbz && \ + pkg_add -R -P ${RD}/bsdinstaller/root/usr/local \ + ${RD}/bsdinstaller/luasocket.tbz ) + rm ${RD}/bsdinstaller/luasocket.tbz + + ( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/lua50-posix-5.0.tbz \ + ${PACKAGE_SITE}/${PACKAGE_DIR}/lua50-posix-5.0.tbz && \ + pkg_add -R -P ${RD}/bsdinstaller/root/usr/local \ + ${RD}/bsdinstaller/lua50-posix-5.0.tbz ) + rm ${RD}/bsdinstaller/lua50-posix-5.0.tbz + # Reset the library directories ldconfig /lib /usr/lib /usr/lib/compat /usr/local/lib ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#9 (text+ko) ==== @@ -13,7 +13,7 @@ /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then - LD_PRELOAD="/usr/local/lib/liblua.so;/usr/local/lib/liblualib.so;/usr/lib/libm.so" LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true + LD_PRELOAD="/usr/local/lib/liblua.so;/usr/local/lib/liblualib.so;/usr/lib/libm.so" LUA_PATH="/usr/local/share/lua/5.0/?.lua;/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH="/usr/local/lib/lua/5.0/?.so;/usr/lib/lua/?.so" LUA_SOPATH=/usr/local/lib/lua/5.0/ lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true #/usr/sbin/bsd_installer_be if [ $? -eq 5 ] then From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:25:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FA6216A409; Wed, 12 Apr 2006 23:25:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E46E16A402 for ; Wed, 12 Apr 2006 23:25:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBD9943D77 for ; Wed, 12 Apr 2006 23:25:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNP7ht072085 for ; Wed, 12 Apr 2006 23:25:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNP7jx072082 for perforce@freebsd.org; Wed, 12 Apr 2006 23:25:07 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:25:07 GMT Message-Id: <200604122325.k3CNP7jx072082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:25:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=95110 Change 95110 by jb@jb_freebsd2 on 2006/04/12 23:24:15 Only include Solaris' thread.h on Solaris. Everyone else gets a compatibility header. Note to self: Remember to yell at Sun for coding non-POSIX. Grumble. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/decl.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/decl.h#2 (text) ==== @@ -32,7 +32,11 @@ #pragma ident "@(#)decl.h 1.21 06/03/22 SMI" /* SVr4.0 1.9 */ +#if defined(sun) #include +#else +#include +#endif #include #include <_libelf.h> #include From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:28:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2AD316A406; Wed, 12 Apr 2006 23:28:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70D6D16A400 for ; Wed, 12 Apr 2006 23:28:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D36743D45 for ; Wed, 12 Apr 2006 23:28:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNSCf9072247 for ; Wed, 12 Apr 2006 23:28:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNSBbq072244 for perforce@freebsd.org; Wed, 12 Apr 2006 23:28:11 GMT (envelope-from imp@freebsd.org) Date: Wed, 12 Apr 2006 23:28:11 GMT Message-Id: <200604122328.k3CNSBbq072244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:28:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=95111 Change 95111 by imp@imp_hammer on 2006/04/12 23:27:21 More or less stock ramMonitor that ships with Kwikbyte KB920x boards. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/Makefile#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/arm_init.s#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/array_bytes.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/at91rm9200_lowlevel.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/at91rm9200_lowlevel.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/debug_io.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/debug_io.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/eeprom.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/eeprom.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/emac.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/emac.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/flash.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/flash.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/irda.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/lcd.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/lcd.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/led.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/led.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/linker.cfg#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/main.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/ohci.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/p_string.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/p_string.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/processor.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/processor.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/prompt.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/prompt.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/spi_flash.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/spi_flash.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/stage1.bin#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/test_uhp.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/twsi.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/xmodem.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/ramMonitor/xmodem.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:28:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E62C416A446; Wed, 12 Apr 2006 23:28:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7C4C16A401 for ; Wed, 12 Apr 2006 23:28:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7593E43D45 for ; Wed, 12 Apr 2006 23:28:12 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNSCf4072253 for ; Wed, 12 Apr 2006 23:28:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNSCGi072250 for perforce@freebsd.org; Wed, 12 Apr 2006 23:28:12 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:28:12 GMT Message-Id: <200604122328.k3CNSCGi072250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95112 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:28:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=95112 Change 95112 by jb@jb_freebsd2 on 2006/04/12 23:27:30 A few definitions here clash with FreeBSD's definitions in sys/link_elf.h For the time being preprocess out the ones in OpenSolaris. This will need to be revisited later. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/link.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/link.h#2 (text) ==== @@ -422,6 +422,7 @@ typedef struct link_map Link_map; +#if !defined(__FreeBSD__) struct link_map { unsigned long l_addr; /* address at which object is mapped */ char *l_name; /* full name of loaded object */ @@ -434,6 +435,7 @@ Link_map *l_prev; /* previous link object */ char *l_refname; /* filters reference name */ }; +#endif #ifdef _SYSCALL32 typedef struct link_map32 Link_map32; @@ -448,11 +450,13 @@ }; #endif +#if !defined(__FreeBSD__) typedef enum { RT_CONSISTENT, RT_ADD, RT_DELETE } r_state_e; +#endif typedef enum { RD_FL_NONE = 0, /* no flags */ @@ -473,6 +477,7 @@ RD_DLACTIVITY /* a dlopen or dlclose has happened */ } rd_event_e; +#if !defined(__FreeBSD__) struct r_debug { int r_version; /* debugging info version no. */ Link_map *r_map; /* address of link_map */ @@ -483,6 +488,7 @@ rd_event_e r_rdevent; /* debug event */ rd_flags_e r_flags; /* misc flags. */ }; +#endif #ifdef _SYSCALL32 struct r_debug32 { From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:29:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A031F16A40B; Wed, 12 Apr 2006 23:29:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8065F16A405 for ; Wed, 12 Apr 2006 23:29:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36B1443D46 for ; Wed, 12 Apr 2006 23:29:14 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNTEdG072361 for ; Wed, 12 Apr 2006 23:29:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNTDjV072358 for perforce@freebsd.org; Wed, 12 Apr 2006 23:29:13 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:29:13 GMT Message-Id: <200604122329.k3CNTDjV072358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:29:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=95113 Change 95113 by jb@jb_freebsd2 on 2006/04/12 23:29:08 Include a compatibility header via '!defined(sun)'. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#2 (text) ==== @@ -29,6 +29,9 @@ #pragma ident "@(#)gelf.h 1.14 05/06/08 SMI" +#if !defined(sun) +#include +#endif #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:34:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83AC116A405; Wed, 12 Apr 2006 23:34:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4CE5E16A401 for ; Wed, 12 Apr 2006 23:34:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D35A743D49 for ; Wed, 12 Apr 2006 23:34:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNYK43076061 for ; Wed, 12 Apr 2006 23:34:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNYKr9076055 for perforce@freebsd.org; Wed, 12 Apr 2006 23:34:20 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:34:20 GMT Message-Id: <200604122334.k3CNYKr9076055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95114 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:34:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=95114 Change 95114 by jb@jb_freebsd2 on 2006/04/12 23:34:07 Include a compatibility header via '!defined(sun)' Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/input.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/input.c#2 (text) ==== @@ -42,6 +42,9 @@ #include "decl.h" #include "msg.h" +#if !defined(sun) +#include +#endif /* * File input From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:36:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60B9D16A409; Wed, 12 Apr 2006 23:36:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4154B16A401 for ; Wed, 12 Apr 2006 23:36:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0D3D43D46 for ; Wed, 12 Apr 2006 23:36:23 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNaNWX077765 for ; Wed, 12 Apr 2006 23:36:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNaNkH077759 for perforce@freebsd.org; Wed, 12 Apr 2006 23:36:23 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:36:23 GMT Message-Id: <200604122336.k3CNaNkH077759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:36:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=95115 Change 95115 by jb@jb_freebsd2 on 2006/04/12 23:36:18 Solaris still uses malloc.h. We use stdlib.h. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#2 (text) ==== @@ -36,7 +36,11 @@ #include "syn.h" #include +#if defined(sun) #include +#else +#include +#endif #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:38:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14D8C16A405; Wed, 12 Apr 2006 23:38:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E860816A400 for ; Wed, 12 Apr 2006 23:38:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A259A43D45 for ; Wed, 12 Apr 2006 23:38:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNcQiY079182 for ; Wed, 12 Apr 2006 23:38:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNcQkK079179 for perforce@freebsd.org; Wed, 12 Apr 2006 23:38:26 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:38:26 GMT Message-Id: <200604122338.k3CNcQkK079179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:38:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=95116 Change 95116 by jb@jb_freebsd2 on 2006/04/12 23:38:00 Include a compatibility header instead of Solaris' non-POSIX thread.h. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/error.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/error.c#2 (text) ==== @@ -31,7 +31,11 @@ #pragma weak elf_errno = _elf_errno #include "syn.h" +#if defined(sun) #include +#else +#include +#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 12 23:41:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9389916A40A; Wed, 12 Apr 2006 23:41:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B4BA16A403 for ; Wed, 12 Apr 2006 23:41:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20D1B43D5C for ; Wed, 12 Apr 2006 23:41:31 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3CNfUcF081426 for ; Wed, 12 Apr 2006 23:41:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNfUOi081420 for perforce@freebsd.org; Wed, 12 Apr 2006 23:41:30 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Apr 2006 23:41:30 GMT Message-Id: <200604122341.k3CNfUOi081420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 23:41:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=95117 Change 95117 by jb@jb_freebsd2 on 2006/04/12 23:41:07 Fix a return type. gcc treats NULL as a different type to (int) 0. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/gelf.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/gelf.c#2 (text) ==== @@ -271,7 +271,7 @@ return (0); if (elf_getphnum(elf, &phnum) == 0) - return (NULL); + return (0); if (phnum < ndx) { _elf_seterr(EREQ_RAND, 0); From owner-p4-projects@FreeBSD.ORG Thu Apr 13 00:06:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04ABB16A408; Thu, 13 Apr 2006 00:06:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCE9E16A406 for ; Thu, 13 Apr 2006 00:06:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E4C143D45 for ; Thu, 13 Apr 2006 00:06:01 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D060j6094635 for ; Thu, 13 Apr 2006 00:06:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D060E0094632 for perforce@freebsd.org; Thu, 13 Apr 2006 00:06:00 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 00:06:00 GMT Message-Id: <200604130006.k3D060E0094632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 00:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=95118 Change 95118 by jb@jb_freebsd2 on 2006/04/13 00:05:23 Suck (more) libelf sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/String.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/String.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/args.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/demangle.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/elf_dem.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/nlist.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/nplist.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 00:07:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C1EE16A408; Thu, 13 Apr 2006 00:07:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C6BB16A402 for ; Thu, 13 Apr 2006 00:07:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C601043D66 for ; Thu, 13 Apr 2006 00:07:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D072XB094659 for ; Thu, 13 Apr 2006 00:07:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D072WL094656 for perforce@freebsd.org; Thu, 13 Apr 2006 00:07:02 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 00:07:02 GMT Message-Id: <200604130007.k3D072WL094656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 00:07:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=95119 Change 95119 by jb@jb_freebsd2 on 2006/04/13 00:06:24 Solaris uses malloc.h. We use stdlib.h. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/String.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/String.c#2 (text) ==== @@ -39,7 +39,11 @@ #include #include #include +#if defined(sun) #include +#else +#include +#endif #include "elf_dem.h" #include "String.h" From owner-p4-projects@FreeBSD.ORG Thu Apr 13 00:09:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 143AD16A404; Thu, 13 Apr 2006 00:09:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8BCB16A401 for ; Thu, 13 Apr 2006 00:09:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A198D43D48 for ; Thu, 13 Apr 2006 00:09:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D0959i094707 for ; Thu, 13 Apr 2006 00:09:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D095vb094704 for perforce@freebsd.org; Thu, 13 Apr 2006 00:09:05 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 00:09:05 GMT Message-Id: <200604130009.k3D095vb094704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 00:09:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=95120 Change 95120 by jb@jb_freebsd2 on 2006/04/13 00:09:00 More Solaris POSIX incompatibility. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/demangle.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/demangle.c#2 (text) ==== @@ -33,7 +33,11 @@ #include #include #include +#if defined(sun) #include +#else +#include +#endif #include #include "elf_dem.h" #include "String.h" From owner-p4-projects@FreeBSD.ORG Thu Apr 13 00:14:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32F7516A402; Thu, 13 Apr 2006 00:14:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBA8A16A407 for ; Thu, 13 Apr 2006 00:14:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E32B43D46 for ; Thu, 13 Apr 2006 00:14:12 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D0ECHo098043 for ; Thu, 13 Apr 2006 00:14:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D0EClW098034 for perforce@freebsd.org; Thu, 13 Apr 2006 00:14:12 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 00:14:12 GMT Message-Id: <200604130014.k3D0EClW098034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 00:14:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=95121 Change 95121 by jb@jb_freebsd2 on 2006/04/13 00:14:08 A couple of extra common headers which allow Solaris code to compile. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/head/nlist.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/head/storclass.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 00:17:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B70B16A401; Thu, 13 Apr 2006 00:17:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE91516A403 for ; Thu, 13 Apr 2006 00:17:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A66EB43D46 for ; Thu, 13 Apr 2006 00:17:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D0HGk0000517 for ; Thu, 13 Apr 2006 00:17:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D0HGbR000514 for perforce@freebsd.org; Thu, 13 Apr 2006 00:17:16 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 00:17:16 GMT Message-Id: <200604130017.k3D0HGbR000514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 00:17:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=95122 Change 95122 by jb@jb_freebsd2 on 2006/04/13 00:16:18 Solaris uses malloc.h. We use stdlib.h. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/elf_dem.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/elf_dem.h#2 (text) ==== @@ -70,7 +70,11 @@ #else /* defined(ELF) */ +#if defined(sun) #include +#else +#include +#endif #endif /* defined(ELF) */ From owner-p4-projects@FreeBSD.ORG Thu Apr 13 00:18:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED6B016A405; Thu, 13 Apr 2006 00:18:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B4F8A16A401 for ; Thu, 13 Apr 2006 00:18:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EE2443D6E for ; Thu, 13 Apr 2006 00:18:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D0IIGR001248 for ; Thu, 13 Apr 2006 00:18:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D0IIFY001245 for perforce@freebsd.org; Thu, 13 Apr 2006 00:18:18 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 00:18:18 GMT Message-Id: <200604130018.k3D0IIFY001245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 00:18:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=95123 Change 95123 by jb@jb_freebsd2 on 2006/04/13 00:17:57 Builds libelf from OpenSolaris code. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libelf/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 00:26:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AF2616A410; Thu, 13 Apr 2006 00:26:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 669EA16A40E for ; Thu, 13 Apr 2006 00:26:29 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1D0A43D5A for ; Thu, 13 Apr 2006 00:26:28 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D0QSn8005374 for ; Thu, 13 Apr 2006 00:26:28 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D0QSuu005371 for perforce@freebsd.org; Thu, 13 Apr 2006 00:26:28 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 13 Apr 2006 00:26:28 GMT Message-Id: <200604130026.k3D0QSuu005371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 95124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 00:26:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=95124 Change 95124 by soc-andrew@soc-andrew_serv on 2006/04/13 00:26:20 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#5 edit .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#9 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#16 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ SUBDIR= lua lualib -SUBDIR+= compat51 mime posix socket +#SUBDIR+= compat51 mime posix socket .include ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.292 2006/03/21 11:00:54 ru Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.293 2006/04/12 19:52:34 ru Exp $ .include @@ -263,7 +263,7 @@ _chkey= chkey _newkey= newkey .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -.if ${MK_LIBC_R} != "no" +.if ${MK_LIBTHR} != "no" _csup= csup .endif .elif ${MK_LIBPTHREAD} != "no" ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.348 2006/03/20 14:24:58 ru Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.349 2006/04/12 19:52:34 ru Exp $ .include @@ -320,7 +320,7 @@ .if ${MACHINE_ARCH} == "alpha" _elf2exe= elf2exe _pnpinfo= pnpinfo -.if ${MK_LIBC_R} != "no" +.if ${MK_LIBTHR} != "no" _pppctl= pppctl .endif .endif @@ -369,7 +369,7 @@ .if ${MACHINE_ARCH} == "sparc64" _eeprom= eeprom _ofwdump= ofwdump -.if ${MK_LIBC_R} != "no" +.if ${MK_LIBTHR} != "no" _pppctl= pppctl .endif .endif From owner-p4-projects@FreeBSD.ORG Thu Apr 13 00:49:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0269516A425; Thu, 13 Apr 2006 00:49:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 903E716A423 for ; Thu, 13 Apr 2006 00:49:20 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3265F43D48 for ; Thu, 13 Apr 2006 00:49:20 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D0nKET023524 for ; Thu, 13 Apr 2006 00:49:20 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D0muAl023516 for perforce@freebsd.org; Thu, 13 Apr 2006 00:48:56 GMT (envelope-from gnn@neville-neil.com) Date: Thu, 13 Apr 2006 00:48:56 GMT Message-Id: <200604130048.k3D0muAl023516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 95125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 00:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=95125 Change 95125 by gnn@sctp_integ on 2006/04/13 00:48:17 Integrate HEAD into the SCTP integration branch. Affected files ... .. //depot/projects/sctp/src/sys/Makefile#2 integrate .. //depot/projects/sctp/src/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/sctp/src/sys/alpha/include/_types.h#2 integrate .. //depot/projects/sctp/src/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/sctp/src/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/sctp/src/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/sctp/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/sctp/src/sys/alpha/include/pcpu.h#2 integrate .. //depot/projects/sctp/src/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/sctp/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/sctp/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/sctp/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/sctp/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/sctp/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/sctp/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/bus.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/sctp/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/sctp/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/sctp/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/sctp/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/sctp/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/sctp/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/sctp/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/sctp/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/sctp/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/sctp/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/sctp/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/sctp/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/sctp/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/sctp/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/sctp/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/sctp/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/sctp/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/sctp/src/sys/arm/include/cpu.h#2 integrate .. //depot/projects/sctp/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/sctp/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/sctp/src/sys/arm/include/param.h#2 integrate .. //depot/projects/sctp/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/sctp/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/sctp/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/sctp/src/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/sctp/src/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/sctp/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/sctp/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/sctp/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/sctp/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/sctp/src/sys/boot/Makefile#2 integrate .. //depot/projects/sctp/src/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/lib.c#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/lib.h#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/xmodem.c#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/boot0/xmodem.h#1 branch .. //depot/projects/sctp/src/sys/boot/arm/at91/inc/AT91RM9200.h#1 branch .. //depot/projects/sctp/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/sctp/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/sctp/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/sctp/src/sys/boot/common/module.c#2 integrate .. //depot/projects/sctp/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/sctp/src/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/sctp/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/sctp/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/sctp/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/sctp/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/sctp/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/sctp/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/sctp/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/sctp/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/sctp/src/sys/boot/pc98/libpc98/gatea20.c#2 delete .. //depot/projects/sctp/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/sctp/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/sctp/src/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/sctp/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/sctp/src/sys/bsm/audit.h#2 integrate .. //depot/projects/sctp/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/sctp/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/sctp/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/sctp/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/sctp/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/sctp/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/sctp/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/sctp/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/sctp/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/sctp/src/sys/coda/coda.h#2 integrate .. //depot/projects/sctp/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/sctp/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/sctp/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/sctp/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/sctp/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/sctp/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/sctp/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/sctp/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/sctp/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/sctp/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/sctp/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/sctp/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/sctp/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/sctp/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/sctp/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/sctp/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/sctp/src/sys/conf/NOTES#2 integrate .. //depot/projects/sctp/src/sys/conf/files#2 integrate .. //depot/projects/sctp/src/sys/conf/files.alpha#2 integrate .. //depot/projects/sctp/src/sys/conf/files.amd64#2 integrate .. //depot/projects/sctp/src/sys/conf/files.i386#2 integrate .. //depot/projects/sctp/src/sys/conf/files.ia64#2 integrate .. //depot/projects/sctp/src/sys/conf/files.pc98#2 integrate .. //depot/projects/sctp/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/sctp/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/sctp/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/sctp/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/sctp/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/sctp/src/sys/conf/options#2 integrate .. //depot/projects/sctp/src/sys/conf/options.amd64#2 integrate .. //depot/projects/sctp/src/sys/conf/options.arm#2 integrate .. //depot/projects/sctp/src/sys/conf/options.i386#2 integrate .. //depot/projects/sctp/src/sys/conf/options.pc98#2 integrate .. //depot/projects/sctp/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/sctp/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/sctp/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/sctp/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/sctp/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/sctp/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/sctp/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/sctp/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/sctp/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/sctp/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/sctp/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/sctp/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/sctp/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/sctp/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/sctp/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/sctp/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/sctp/src/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/sctp/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/amr/amrio.h#2 integrate .. //depot/projects/sctp/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/sctp/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/sctp/src/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/sctp/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/sctp/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/sctp/src/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/sctp/src/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/sctp/src/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/sctp/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/sctp/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/sctp/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/sctp/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/sctp/src/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/sctp/src/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/sctp/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/sctp/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/sctp/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/sctp/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/sctp/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/sctp/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/sctp/src/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/sctp/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/sctp/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/sctp/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/sctp/src/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/sctp/src/sys/dev/de/if_de.c#1 branch .. //depot/projects/sctp/src/sys/dev/de/if_devar.h#1 branch .. //depot/projects/sctp/src/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/sctp/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/sctp/src/sys/dev/em/README#2 integrate .. //depot/projects/sctp/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/sctp/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/sctp/src/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/sctp/src/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/sctp/src/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/sctp/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/sctp/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/sctp/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/sctp/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/sctp/src/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/sctp/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/sctp/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/sctp/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/sctp/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/sctp/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/sctp/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/sctp/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/sctp/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/sctp/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/sctp/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/sctp/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/sctp/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/sctp/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/sctp/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/sctp/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/sctp/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/sctp/src/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/sctp/src/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/sctp/src/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/sctp/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp_inline.h#2 delete .. //depot/projects/sctp/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/sctp/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/sctp/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/sctp/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/sctp/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/sctp/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/sctp/src/sys/dev/le/am7990.c#1 branch .. //depot/projects/sctp/src/sys/dev/le/am79900.c#1 branch .. //depot/projects/sctp/src/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/sctp/src/sys/dev/le/am79900var.h#1 branch .. //depot/projects/sctp/src/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/sctp/src/sys/dev/le/am7990var.h#1 branch .. //depot/projects/sctp/src/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/sctp/src/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/sctp/src/sys/dev/le/lance.c#1 branch .. //depot/projects/sctp/src/sys/dev/le/lancereg.h#1 branch .. //depot/projects/sctp/src/sys/dev/le/lancevar.h#1 branch .. //depot/projects/sctp/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/sctp/src/sys/dev/md/md.c#2 integrate .. //depot/projects/sctp/src/sys/dev/mfi/mfi.c#1 branch .. //depot/projects/sctp/src/sys/dev/mfi/mfi_disk.c#1 branch .. //depot/projects/sctp/src/sys/dev/mfi/mfi_ioctl.h#1 branch .. //depot/projects/sctp/src/sys/dev/mfi/mfi_pci.c#1 branch .. //depot/projects/sctp/src/sys/dev/mfi/mfireg.h#1 branch .. //depot/projects/sctp/src/sys/dev/mfi/mfivar.h#1 branch .. //depot/projects/sctp/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/sctp/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/sctp/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/fc_log.h#2 delete .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_fc.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_lan.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/sctp/src/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/sctp/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/sctp/src/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/sctp/src/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/sctp/src/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/sctp/src/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/sctp/src/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/sctp/src/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/sctp/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/sctp/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/sctp/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/sctp/src/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/sctp/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/sctp/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/sctp/src/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/sctp/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/sctp/src/sys/dev/pci/hostb_pci.c#1 branch .. //depot/projects/sctp/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/sctp/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/sctp/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/sctp/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/pci/vga_pci.c#1 branch .. //depot/projects/sctp/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ppbus/immio.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/sctp/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/sctp/src/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ral/if_ral.c#2 delete .. //depot/projects/sctp/src/sys/dev/ral/if_ral_pccard.c#2 delete .. //depot/projects/sctp/src/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ral/if_ralreg.h#2 delete .. //depot/projects/sctp/src/sys/dev/ral/if_ralvar.h#2 delete .. //depot/projects/sctp/src/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/sctp/src/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/sctp/src/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/sctp/src/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/sctp/src/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/sctp/src/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/sctp/src/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/sctp/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/sctp/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/sctp/src/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/sctp/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/sctp/src/sys/dev/random/randomdev_soft.h#2 integrate .. //depot/projects/sctp/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/sctp/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/sctp/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/sctp/src/sys/dev/scc/scc_bfe.h#1 branch .. //depot/projects/sctp/src/sys/dev/scc/scc_bfe_ebus.c#1 branch .. //depot/projects/sctp/src/sys/dev/scc/scc_bfe_macio.c#1 branch .. //depot/projects/sctp/src/sys/dev/scc/scc_bfe_sbus.c#1 branch .. //depot/projects/sctp/src/sys/dev/scc/scc_bus.h#1 branch .. //depot/projects/sctp/src/sys/dev/scc/scc_core.c#1 branch .. //depot/projects/sctp/src/sys/dev/scc/scc_dev_sab82532.c#1 branch .. //depot/projects/sctp/src/sys/dev/scc/scc_dev_z8530.c#1 branch .. //depot/projects/sctp/src/sys/dev/scc/scc_if.m#1 branch .. //depot/projects/sctp/src/sys/dev/si/si.c#2 integrate .. //depot/projects/sctp/src/sys/dev/si/si2_z280.c#2 integrate .. //depot/projects/sctp/src/sys/dev/si/si3_t225.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/sctp/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/sctp/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/sctp/src/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/sctp/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/sctp/src/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/sctp/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/sctp/src/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/sctp/src/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/sctp/src/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/sctp/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/sctp/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_bus_scc.c#1 branch .. //depot/projects/sctp/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_cpu_powerpc.c#1 branch .. //depot/projects/sctp/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/sctp/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/sctp/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ufoma.c#1 branch .. //depot/projects/sctp/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ugraphire_rdesc.h#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/sctp/src/sys/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/sctp/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/sctp/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/sctp/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/sctp/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/sctp/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/sctp/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/sctp/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/sctp/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/sctp/src/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/sctp/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/sctp/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/sctp/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/sctp/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/sctp/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/sctp/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/sctp/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/sctp/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/sctp/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/gdb/gdb_cons.c#1 branch .. //depot/projects/sctp/src/sys/gdb/gdb_int.h#2 integrate .. //depot/projects/sctp/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/sctp/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/sctp/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/sctp/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/sctp/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/sctp/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/sctp/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/sctp/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/sctp/src/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/sctp/src/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/sctp/src/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/sctp/src/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/sctp/src/sys/geom/geom.h#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_slice.h#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/sctp/src/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/sctp/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/sctp/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/sctp/src/sys/geom/label/g_label_iso9660.c#2 integrate .. //depot/projects/sctp/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/sctp/src/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/sctp/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/sctp/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/sctp/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/sctp/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/sctp/src/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/sctp/src/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/sctp/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/sctp/src/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/sctp/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/sctp/src/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/sctp/src/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/sctp/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/sctp/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/sctp/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/sctp/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/sctp/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/sctp/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/sctp/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/sctp/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/projects/sctp/src/sys/gnu/fs/xfs/xfs_macros.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 13 01:12:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D8A116A423; Thu, 13 Apr 2006 01:12:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3F6D16A420 for ; Thu, 13 Apr 2006 01:12:50 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5964A43D46 for ; Thu, 13 Apr 2006 01:12:50 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D1CoZj037645 for ; Thu, 13 Apr 2006 01:12:50 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D1Co63037609 for perforce@freebsd.org; Thu, 13 Apr 2006 01:12:50 GMT (envelope-from jmg@freebsd.org) Date: Thu, 13 Apr 2006 01:12:50 GMT Message-Id: <200604130112.k3D1Co63037609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95126 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 01:12:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=95126 Change 95126 by jmg@jmg_carbon-60 on 2006/04/13 01:12:32 pull in the ofw_pci code... drop the anoying make sure all bus numbers are unique.. very little of our code needs it.. instead start work on supporting multiple pci domains... make hv_pci provide the interfaces necessary to use ofw_pci... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#13 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcivar.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/kern/subr_rman.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pci_if.m#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib_subr.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib_subr.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#37 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#13 (text+ko) ==== @@ -52,6 +52,10 @@ eeprom sbus sun4v/sun4v/gdb_machdep.c optional gdb sun4v/sun4v/hv_pci.c optional pci +sparc64/pci/ofw_pci.c optional pci +sparc64/pci/ofw_pcib.c optional pci +sparc64/pci/ofw_pcib_subr.c optional pci +sparc64/pci/ofw_pcibus.c optional pci sparc64/pci/ofw_pci_if.m optional pci # XXX hvcons should be optional sun4v/sun4v/hvcons.c standard ==== //depot/projects/kmacy_sun4v/src/sys/dev/pci/pcivar.h#4 (text+ko) ==== @@ -235,13 +235,15 @@ /*typedef enum pci_device_ivars pcib_device_ivars;*/ enum pcib_device_ivars { - PCIB_IVAR_BUS + PCIB_IVAR_DOMAIN, + PCIB_IVAR_BUS, }; #define PCIB_ACCESSOR(var, ivar, type) \ __BUS_ACCESSOR(pcib, var, PCIB, ivar, type) PCIB_ACCESSOR(bus, BUS, uint32_t) +PCIB_ACCESSOR(domain, DOMAIN, uint32_t) #undef PCIB_ACCESSOR ==== //depot/projects/kmacy_sun4v/src/sys/kern/subr_rman.c#3 (text+ko) ==== @@ -252,9 +252,10 @@ rv = NULL; - DPRINTF(("rman_reserve_resource: <%s> request: [%#lx, %#lx], length " - "%#lx, flags %u, device %s\n", rm->rm_descr, start, end, count, - flags, dev == NULL ? "" : device_get_nameunit(dev))); + DPRINTF(("rman_reserve_resource_bound: <%s> request: [%#lx, %#lx], " + "length %#lx, flags %u, device %s\n", rm->rm_descr, start, end, + count, flags, + dev == NULL ? "" : device_get_nameunit(dev))); want_activate = (flags & RF_ACTIVE); flags &= ~RF_ACTIVE; ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pci_if.m#3 (text+ko) ==== @@ -36,7 +36,6 @@ CODE { static ofw_pci_intr_pending_t ofw_pci_default_intr_pending; static ofw_pci_get_bus_handle_t ofw_pci_default_get_bus_handle; - static ofw_pci_adjust_busrange_t ofw_pci_default_adjust_busrange; static int ofw_pci_default_intr_pending(device_t dev, ofw_pci_intr_t intr) @@ -54,12 +53,6 @@ childhdl, tag)); } - static void - ofw_pci_default_adjust_busrange(device_t dev, u_int busno) - { - - return (OFW_PCI_ADJUST_BUSRANGE(device_get_parent(dev), busno)); - } }; # Return whether an interrupt request is pending for the INO intr. @@ -77,11 +70,3 @@ bus_space_handle_t childhdl; bus_space_tag_t *tag; } DEFAULT ofw_pci_default_get_bus_handle; - -# Make sure that all PCI bridges up in the hierarchy contain this bus in their -# subordinate bus range. This is required because we reenumerate all PCI -# buses. -METHOD void adjust_busrange { - device_t dev; - u_int subbus; -} DEFAULT ofw_pci_default_adjust_busrange; ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib_subr.c#3 (text+ko) ==== @@ -60,19 +60,6 @@ KASSERT(sc->ops_node != 0, ("ofw_pcib_gen_setup: no ofw pci parent bus!")); - /* - * Setup the secondary bus number register, by allocating a new unique - * bus number for it; the firmware preset does not always seem to be - * correct. - */ - secbus = ofw_pci_alloc_busno(sc->ops_node); - pci_write_config(bridge, PCIR_PRIBUS_1, pci_get_bus(bridge), 1); - pci_write_config(bridge, PCIR_SECBUS_1, secbus, 1); - pci_write_config(bridge, PCIR_SUBBUS_1, secbus, 1); - sc->ops_pcib_sc.subbus = sc->ops_pcib_sc.secbus = secbus; - /* Notify parent bridges. */ - OFW_PCI_ADJUST_BUSRANGE(device_get_parent(bridge), secbus); - ofw_bus_setup_iinfo(sc->ops_node, &sc->ops_iinfo, sizeof(ofw_pci_intr_t)); } @@ -120,22 +107,3 @@ sc = device_get_softc(bridge); return (sc->ops_node); } - -void -ofw_pcib_gen_adjust_busrange(device_t bridge, u_int subbus) -{ - struct ofw_pcib_gen_softc *sc; - - sc = device_get_softc(bridge); - if (subbus > sc->ops_pcib_sc.subbus) { -#ifdef OFW_PCI_DEBUG - device_printf(bridge, - "adjusting secondary bus number from %d to %d\n", - sc->ops_pcib_sc.subbus, subbus); -#endif - pci_write_config(bridge, PCIR_SUBBUS_1, subbus, 1); - sc->ops_pcib_sc.subbus = subbus; - /* Notify parent bridges. */ - OFW_PCI_ADJUST_BUSRANGE(device_get_parent(bridge), subbus); - } -} ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib_subr.h#3 (text+ko) ==== @@ -42,6 +42,5 @@ void ofw_pcib_gen_setup(device_t); pcib_route_interrupt_t ofw_pcib_gen_route_interrupt; ofw_bus_get_node_t ofw_pcib_gen_get_node; -ofw_pci_adjust_busrange_t ofw_pcib_gen_adjust_busrange; #endif /* !_SPARC64_PCI_OFW_PCI_SUBR_H */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hv_pcivar.h#9 (text+ko) ==== @@ -32,6 +32,7 @@ struct hvpci_softc { devhandle_t hs_devhandle; + phandle_t hs_node; uint8_t hs_busnum; struct bus_dma_tag hs_dmatag; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#37 (text+ko) ==== @@ -82,6 +82,9 @@ static pcib_read_config_t hvpci_read_config; static pcib_write_config_t hvpci_write_config; static pcib_route_interrupt_t hvpci_route_interrupt; +static ofw_bus_get_node_t hvpci_get_node; +static ofw_pci_intr_pending_t hvpci_intr_pending; +static ofw_pci_get_bus_handle_t hvpci_get_bus_handle; static device_method_t hv_pcib_methods[] = { /* Device interface */ @@ -109,6 +112,13 @@ DEVMETHOD(pcib_write_config, hvpci_write_config), DEVMETHOD(pcib_route_interrupt, hvpci_route_interrupt), + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, hvpci_get_node), + + /* ofw_pci interface */ + DEVMETHOD(ofw_pci_intr_pending, hvpci_intr_pending), + DEVMETHOD(ofw_pci_get_bus_handle, hvpci_get_bus_handle), + { 0, 0 } }; @@ -153,6 +163,8 @@ if (node == -1) panic("%s: ofw_bus_get_node failed.", __func__); + sc->hs_node = node; + /* Setup the root bus number for this bus */ n = OF_getprop(node, "bus-range", &br[0], sizeof br); if (n == -1) @@ -168,8 +180,8 @@ sc->hs_pci_intr_rman.rm_type = RMAN_ARRAY; sc->hs_pci_intr_rman.rm_descr = "HyperVisor PCI Interrupts"; if (rman_init(&sc->hs_pci_intr_rman) != 0 || - /* XXX - no clue where this should start or end */ - rman_manage_region(&sc->hs_pci_intr_rman, 0, 3) != 0) + /* We use 1 (INTA) through 4 (INTD) */ + rman_manage_region(&sc->hs_pci_intr_rman, 1, 4) != 0) panic("%s: failed to set up intr rman", __func__); /* Pull in the ra addresses out of OFW */ @@ -342,6 +354,46 @@ return (pin); } +static phandle_t +hvpci_get_node(device_t bus, device_t dev) +{ + struct hvpci_softc *sc; + + sc = device_get_softc(dev); + + return (sc->hs_node); +} + +static int +hvpci_intr_pending(device_t dev, ofw_pci_intr_t intr) +{ + /* XXX - implement */ + panic("unimplemnted"); +} + +static bus_space_handle_t +hvpci_get_bus_handle(device_t dev, int type, bus_space_handle_t childhdl, + bus_space_tag_t *tag) +{ + struct hvpci_softc *sc; + + sc = device_get_softc(dev); + switch (type) { + case SYS_RES_IOPORT: + *tag = sc->hs_pci_iot; + return (sc->hs_pci_ioh + childhdl); + break; + + case SYS_RES_MEMORY: + *tag = sc->hs_pci_memt; + return (sc->hs_pci_ioh + childhdl); + break; + + default: + panic("%s: illegal space (%d)", __func__, type); + } +} + static int hvpci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { From owner-p4-projects@FreeBSD.ORG Thu Apr 13 01:13:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B1C16A403; Thu, 13 Apr 2006 01:13:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74E5116A400 for ; Thu, 13 Apr 2006 01:13:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FF6C43D45 for ; Thu, 13 Apr 2006 01:13:52 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D1DqCM038492 for ; Thu, 13 Apr 2006 01:13:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D1DpGj038484 for perforce@freebsd.org; Thu, 13 Apr 2006 01:13:51 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 01:13:51 GMT Message-Id: <200604130113.k3D1DpGj038484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 01:13:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=95127 Change 95127 by jb@jb_freebsd2 on 2006/04/13 01:13:46 Suck (some) libdtrace sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_as.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_as.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_dis.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_dof.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_error.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_ident.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_inttab.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_inttab.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_list.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_list.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_map.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_options.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_parser.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pcb.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pcb.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_program.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_program.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_provider.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_string.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_string.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_xlator.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 01:29:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E9CD16A405; Thu, 13 Apr 2006 01:29:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A73E16A400 for ; Thu, 13 Apr 2006 01:29:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1329B43D60 for ; Thu, 13 Apr 2006 01:29:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D1TA8i045861 for ; Thu, 13 Apr 2006 01:29:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D1TAgn045858 for perforce@freebsd.org; Thu, 13 Apr 2006 01:29:10 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 01:29:10 GMT Message-Id: <200604130129.k3D1TAgn045858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 01:29:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=95128 Change 95128 by jb@jb_freebsd2 on 2006/04/13 01:28:38 libdtrace source generation scripts. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mknames.sh#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 01:34:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3D9716A406; Thu, 13 Apr 2006 01:34:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9389116A404 for ; Thu, 13 Apr 2006 01:34:23 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED56F43D75 for ; Thu, 13 Apr 2006 01:34:17 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D1YHGD049450 for ; Thu, 13 Apr 2006 01:34:17 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D1YHE3049447 for perforce@freebsd.org; Thu, 13 Apr 2006 01:34:17 GMT (envelope-from jmg@freebsd.org) Date: Thu, 13 Apr 2006 01:34:17 GMT Message-Id: <200604130134.k3D1YHE3049447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 01:34:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=95129 Change 95129 by jmg@jmg_arlene on 2006/04/13 01:33:54 make compile.. drop cache stuff from pcibus since it's kinda pointless and we don't have code to fetch that info yet.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib_subr.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcibus.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib.c#3 (text+ko) ==== @@ -87,9 +87,6 @@ /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_node, ofw_pcib_gen_get_node), - /* ofw_pci interface */ - DEVMETHOD(ofw_pci_adjust_busrange, ofw_pcib_gen_adjust_busrange), - { 0, 0 } }; ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib_subr.c#4 (text+ko) ==== @@ -52,7 +52,6 @@ ofw_pcib_gen_setup(device_t bridge) { struct ofw_pcib_gen_softc *sc; - u_int secbus; sc = device_get_softc(bridge); sc->ops_pcib_sc.dev = bridge; ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcibus.c#3 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include -#include #include #include @@ -123,7 +122,7 @@ static void ofw_pcibus_setup_device(device_t bridge, u_int busno, u_int slot, u_int func) { - u_int lat, clnsz; + u_int lat; /* * Initialize the latency timer register for busmaster devices to work @@ -147,18 +146,6 @@ } /* - * Compute a value to write into the cache line size register. - * The role of the streaming cache is unclear in write invalidate - * transfers, so it is made sure that it's line size is always reached. - */ - clnsz = max(cache.ec_linesize, STRBUF_LINESZ); - KASSERT((clnsz / STRBUF_LINESZ) * STRBUF_LINESZ == clnsz && - (clnsz / cache.ec_linesize) * cache.ec_linesize == clnsz && - (clnsz / 4) * 4 == clnsz, ("bogus cache line size %d", clnsz)); - PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_CACHELNSZ, - clnsz / 4, 1); - - /* * The preset in the intline register is usually wrong. Reset it to 255, * so that the PCI code will reroute the interrupt if needed. */ From owner-p4-projects@FreeBSD.ORG Thu Apr 13 01:36:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DBCC16A406; Thu, 13 Apr 2006 01:36:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9A7E16A403 for ; Thu, 13 Apr 2006 01:36:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82E8A43D46 for ; Thu, 13 Apr 2006 01:36:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D1aKQU051200 for ; Thu, 13 Apr 2006 01:36:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D1aKtA051194 for perforce@freebsd.org; Thu, 13 Apr 2006 01:36:20 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 01:36:20 GMT Message-Id: <200604130136.k3D1aKtA051194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 01:36:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=95130 Change 95130 by jb@jb_freebsd2 on 2006/04/13 01:36:07 Suck the kernel dtrace header. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 03:14:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DF0616A40B; Thu, 13 Apr 2006 03:14:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C64316A406 for ; Thu, 13 Apr 2006 03:14:19 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F48743D5C for ; Thu, 13 Apr 2006 03:14:18 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D3EIab004276 for ; Thu, 13 Apr 2006 03:14:18 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D3EIeF004270 for perforce@freebsd.org; Thu, 13 Apr 2006 03:14:18 GMT (envelope-from jmg@freebsd.org) Date: Thu, 13 Apr 2006 03:14:18 GMT Message-Id: <200604130314.k3D3EIeF004270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 03:14:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=95131 Change 95131 by jmg@jmg_arlene on 2006/04/13 03:13:53 we don't need this anymore since we have hviommu.c... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#14 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#14 (text+ko) ==== @@ -65,7 +65,6 @@ sun4v/sun4v/in_cksum.c optional inet sun4v/sun4v/interrupt.S standard no-obj sun4v/sun4v/intr_machdep.c standard -sun4v/sun4v/iommu.c standard sun4v/sun4v/locore.S standard no-obj sun4v/sun4v/machdep.c standard sun4v/sun4v/mem.c optional mem From owner-p4-projects@FreeBSD.ORG Thu Apr 13 05:00:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84F4D16A405; Thu, 13 Apr 2006 05:00:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2565916A400 for ; Thu, 13 Apr 2006 05:00:33 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E818943D45 for ; Thu, 13 Apr 2006 05:00:32 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D50WgE073017 for ; Thu, 13 Apr 2006 05:00:32 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D50Wh1073014 for perforce@freebsd.org; Thu, 13 Apr 2006 05:00:32 GMT (envelope-from jmg@freebsd.org) Date: Thu, 13 Apr 2006 05:00:32 GMT Message-Id: <200604130500.k3D50Wh1073014@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 05:00:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=95140 Change 95140 by jmg@jmg_arlene on 2006/04/13 04:59:32 get the softc from bus instead of dev... don't force the unit number of the pci bus, this makes multidomain work... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib.c#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#38 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/pci/ofw_pcib.c#4 (text+ko) ==== @@ -116,6 +116,6 @@ sc = device_get_softc(dev); ofw_pcib_gen_setup(dev); pcib_attach_common(dev); - device_add_child(dev, "pci", sc->ops_pcib_sc.secbus); + device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); } ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#38 (text+ko) ==== @@ -359,7 +359,7 @@ { struct hvpci_softc *sc; - sc = device_get_softc(dev); + sc = device_get_softc(bus); return (sc->hs_node); } From owner-p4-projects@FreeBSD.ORG Thu Apr 13 05:22:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD5EE16A404; Thu, 13 Apr 2006 05:22:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C3EB16A402 for ; Thu, 13 Apr 2006 05:22:00 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AE4B43D45 for ; Thu, 13 Apr 2006 05:22:00 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3D5M0tn086310 for ; Thu, 13 Apr 2006 05:22:00 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D5M0PF086300 for perforce@freebsd.org; Thu, 13 Apr 2006 05:22:00 GMT (envelope-from jmg@freebsd.org) Date: Thu, 13 Apr 2006 05:22:00 GMT Message-Id: <200604130522.k3D5M0PF086300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 05:22:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=95143 Change 95143 by jmg@jmg_arlene on 2006/04/13 05:21:39 make sure pciintr is an array index.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#39 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#39 (text+ko) ==== @@ -440,6 +440,7 @@ KASSERT(pciintr >= 1 && pciintr <= 4, ("interrupt out of range")); rid = pciintr; + pciintr--; if (sc->hs_intr[pciintr] == NULL) { if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { @@ -477,6 +478,7 @@ sc = device_get_softc(dev); pciintr = rman_get_start(vec); + pciintr--; error = bus_teardown_intr(dev, sc->hs_intr[pciintr], cookie); if (error) From owner-p4-projects@FreeBSD.ORG Thu Apr 13 16:23:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1653316A401; Thu, 13 Apr 2006 16:23:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B19DA16A405 for ; Thu, 13 Apr 2006 16:23:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55F0F43D68 for ; Thu, 13 Apr 2006 16:23:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DGNSlQ042355 for ; Thu, 13 Apr 2006 16:23:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DGNSKr042349 for perforce@freebsd.org; Thu, 13 Apr 2006 16:23:28 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Apr 2006 16:23:28 GMT Message-Id: <200604131623.k3DGNSKr042349@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 16:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=95162 Change 95162 by imp@imp_hammer on 2006/04/13 16:23:26 No need to set BSR here to 0. That's a nop. Setting ASR is all that's needed. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 (text) ==== @@ -154,7 +154,6 @@ // Configure DBGU -use local routine optimized for space pPio->PIO_ASR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; - pPio->PIO_BSR = 0; pPio->PIO_PDR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; pUSART->US_IDR = (unsigned int) -1; pUSART->US_CR = From owner-p4-projects@FreeBSD.ORG Thu Apr 13 16:25:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E86516A404; Thu, 13 Apr 2006 16:25:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A45A116A414 for ; Thu, 13 Apr 2006 16:25:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B7A843D45 for ; Thu, 13 Apr 2006 16:25:31 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DGPVJq044203 for ; Thu, 13 Apr 2006 16:25:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DGPVXv044197 for perforce@freebsd.org; Thu, 13 Apr 2006 16:25:31 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Apr 2006 16:25:31 GMT Message-Id: <200604131625.k3DGPVXv044197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 16:25:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=95163 Change 95163 by imp@imp_hammer on 2006/04/13 16:24:46 Include magic Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#2 (text) ==== @@ -26,6 +26,7 @@ #include "AT91RM9200.h" #include "lib.h" +#include "at91rm9200_lowlevel.h" typedef void fn_t(void); From owner-p4-projects@FreeBSD.ORG Thu Apr 13 16:26:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6008316A407; Thu, 13 Apr 2006 16:26:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FC5B16A405 for ; Thu, 13 Apr 2006 16:26:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09B9943D45 for ; Thu, 13 Apr 2006 16:26:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DGQWad044964 for ; Thu, 13 Apr 2006 16:26:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DGQWEl044958 for perforce@freebsd.org; Thu, 13 Apr 2006 16:26:32 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Apr 2006 16:26:32 GMT Message-Id: <200604131626.k3DGQWEl044958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 16:26:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=95164 Change 95164 by imp@imp_hammer on 2006/04/13 16:26:29 Shave a few more bytes. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#3 (text) ==== @@ -44,7 +44,6 @@ { AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; AT91PS_PDC pPDC = (AT91PS_PDC)&(pUSART->US_RPR); - AT91PS_PIO pPio = AT91C_BASE_PIOA; register unsigned value; int i; @@ -153,8 +152,8 @@ *p = 0; // Configure DBGU -use local routine optimized for space - pPio->PIO_ASR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; - pPio->PIO_PDR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; + AT91C_BASE_PIOA->PIO_ASR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; + AT91C_BASE_PIOA->PIO_PDR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; pUSART->US_IDR = (unsigned int) -1; pUSART->US_CR = AT91C_US_RSTRX | AT91C_US_RSTTX | AT91C_US_RXDIS | AT91C_US_TXDIS; From owner-p4-projects@FreeBSD.ORG Thu Apr 13 16:55:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEEFB16A406; Thu, 13 Apr 2006 16:55:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F7BF16A400 for ; Thu, 13 Apr 2006 16:55:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBE7443D4C for ; Thu, 13 Apr 2006 16:55:00 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DGt02R059981 for ; Thu, 13 Apr 2006 16:55:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DGt0TE059962 for perforce@freebsd.org; Thu, 13 Apr 2006 16:55:00 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Apr 2006 16:55:00 GMT Message-Id: <200604131655.k3DGt0TE059962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 16:55:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=95165 Change 95165 by imp@imp_hammer on 2006/04/13 16:54:08 #define FOO ((unsigned int) 1234) is bogus, since FOO can't be used in #if statements. It is also needlessly verbose. Use #define FOO 1234u instead which is likely what was wanted in the first place. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/inc/AT91RM9200.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/inc/AT91RM9200.h#2 (text) ==== @@ -321,50 +321,50 @@ } AT91S_MC, *AT91PS_MC; // -------- MC_RCR : (MC Offset: 0x0) MC Remap Control Register -------- -#define AT91C_MC_RCB ((unsigned int) 0x1 << 0) // (MC) Remap Command Bit +#define AT91C_MC_RCB (0x1u << 0) // (MC) Remap Command Bit // -------- MC_ASR : (MC Offset: 0x4) MC Abort Status Register -------- -#define AT91C_MC_UNDADD ((unsigned int) 0x1 << 0) // (MC) Undefined Addess Abort Status -#define AT91C_MC_MISADD ((unsigned int) 0x1 << 1) // (MC) Misaligned Addess Abort Status -#define AT91C_MC_MPU ((unsigned int) 0x1 << 2) // (MC) Memory protection Unit Abort Status -#define AT91C_MC_ABTSZ ((unsigned int) 0x3 << 8) // (MC) Abort Size Status -#define AT91C_MC_ABTSZ_BYTE ((unsigned int) 0x0 << 8) // (MC) Byte -#define AT91C_MC_ABTSZ_HWORD ((unsigned int) 0x1 << 8) // (MC) Half-word -#define AT91C_MC_ABTSZ_WORD ((unsigned int) 0x2 << 8) // (MC) Word -#define AT91C_MC_ABTTYP ((unsigned int) 0x3 << 10) // (MC) Abort Type Status -#define AT91C_MC_ABTTYP_DATAR ((unsigned int) 0x0 << 10) // (MC) Data Read -#define AT91C_MC_ABTTYP_DATAW ((unsigned int) 0x1 << 10) // (MC) Data Write -#define AT91C_MC_ABTTYP_FETCH ((unsigned int) 0x2 << 10) // (MC) Code Fetch -#define AT91C_MC_MST0 ((unsigned int) 0x1 << 16) // (MC) Master 0 Abort Source -#define AT91C_MC_MST1 ((unsigned int) 0x1 << 17) // (MC) Master 1 Abort Source -#define AT91C_MC_SVMST0 ((unsigned int) 0x1 << 24) // (MC) Saved Master 0 Abort Source -#define AT91C_MC_SVMST1 ((unsigned int) 0x1 << 25) // (MC) Saved Master 1 Abort Source +#define AT91C_MC_UNDADD (0x1u << 0) // (MC) Undefined Addess Abort Status +#define AT91C_MC_MISADD (0x1u << 1) // (MC) Misaligned Addess Abort Status +#define AT91C_MC_MPU (0x1u << 2) // (MC) Memory protection Unit Abort Status +#define AT91C_MC_ABTSZ (0x3u << 8) // (MC) Abort Size Status +#define AT91C_MC_ABTSZ_BYTE (0x0u << 8) // (MC) Byte +#define AT91C_MC_ABTSZ_HWORD (0x1u << 8) // (MC) Half-word +#define AT91C_MC_ABTSZ_WORD (0x2u << 8) // (MC) Word +#define AT91C_MC_ABTTYP (0x3u << 10) // (MC) Abort Type Status +#define AT91C_MC_ABTTYP_DATAR (0x0u << 10) // (MC) Data Read +#define AT91C_MC_ABTTYP_DATAW (0x1u << 10) // (MC) Data Write +#define AT91C_MC_ABTTYP_FETCH (0x2u << 10) // (MC) Code Fetch +#define AT91C_MC_MST0 (0x1u << 16) // (MC) Master 0 Abort Source +#define AT91C_MC_MST1 (0x1u << 17) // (MC) Master 1 Abort Source +#define AT91C_MC_SVMST0 (0x1u << 24) // (MC) Saved Master 0 Abort Source +#define AT91C_MC_SVMST1 (0x1u << 25) // (MC) Saved Master 1 Abort Source // -------- MC_PUIA : (MC Offset: 0x10) MC Protection Unit Area -------- -#define AT91C_MC_PROT ((unsigned int) 0x3 << 0) // (MC) Protection -#define AT91C_MC_PROT_PNAUNA ((unsigned int) 0x0) // (MC) Privilege: No Access, User: No Access -#define AT91C_MC_PROT_PRWUNA ((unsigned int) 0x1) // (MC) Privilege: Read/Write, User: No Access -#define AT91C_MC_PROT_PRWURO ((unsigned int) 0x2) // (MC) Privilege: Read/Write, User: Read Only -#define AT91C_MC_PROT_PRWURW ((unsigned int) 0x3) // (MC) Privilege: Read/Write, User: Read/Write -#define AT91C_MC_SIZE ((unsigned int) 0xF << 4) // (MC) Internal Area Size -#define AT91C_MC_SIZE_1KB ((unsigned int) 0x0 << 4) // (MC) Area size 1KByte -#define AT91C_MC_SIZE_2KB ((unsigned int) 0x1 << 4) // (MC) Area size 2KByte -#define AT91C_MC_SIZE_4KB ((unsigned int) 0x2 << 4) // (MC) Area size 4KByte -#define AT91C_MC_SIZE_8KB ((unsigned int) 0x3 << 4) // (MC) Area size 8KByte -#define AT91C_MC_SIZE_16KB ((unsigned int) 0x4 << 4) // (MC) Area size 16KByte -#define AT91C_MC_SIZE_32KB ((unsigned int) 0x5 << 4) // (MC) Area size 32KByte -#define AT91C_MC_SIZE_64KB ((unsigned int) 0x6 << 4) // (MC) Area size 64KByte -#define AT91C_MC_SIZE_128KB ((unsigned int) 0x7 << 4) // (MC) Area size 128KByte -#define AT91C_MC_SIZE_256KB ((unsigned int) 0x8 << 4) // (MC) Area size 256KByte -#define AT91C_MC_SIZE_512KB ((unsigned int) 0x9 << 4) // (MC) Area size 512KByte -#define AT91C_MC_SIZE_1MB ((unsigned int) 0xA << 4) // (MC) Area size 1MByte -#define AT91C_MC_SIZE_2MB ((unsigned int) 0xB << 4) // (MC) Area size 2MByte -#define AT91C_MC_SIZE_4MB ((unsigned int) 0xC << 4) // (MC) Area size 4MByte -#define AT91C_MC_SIZE_8MB ((unsigned int) 0xD << 4) // (MC) Area size 8MByte -#define AT91C_MC_SIZE_16MB ((unsigned int) 0xE << 4) // (MC) Area size 16MByte -#define AT91C_MC_SIZE_64MB ((unsigned int) 0xF << 4) // (MC) Area size 64MByte -#define AT91C_MC_BA ((unsigned int) 0x3FFFF << 10) // (MC) Internal Area Base Address +#define AT91C_MC_PROT (0x3u << 0) // (MC) Protection +#define AT91C_MC_PROT_PNAUNA 0x0u // (MC) Privilege: No Access, User: No Access +#define AT91C_MC_PROT_PRWUNA 0x1u // (MC) Privilege: Read/Write, User: No Access +#define AT91C_MC_PROT_PRWURO 0x2u // (MC) Privilege: Read/Write, User: Read Only +#define AT91C_MC_PROT_PRWURW 0x3u // (MC) Privilege: Read/Write, User: Read/Write +#define AT91C_MC_SIZE (0xFu << 4) // (MC) Internal Area Size +#define AT91C_MC_SIZE_1KB (0x0u << 4) // (MC) Area size 1KByte +#define AT91C_MC_SIZE_2KB (0x1u << 4) // (MC) Area size 2KByte +#define AT91C_MC_SIZE_4KB (0x2u << 4) // (MC) Area size 4KByte +#define AT91C_MC_SIZE_8KB (0x3u << 4) // (MC) Area size 8KByte +#define AT91C_MC_SIZE_16KB (0x4u << 4) // (MC) Area size 16KByte +#define AT91C_MC_SIZE_32KB (0x5u << 4) // (MC) Area size 32KByte +#define AT91C_MC_SIZE_64KB (0x6u << 4) // (MC) Area size 64KByte +#define AT91C_MC_SIZE_128KB (0x7u << 4) // (MC) Area size 128KByte +#define AT91C_MC_SIZE_256KB (0x8u << 4) // (MC) Area size 256KByte +#define AT91C_MC_SIZE_512KB (0x9u << 4) // (MC) Area size 512KByte +#define AT91C_MC_SIZE_1MB (0xAu << 4) // (MC) Area size 1MByte +#define AT91C_MC_SIZE_2MB (0xBu << 4) // (MC) Area size 2MByte +#define AT91C_MC_SIZE_4MB (0xCu << 4) // (MC) Area size 4MByte +#define AT91C_MC_SIZE_8MB (0xDu << 4) // (MC) Area size 8MByte +#define AT91C_MC_SIZE_16MB (0xEu << 4) // (MC) Area size 16MByte +#define AT91C_MC_SIZE_64MB (0xFu << 4) // (MC) Area size 64MByte +#define AT91C_MC_BA (0x3FFFFu << 10) // (MC) Internal Area Base Address // -------- MC_PUP : (MC Offset: 0x50) MC Protection Unit Peripheral -------- // -------- MC_PUER : (MC Offset: 0x54) MC Protection Unit Area -------- -#define AT91C_MC_PUEB ((unsigned int) 0x1 << 0) // (MC) Protection Unit enable Bit +#define AT91C_MC_PUEB (0x1u << 0) // (MC) Protection Unit enable Bit // ***************************************************************************** // SOFTWARE API DEFINITION FOR Real-time Clock Alarm and Parallel Load Interface @@ -385,52 +385,52 @@ } AT91S_RTC, *AT91PS_RTC; // -------- RTC_CR : (RTC Offset: 0x0) RTC Control Register -------- -#define AT91C_RTC_UPDTIM ((unsigned int) 0x1 << 0) // (RTC) Update Request Time Register -#define AT91C_RTC_UPDCAL ((unsigned int) 0x1 << 1) // (RTC) Update Request Calendar Register -#define AT91C_RTC_TIMEVSEL ((unsigned int) 0x3 << 8) // (RTC) Time Event Selection -#define AT91C_RTC_TIMEVSEL_MINUTE ((unsigned int) 0x0 << 8) // (RTC) Minute change. -#define AT91C_RTC_TIMEVSEL_HOUR ((unsigned int) 0x1 << 8) // (RTC) Hour change. -#define AT91C_RTC_TIMEVSEL_DAY24 ((unsigned int) 0x2 << 8) // (RTC) Every day at midnight. -#define AT91C_RTC_TIMEVSEL_DAY12 ((unsigned int) 0x3 << 8) // (RTC) Every day at noon. -#define AT91C_RTC_CALEVSEL ((unsigned int) 0x3 << 16) // (RTC) Calendar Event Selection -#define AT91C_RTC_CALEVSEL_WEEK ((unsigned int) 0x0 << 16) // (RTC) Week change (every Monday at time 00:00:00). -#define AT91C_RTC_CALEVSEL_MONTH ((unsigned int) 0x1 << 16) // (RTC) Month change (every 01 of each month at time 00:00:00). -#define AT91C_RTC_CALEVSEL_YEAR ((unsigned int) 0x2 << 16) // (RTC) Year change (every January 1 at time 00:00:00). +#define AT91C_RTC_UPDTIM (0x1u << 0) // (RTC) Update Request Time Register +#define AT91C_RTC_UPDCAL (0x1u << 1) // (RTC) Update Request Calendar Register +#define AT91C_RTC_TIMEVSEL (0x3u << 8) // (RTC) Time Event Selection +#define AT91C_RTC_TIMEVSEL_MINUTE (0x0u << 8) // (RTC) Minute change. +#define AT91C_RTC_TIMEVSEL_HOUR (0x1u << 8) // (RTC) Hour change. +#define AT91C_RTC_TIMEVSEL_DAY24 (0x2u << 8) // (RTC) Every day at midnight. +#define AT91C_RTC_TIMEVSEL_DAY12 (0x3u << 8) // (RTC) Every day at noon. +#define AT91C_RTC_CALEVSEL (0x3u << 16) // (RTC) Calendar Event Selection +#define AT91C_RTC_CALEVSEL_WEEK (0x0u << 16) // (RTC) Week change (every Monday at time 00:00:00). +#define AT91C_RTC_CALEVSEL_MONTH (0x1u << 16) // (RTC) Month change (every 01 of each month at time 00:00:00). +#define AT91C_RTC_CALEVSEL_YEAR (0x2u << 16) // (RTC) Year change (every January 1 at time 00:00:00). // -------- RTC_MR : (RTC Offset: 0x4) RTC Mode Register -------- -#define AT91C_RTC_HRMOD ((unsigned int) 0x1 << 0) // (RTC) 12-24 hour Mode +#define AT91C_RTC_HRMOD (0x1u << 0) // (RTC) 12-24 hour Mode // -------- RTC_TIMR : (RTC Offset: 0x8) RTC Time Register -------- -#define AT91C_RTC_SEC ((unsigned int) 0x7F << 0) // (RTC) Current Second -#define AT91C_RTC_MIN ((unsigned int) 0x7F << 8) // (RTC) Current Minute -#define AT91C_RTC_HOUR ((unsigned int) 0x1F << 16) // (RTC) Current Hour -#define AT91C_RTC_AMPM ((unsigned int) 0x1 << 22) // (RTC) Ante Meridiem, Post Meridiem Indicator +#define AT91C_RTC_SEC (0x7Fu << 0) // (RTC) Current Second +#define AT91C_RTC_MIN (0x7Fu << 8) // (RTC) Current Minute +#define AT91C_RTC_HOUR (0x1Fu << 16) // (RTC) Current Hour +#define AT91C_RTC_AMPM (0x1u << 22) // (RTC) Ante Meridiem, Post Meridiem Indicator // -------- RTC_CALR : (RTC Offset: 0xc) RTC Calendar Register -------- -#define AT91C_RTC_CENT ((unsigned int) 0x3F << 0) // (RTC) Current Century -#define AT91C_RTC_YEAR ((unsigned int) 0xFF << 8) // (RTC) Current Year -#define AT91C_RTC_MONTH ((unsigned int) 0x1F << 16) // (RTC) Current Month -#define AT91C_RTC_DAY ((unsigned int) 0x7 << 21) // (RTC) Current Day -#define AT91C_RTC_DATE ((unsigned int) 0x3F << 24) // (RTC) Current Date +#define AT91C_RTC_CENT (0x3Fu << 0) // (RTC) Current Century +#define AT91C_RTC_YEAR (0xFFu << 8) // (RTC) Current Year +#define AT91C_RTC_MONTH (0x1Fu << 16) // (RTC) Current Month +#define AT91C_RTC_DAY (0x7u << 21) // (RTC) Current Day +#define AT91C_RTC_DATE (0x3Fu << 24) // (RTC) Current Date // -------- RTC_TIMALR : (RTC Offset: 0x10) RTC Time Alarm Register -------- -#define AT91C_RTC_SECEN ((unsigned int) 0x1 << 7) // (RTC) Second Alarm Enable -#define AT91C_RTC_MINEN ((unsigned int) 0x1 << 15) // (RTC) Minute Alarm -#define AT91C_RTC_HOUREN ((unsigned int) 0x1 << 23) // (RTC) Current Hour +#define AT91C_RTC_SECEN (0x1u << 7) // (RTC) Second Alarm Enable +#define AT91C_RTC_MINEN (0x1u << 15) // (RTC) Minute Alarm +#define AT91C_RTC_HOUREN (0x1u << 23) // (RTC) Current Hour // -------- RTC_CALALR : (RTC Offset: 0x14) RTC Calendar Alarm Register -------- -#define AT91C_RTC_MONTHEN ((unsigned int) 0x1 << 23) // (RTC) Month Alarm Enable -#define AT91C_RTC_DATEEN ((unsigned int) 0x1 << 31) // (RTC) Date Alarm Enable +#define AT91C_RTC_MONTHEN (0x1u << 23) // (RTC) Month Alarm Enable +#define AT91C_RTC_DATEEN (0x1u << 31) // (RTC) Date Alarm Enable // -------- RTC_SR : (RTC Offset: 0x18) RTC Status Register -------- -#define AT91C_RTC_ACKUPD ((unsigned int) 0x1 << 0) // (RTC) Acknowledge for Update -#define AT91C_RTC_ALARM ((unsigned int) 0x1 << 1) // (RTC) Alarm Flag -#define AT91C_RTC_SECEV ((unsigned int) 0x1 << 2) // (RTC) Second Event -#define AT91C_RTC_TIMEV ((unsigned int) 0x1 << 3) // (RTC) Time Event -#define AT91C_RTC_CALEV ((unsigned int) 0x1 << 4) // (RTC) Calendar event +#define AT91C_RTC_ACKUPD (0x1u << 0) // (RTC) Acknowledge for Update +#define AT91C_RTC_ALARM (0x1u << 1) // (RTC) Alarm Flag +#define AT91C_RTC_SECEV (0x1u << 2) // (RTC) Second Event +#define AT91C_RTC_TIMEV (0x1u << 3) // (RTC) Time Event +#define AT91C_RTC_CALEV (0x1u << 4) // (RTC) Calendar event // -------- RTC_SCCR : (RTC Offset: 0x1c) RTC Status Clear Command Register -------- // -------- RTC_IER : (RTC Offset: 0x20) RTC Interrupt Enable Register -------- // -------- RTC_IDR : (RTC Offset: 0x24) RTC Interrupt Disable Register -------- // -------- RTC_IMR : (RTC Offset: 0x28) RTC Interrupt Mask Register -------- // -------- RTC_VER : (RTC Offset: 0x2c) RTC Valid Entry Register -------- -#define AT91C_RTC_NVTIM ((unsigned int) 0x1 << 0) // (RTC) Non valid Time -#define AT91C_RTC_NVCAL ((unsigned int) 0x1 << 1) // (RTC) Non valid Calendar -#define AT91C_RTC_NVTIMALR ((unsigned int) 0x1 << 2) // (RTC) Non valid time Alarm -#define AT91C_RTC_NVCALALR ((unsigned int) 0x1 << 3) // (RTC) Nonvalid Calendar Alarm +#define AT91C_RTC_NVTIM (0x1u << 0) // (RTC) Non valid Time +#define AT91C_RTC_NVCAL (0x1u << 1) // (RTC) Non valid Calendar +#define AT91C_RTC_NVTIMALR (0x1u << 2) // (RTC) Non valid time Alarm +#define AT91C_RTC_NVCALALR (0x1u << 3) // (RTC) Nonvalid Calendar Alarm // ***************************************************************************** // SOFTWARE API DEFINITION FOR System Timer Interface @@ -449,27 +449,27 @@ } AT91S_ST, *AT91PS_ST; // -------- ST_CR : (ST Offset: 0x0) System Timer Control Register -------- -#define AT91C_ST_WDRST ((unsigned int) 0x1 << 0) // (ST) Watchdog Timer Restart +#define AT91C_ST_WDRST (0x1u << 0) // (ST) Watchdog Timer Restart // -------- ST_PIMR : (ST Offset: 0x4) System Timer Period Interval Mode Register -------- -#define AT91C_ST_PIV ((unsigned int) 0xFFFF << 0) // (ST) Watchdog Timer Restart +#define AT91C_ST_PIV (0xFFFFu << 0) // (ST) Watchdog Timer Restart // -------- ST_WDMR : (ST Offset: 0x8) System Timer Watchdog Mode Register -------- -#define AT91C_ST_WDV ((unsigned int) 0xFFFF << 0) // (ST) Watchdog Timer Restart -#define AT91C_ST_RSTEN ((unsigned int) 0x1 << 16) // (ST) Reset Enable -#define AT91C_ST_EXTEN ((unsigned int) 0x1 << 17) // (ST) External Signal Assertion Enable +#define AT91C_ST_WDV (0xFFFFu << 0) // (ST) Watchdog Timer Restart +#define AT91C_ST_RSTEN (0x1u << 16) // (ST) Reset Enable +#define AT91C_ST_EXTEN (0x1u << 17) // (ST) External Signal Assertion Enable // -------- ST_RTMR : (ST Offset: 0xc) System Timer Real-time Mode Register -------- -#define AT91C_ST_RTPRES ((unsigned int) 0xFFFF << 0) // (ST) Real-time Timer Prescaler Value +#define AT91C_ST_RTPRES (0xFFFFu << 0) // (ST) Real-time Timer Prescaler Value // -------- ST_SR : (ST Offset: 0x10) System Timer Status Register -------- -#define AT91C_ST_PITS ((unsigned int) 0x1 << 0) // (ST) Period Interval Timer Interrupt -#define AT91C_ST_WDOVF ((unsigned int) 0x1 << 1) // (ST) Watchdog Overflow -#define AT91C_ST_RTTINC ((unsigned int) 0x1 << 2) // (ST) Real-time Timer Increment -#define AT91C_ST_ALMS ((unsigned int) 0x1 << 3) // (ST) Alarm Status +#define AT91C_ST_PITS (0x1u << 0) // (ST) Period Interval Timer Interrupt +#define AT91C_ST_WDOVF (0x1u << 1) // (ST) Watchdog Overflow +#define AT91C_ST_RTTINC (0x1u << 2) // (ST) Real-time Timer Increment +#define AT91C_ST_ALMS (0x1u << 3) // (ST) Alarm Status // -------- ST_IER : (ST Offset: 0x14) System Timer Interrupt Enable Register -------- // -------- ST_IDR : (ST Offset: 0x18) System Timer Interrupt Disable Register -------- // -------- ST_IMR : (ST Offset: 0x1c) System Timer Interrupt Mask Register -------- // -------- ST_RTAR : (ST Offset: 0x20) System Timer Real-time Alarm Register -------- -#define AT91C_ST_ALMV ((unsigned int) 0xFFFFF << 0) // (ST) Alarm Value Value +#define AT91C_ST_ALMV (0xFFFFFu << 0) // (ST) Alarm Value Value // -------- ST_CRTR : (ST Offset: 0x24) System Timer Current Real-time Register -------- -#define AT91C_ST_CRTV ((unsigned int) 0xFFFFF << 0) // (ST) Current Real-time Value +#define AT91C_ST_CRTV (0xFFFFFu << 0) // (ST) Current Real-time Value // ***************************************************************************** // SOFTWARE API DEFINITION FOR Power Management Controler @@ -493,53 +493,53 @@ } AT91S_PMC, *AT91PS_PMC; // -------- PMC_SCER : (PMC Offset: 0x0) System Clock Enable Register -------- -#define AT91C_PMC_PCK ((unsigned int) 0x1 << 0) // (PMC) Processor Clock -#define AT91C_PMC_UDP ((unsigned int) 0x1 << 1) // (PMC) USB Device Port Clock -#define AT91C_PMC_MCKUDP ((unsigned int) 0x1 << 2) // (PMC) USB Device Port Master Clock Automatic Disable on Suspend -#define AT91C_PMC_UHP ((unsigned int) 0x1 << 4) // (PMC) USB Host Port Clock -#define AT91C_PMC_PCK0 ((unsigned int) 0x1 << 8) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK1 ((unsigned int) 0x1 << 9) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK2 ((unsigned int) 0x1 << 10) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK3 ((unsigned int) 0x1 << 11) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK4 ((unsigned int) 0x1 << 12) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK5 ((unsigned int) 0x1 << 13) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK6 ((unsigned int) 0x1 << 14) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK7 ((unsigned int) 0x1 << 15) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK (0x1u << 0) // (PMC) Processor Clock +#define AT91C_PMC_UDP (0x1u << 1) // (PMC) USB Device Port Clock +#define AT91C_PMC_MCKUDP (0x1u << 2) // (PMC) USB Device Port Master Clock Automatic Disable on Suspend +#define AT91C_PMC_UHP (0x1u << 4) // (PMC) USB Host Port Clock +#define AT91C_PMC_PCK0 (0x1u << 8) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK1 (0x1u << 9) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK2 (0x1u << 10) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK3 (0x1u << 11) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK4 (0x1u << 12) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK5 (0x1u << 13) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK6 (0x1u << 14) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK7 (0x1u << 15) // (PMC) Programmable Clock Output // -------- PMC_SCDR : (PMC Offset: 0x4) System Clock Disable Register -------- // -------- PMC_SCSR : (PMC Offset: 0x8) System Clock Status Register -------- // -------- PMC_MCKR : (PMC Offset: 0x30) Master Clock Register -------- -#define AT91C_PMC_CSS ((unsigned int) 0x3 << 0) // (PMC) Programmable Clock Selection -#define AT91C_PMC_CSS_SLOW_CLK ((unsigned int) 0x0) // (PMC) Slow Clock is selected -#define AT91C_PMC_CSS_MAIN_CLK ((unsigned int) 0x1) // (PMC) Main Clock is selected -#define AT91C_PMC_CSS_PLLA_CLK ((unsigned int) 0x2) // (PMC) Clock from PLL A is selected -#define AT91C_PMC_CSS_PLLB_CLK ((unsigned int) 0x3) // (PMC) Clock from PLL B is selected -#define AT91C_PMC_PRES ((unsigned int) 0x7 << 2) // (PMC) Programmable Clock Prescaler -#define AT91C_PMC_PRES_CLK ((unsigned int) 0x0 << 2) // (PMC) Selected clock -#define AT91C_PMC_PRES_CLK_2 ((unsigned int) 0x1 << 2) // (PMC) Selected clock divided by 2 -#define AT91C_PMC_PRES_CLK_4 ((unsigned int) 0x2 << 2) // (PMC) Selected clock divided by 4 -#define AT91C_PMC_PRES_CLK_8 ((unsigned int) 0x3 << 2) // (PMC) Selected clock divided by 8 -#define AT91C_PMC_PRES_CLK_16 ((unsigned int) 0x4 << 2) // (PMC) Selected clock divided by 16 -#define AT91C_PMC_PRES_CLK_32 ((unsigned int) 0x5 << 2) // (PMC) Selected clock divided by 32 -#define AT91C_PMC_PRES_CLK_64 ((unsigned int) 0x6 << 2) // (PMC) Selected clock divided by 64 -#define AT91C_PMC_MDIV ((unsigned int) 0x3 << 8) // (PMC) Master Clock Division -#define AT91C_PMC_MDIV_1 ((unsigned int) 0x0 << 8) // (PMC) The master clock and the processor clock are the same -#define AT91C_PMC_MDIV_2 ((unsigned int) 0x1 << 8) // (PMC) The processor clock is twice as fast as the master clock -#define AT91C_PMC_MDIV_3 ((unsigned int) 0x2 << 8) // (PMC) The processor clock is three times faster than the master clock -#define AT91C_PMC_MDIV_4 ((unsigned int) 0x3 << 8) // (PMC) The processor clock is four times faster than the master clock +#define AT91C_PMC_CSS (0x3u << 0) // (PMC) Programmable Clock Selection +#define AT91C_PMC_CSS_SLOW_CLK 0x0u // (PMC) Slow Clock is selected +#define AT91C_PMC_CSS_MAIN_CLK 0x1u // (PMC) Main Clock is selected +#define AT91C_PMC_CSS_PLLA_CLK 0x2u // (PMC) Clock from PLL A is selected +#define AT91C_PMC_CSS_PLLB_CLK 0x3u // (PMC) Clock from PLL B is selected +#define AT91C_PMC_PRES (0x7u << 2) // (PMC) Programmable Clock Prescaler +#define AT91C_PMC_PRES_CLK (0x0u << 2) // (PMC) Selected clock +#define AT91C_PMC_PRES_CLK_2 (0x1u << 2) // (PMC) Selected clock divided by 2 +#define AT91C_PMC_PRES_CLK_4 (0x2u << 2) // (PMC) Selected clock divided by 4 +#define AT91C_PMC_PRES_CLK_8 (0x3u << 2) // (PMC) Selected clock divided by 8 +#define AT91C_PMC_PRES_CLK_16 (0x4u << 2) // (PMC) Selected clock divided by 16 +#define AT91C_PMC_PRES_CLK_32 (0x5u << 2) // (PMC) Selected clock divided by 32 +#define AT91C_PMC_PRES_CLK_64 (0x6u << 2) // (PMC) Selected clock divided by 64 +#define AT91C_PMC_MDIV (0x3u << 8) // (PMC) Master Clock Division +#define AT91C_PMC_MDIV_1 (0x0u << 8) // (PMC) The master clock and the processor clock are the same +#define AT91C_PMC_MDIV_2 (0x1u << 8) // (PMC) The processor clock is twice as fast as the master clock +#define AT91C_PMC_MDIV_3 (0x2u << 8) // (PMC) The processor clock is three times faster than the master clock +#define AT91C_PMC_MDIV_4 (0x3u << 8) // (PMC) The processor clock is four times faster than the master clock // -------- PMC_PCKR : (PMC Offset: 0x40) Programmable Clock Register -------- // -------- PMC_IER : (PMC Offset: 0x60) PMC Interrupt Enable Register -------- -#define AT91C_PMC_MOSCS ((unsigned int) 0x1 << 0) // (PMC) MOSC Status/Enable/Disable/Mask -#define AT91C_PMC_LOCKA ((unsigned int) 0x1 << 1) // (PMC) PLL A Status/Enable/Disable/Mask -#define AT91C_PMC_LOCKB ((unsigned int) 0x1 << 2) // (PMC) PLL B Status/Enable/Disable/Mask -#define AT91C_PMC_MCKRDY ((unsigned int) 0x1 << 3) // (PMC) MCK_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK0RDY ((unsigned int) 0x1 << 8) // (PMC) PCK0_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK1RDY ((unsigned int) 0x1 << 9) // (PMC) PCK1_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK2RDY ((unsigned int) 0x1 << 10) // (PMC) PCK2_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK3RDY ((unsigned int) 0x1 << 11) // (PMC) PCK3_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK4RDY ((unsigned int) 0x1 << 12) // (PMC) PCK4_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK5RDY ((unsigned int) 0x1 << 13) // (PMC) PCK5_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK6RDY ((unsigned int) 0x1 << 14) // (PMC) PCK6_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK7RDY ((unsigned int) 0x1 << 15) // (PMC) PCK7_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_MOSCS (0x1u << 0) // (PMC) MOSC Status/Enable/Disable/Mask +#define AT91C_PMC_LOCKA (0x1u << 1) // (PMC) PLL A Status/Enable/Disable/Mask +#define AT91C_PMC_LOCKB (0x1u << 2) // (PMC) PLL B Status/Enable/Disable/Mask +#define AT91C_PMC_MCKRDY (0x1u << 3) // (PMC) MCK_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK0RDY (0x1u << 8) // (PMC) PCK0_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK1RDY (0x1u << 9) // (PMC) PCK1_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK2RDY (0x1u << 10) // (PMC) PCK2_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK3RDY (0x1u << 11) // (PMC) PCK3_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK4RDY (0x1u << 12) // (PMC) PCK4_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK5RDY (0x1u << 13) // (PMC) PCK5_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK6RDY (0x1u << 14) // (PMC) PCK6_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK7RDY (0x1u << 15) // (PMC) PCK7_RDY Status/Enable/Disable/Mask // -------- PMC_IDR : (PMC Offset: 0x64) PMC Interrupt Disable Register -------- // -------- PMC_SR : (PMC Offset: 0x68) PMC Status Register -------- // -------- PMC_IMR : (PMC Offset: 0x6c) PMC Interrupt Mask Register -------- @@ -555,37 +555,37 @@ } AT91S_CKGR, *AT91PS_CKGR; // -------- CKGR_MOR : (CKGR Offset: 0x0) Main Oscillator Register -------- -#define AT91C_CKGR_MOSCEN ((unsigned int) 0x1 << 0) // (CKGR) Main Oscillator Enable -#define AT91C_CKGR_OSCTEST ((unsigned int) 0x1 << 1) // (CKGR) Oscillator Test -#define AT91C_CKGR_OSCOUNT ((unsigned int) 0xFF << 8) // (CKGR) Main Oscillator Start-up Time +#define AT91C_CKGR_MOSCEN (0x1u << 0) // (CKGR) Main Oscillator Enable +#define AT91C_CKGR_OSCTEST (0x1u << 1) // (CKGR) Oscillator Test +#define AT91C_CKGR_OSCOUNT (0xFFu << 8) // (CKGR) Main Oscillator Start-up Time // -------- CKGR_MCFR : (CKGR Offset: 0x4) Main Clock Frequency Register -------- -#define AT91C_CKGR_MAINF ((unsigned int) 0xFFFF << 0) // (CKGR) Main Clock Frequency -#define AT91C_CKGR_MAINRDY ((unsigned int) 0x1 << 16) // (CKGR) Main Clock Ready +#define AT91C_CKGR_MAINF (0xFFFFu << 0) // (CKGR) Main Clock Frequency +#define AT91C_CKGR_MAINRDY (0x1u << 16) // (CKGR) Main Clock Ready // -------- CKGR_PLLAR : (CKGR Offset: 0x8) PLL A Register -------- -#define AT91C_CKGR_DIVA ((unsigned int) 0xFF << 0) // (CKGR) Divider Selected -#define AT91C_CKGR_DIVA_0 ((unsigned int) 0x0) // (CKGR) Divider output is 0 -#define AT91C_CKGR_DIVA_BYPASS ((unsigned int) 0x1) // (CKGR) Divider is bypassed -#define AT91C_CKGR_PLLACOUNT ((unsigned int) 0x3F << 8) // (CKGR) PLL A Counter -#define AT91C_CKGR_OUTA ((unsigned int) 0x3 << 14) // (CKGR) PLL A Output Frequency Range -#define AT91C_CKGR_OUTA_0 ((unsigned int) 0x0 << 14) // (CKGR) Please refer to the PLLA datasheet -#define AT91C_CKGR_OUTA_1 ((unsigned int) 0x1 << 14) // (CKGR) Please refer to the PLLA datasheet -#define AT91C_CKGR_OUTA_2 ((unsigned int) 0x2 << 14) // (CKGR) Please refer to the PLLA datasheet -#define AT91C_CKGR_OUTA_3 ((unsigned int) 0x3 << 14) // (CKGR) Please refer to the PLLA datasheet -#define AT91C_CKGR_MULA ((unsigned int) 0x7FF << 16) // (CKGR) PLL A Multiplier -#define AT91C_CKGR_SRCA ((unsigned int) 0x1 << 29) // (CKGR) PLL A Source +#define AT91C_CKGR_DIVA (0xFFu << 0) // (CKGR) Divider Selected +#define AT91C_CKGR_DIVA_0 0x0u // (CKGR) Divider output is 0 +#define AT91C_CKGR_DIVA_BYPASS 0x1u // (CKGR) Divider is bypassed +#define AT91C_CKGR_PLLACOUNT (0x3Fu << 8) // (CKGR) PLL A Counter +#define AT91C_CKGR_OUTA (0x3u << 14) // (CKGR) PLL A Output Frequency Range +#define AT91C_CKGR_OUTA_0 (0x0u << 14) // (CKGR) Please refer to the PLLA datasheet +#define AT91C_CKGR_OUTA_1 (0x1u << 14) // (CKGR) Please refer to the PLLA datasheet +#define AT91C_CKGR_OUTA_2 (0x2u << 14) // (CKGR) Please refer to the PLLA datasheet +#define AT91C_CKGR_OUTA_3 (0x3u << 14) // (CKGR) Please refer to the PLLA datasheet +#define AT91C_CKGR_MULA (0x7FFu << 16) // (CKGR) PLL A Multiplier +#define AT91C_CKGR_SRCA (0x1u << 29) // (CKGR) PLL A Source // -------- CKGR_PLLBR : (CKGR Offset: 0xc) PLL B Register -------- -#define AT91C_CKGR_DIVB ((unsigned int) 0xFF << 0) // (CKGR) Divider Selected -#define AT91C_CKGR_DIVB_0 ((unsigned int) 0x0) // (CKGR) Divider output is 0 -#define AT91C_CKGR_DIVB_BYPASS ((unsigned int) 0x1) // (CKGR) Divider is bypassed -#define AT91C_CKGR_PLLBCOUNT ((unsigned int) 0x3F << 8) // (CKGR) PLL B Counter -#define AT91C_CKGR_OUTB ((unsigned int) 0x3 << 14) // (CKGR) PLL B Output Frequency Range -#define AT91C_CKGR_OUTB_0 ((unsigned int) 0x0 << 14) // (CKGR) Please refer to the PLLB datasheet -#define AT91C_CKGR_OUTB_1 ((unsigned int) 0x1 << 14) // (CKGR) Please refer to the PLLB datasheet -#define AT91C_CKGR_OUTB_2 ((unsigned int) 0x2 << 14) // (CKGR) Please refer to the PLLB datasheet -#define AT91C_CKGR_OUTB_3 ((unsigned int) 0x3 << 14) // (CKGR) Please refer to the PLLB datasheet -#define AT91C_CKGR_MULB ((unsigned int) 0x7FF << 16) // (CKGR) PLL B Multiplier -#define AT91C_CKGR_USB_96M ((unsigned int) 0x1 << 28) // (CKGR) Divider for USB Ports -#define AT91C_CKGR_USB_PLL ((unsigned int) 0x1 << 29) // (CKGR) PLL Use +#define AT91C_CKGR_DIVB (0xFFu << 0) // (CKGR) Divider Selected +#define AT91C_CKGR_DIVB_0 0x0u // (CKGR) Divider output is 0 +#define AT91C_CKGR_DIVB_BYPASS 0x1u // (CKGR) Divider is bypassed +#define AT91C_CKGR_PLLBCOUNT (0x3Fu << 8) // (CKGR) PLL B Counter +#define AT91C_CKGR_OUTB (0x3u << 14) // (CKGR) PLL B Output Frequency Range +#define AT91C_CKGR_OUTB_0 (0x0u << 14) // (CKGR) Please refer to the PLLB datasheet +#define AT91C_CKGR_OUTB_1 (0x1u << 14) // (CKGR) Please refer to the PLLB datasheet +#define AT91C_CKGR_OUTB_2 (0x2u << 14) // (CKGR) Please refer to the PLLB datasheet +#define AT91C_CKGR_OUTB_3 (0x3u << 14) // (CKGR) Please refer to the PLLB datasheet +#define AT91C_CKGR_MULB (0x7FFu << 16) // (CKGR) PLL B Multiplier +#define AT91C_CKGR_USB_96M (0x1u << 28) // (CKGR) Divider for USB Ports +#define AT91C_CKGR_USB_PLL (0x1u << 29) // (CKGR) PLL Use // ***************************************************************************** // SOFTWARE API DEFINITION FOR Parallel Input Output Controler @@ -660,43 +660,43 @@ } AT91S_DBGU, *AT91PS_DBGU; // -------- DBGU_CR : (DBGU Offset: 0x0) Debug Unit Control Register -------- -#define AT91C_US_RSTRX ((unsigned int) 0x1 << 2) // (DBGU) Reset Receiver -#define AT91C_US_RSTTX ((unsigned int) 0x1 << 3) // (DBGU) Reset Transmitter -#define AT91C_US_RXEN ((unsigned int) 0x1 << 4) // (DBGU) Receiver Enable -#define AT91C_US_RXDIS ((unsigned int) 0x1 << 5) // (DBGU) Receiver Disable -#define AT91C_US_TXEN ((unsigned int) 0x1 << 6) // (DBGU) Transmitter Enable -#define AT91C_US_TXDIS ((unsigned int) 0x1 << 7) // (DBGU) Transmitter Disable +#define AT91C_US_RSTRX (0x1u << 2) // (DBGU) Reset Receiver +#define AT91C_US_RSTTX (0x1u << 3) // (DBGU) Reset Transmitter +#define AT91C_US_RXEN (0x1u << 4) // (DBGU) Receiver Enable +#define AT91C_US_RXDIS (0x1u << 5) // (DBGU) Receiver Disable +#define AT91C_US_TXEN (0x1u << 6) // (DBGU) Transmitter Enable +#define AT91C_US_TXDIS (0x1u << 7) // (DBGU) Transmitter Disable // -------- DBGU_MR : (DBGU Offset: 0x4) Debug Unit Mode Register -------- -#define AT91C_US_PAR ((unsigned int) 0x7 << 9) // (DBGU) Parity type -#define AT91C_US_PAR_EVEN ((unsigned int) 0x0 << 9) // (DBGU) Even Parity -#define AT91C_US_PAR_ODD ((unsigned int) 0x1 << 9) // (DBGU) Odd Parity -#define AT91C_US_PAR_SPACE ((unsigned int) 0x2 << 9) // (DBGU) Parity forced to 0 (Space) -#define AT91C_US_PAR_MARK ((unsigned int) 0x3 << 9) // (DBGU) Parity forced to 1 (Mark) -#define AT91C_US_PAR_NONE ((unsigned int) 0x4 << 9) // (DBGU) No Parity -#define AT91C_US_PAR_MULTI_DROP ((unsigned int) 0x6 << 9) // (DBGU) Multi-drop mode -#define AT91C_US_CHMODE ((unsigned int) 0x3 << 14) // (DBGU) Channel Mode -#define AT91C_US_CHMODE_NORMAL ((unsigned int) 0x0 << 14) // (DBGU) Normal Mode: The USART channel operates as an RX/TX USART. -#define AT91C_US_CHMODE_AUTO ((unsigned int) 0x1 << 14) // (DBGU) Automatic Echo: Receiver Data Input is connected to the TXD pin. -#define AT91C_US_CHMODE_LOCAL ((unsigned int) 0x2 << 14) // (DBGU) Local Loopback: Transmitter Output Signal is connected to Receiver Input Signal. -#define AT91C_US_CHMODE_REMOTE ((unsigned int) 0x3 << 14) // (DBGU) Remote Loopback: RXD pin is internally connected to TXD pin. +#define AT91C_US_PAR (0x7u << 9) // (DBGU) Parity type +#define AT91C_US_PAR_EVEN (0x0u << 9) // (DBGU) Even Parity +#define AT91C_US_PAR_ODD (0x1u << 9) // (DBGU) Odd Parity +#define AT91C_US_PAR_SPACE (0x2u << 9) // (DBGU) Parity forced to 0 (Space) +#define AT91C_US_PAR_MARK (0x3u << 9) // (DBGU) Parity forced to 1 (Mark) +#define AT91C_US_PAR_NONE (0x4u << 9) // (DBGU) No Parity +#define AT91C_US_PAR_MULTI_DROP (0x6u << 9) // (DBGU) Multi-drop mode +#define AT91C_US_CHMODE (0x3u << 14) // (DBGU) Channel Mode +#define AT91C_US_CHMODE_NORMAL (0x0u << 14) // (DBGU) Normal Mode: The USART channel operates as an RX/TX USART. +#define AT91C_US_CHMODE_AUTO (0x1u << 14) // (DBGU) Automatic Echo: Receiver Data Input is connected to the TXD pin. +#define AT91C_US_CHMODE_LOCAL (0x2u << 14) // (DBGU) Local Loopback: Transmitter Output Signal is connected to Receiver Input Signal. +#define AT91C_US_CHMODE_REMOTE (0x3u << 14) // (DBGU) Remote Loopback: RXD pin is internally connected to TXD pin. // -------- DBGU_IER : (DBGU Offset: 0x8) Debug Unit Interrupt Enable Register -------- -#define AT91C_US_RXRDY ((unsigned int) 0x1 << 0) // (DBGU) RXRDY Interrupt -#define AT91C_US_TXRDY ((unsigned int) 0x1 << 1) // (DBGU) TXRDY Interrupt -#define AT91C_US_ENDRX ((unsigned int) 0x1 << 3) // (DBGU) End of Receive Transfer Interrupt -#define AT91C_US_ENDTX ((unsigned int) 0x1 << 4) // (DBGU) End of Transmit Interrupt -#define AT91C_US_OVRE ((unsigned int) 0x1 << 5) // (DBGU) Overrun Interrupt -#define AT91C_US_FRAME ((unsigned int) 0x1 << 6) // (DBGU) Framing Error Interrupt -#define AT91C_US_PARE ((unsigned int) 0x1 << 7) // (DBGU) Parity Error Interrupt -#define AT91C_US_TXEMPTY ((unsigned int) 0x1 << 9) // (DBGU) TXEMPTY Interrupt -#define AT91C_US_TXBUFE ((unsigned int) 0x1 << 11) // (DBGU) TXBUFE Interrupt -#define AT91C_US_RXBUFF ((unsigned int) 0x1 << 12) // (DBGU) RXBUFF Interrupt -#define AT91C_US_COMM_TX ((unsigned int) 0x1 << 30) // (DBGU) COMM_TX Interrupt -#define AT91C_US_COMM_RX ((unsigned int) 0x1 << 31) // (DBGU) COMM_RX Interrupt +#define AT91C_US_RXRDY (0x1u << 0) // (DBGU) RXRDY Interrupt +#define AT91C_US_TXRDY (0x1u << 1) // (DBGU) TXRDY Interrupt +#define AT91C_US_ENDRX (0x1u << 3) // (DBGU) End of Receive Transfer Interrupt +#define AT91C_US_ENDTX (0x1u << 4) // (DBGU) End of Transmit Interrupt +#define AT91C_US_OVRE (0x1u << 5) // (DBGU) Overrun Interrupt +#define AT91C_US_FRAME (0x1u << 6) // (DBGU) Framing Error Interrupt +#define AT91C_US_PARE (0x1u << 7) // (DBGU) Parity Error Interrupt +#define AT91C_US_TXEMPTY (0x1u << 9) // (DBGU) TXEMPTY Interrupt +#define AT91C_US_TXBUFE (0x1u << 11) // (DBGU) TXBUFE Interrupt +#define AT91C_US_RXBUFF (0x1u << 12) // (DBGU) RXBUFF Interrupt +#define AT91C_US_COMM_TX (0x1u << 30) // (DBGU) COMM_TX Interrupt +#define AT91C_US_COMM_RX (0x1u << 31) // (DBGU) COMM_RX Interrupt // -------- DBGU_IDR : (DBGU Offset: 0xc) Debug Unit Interrupt Disable Register -------- // -------- DBGU_IMR : (DBGU Offset: 0x10) Debug Unit Interrupt Mask Register -------- // -------- DBGU_CSR : (DBGU Offset: 0x14) Debug Unit Channel Status Register -------- // -------- DBGU_FNTR : (DBGU Offset: 0x48) Debug Unit FORCE_NTRST Register -------- -#define AT91C_US_FORCE_NTRST ((unsigned int) 0x1 << 0) // (DBGU) Force NTRST in JTAG +#define AT91C_US_FORCE_NTRST (0x1u << 0) // (DBGU) Force NTRST in JTAG // ***************************************************************************** // SOFTWARE API DEFINITION FOR Peripheral Data Controller @@ -715,10 +715,10 @@ } AT91S_PDC, *AT91PS_PDC; // -------- PDC_PTCR : (PDC Offset: 0x20) PDC Transfer Control Register -------- -#define AT91C_PDC_RXTEN ((unsigned int) 0x1 << 0) // (PDC) Receiver Transfer Enable -#define AT91C_PDC_RXTDIS ((unsigned int) 0x1 << 1) // (PDC) Receiver Transfer Disable -#define AT91C_PDC_TXTEN ((unsigned int) 0x1 << 8) // (PDC) Transmitter Transfer Enable -#define AT91C_PDC_TXTDIS ((unsigned int) 0x1 << 9) // (PDC) Transmitter Transfer Disable +#define AT91C_PDC_RXTEN (0x1u << 0) // (PDC) Receiver Transfer Enable +#define AT91C_PDC_RXTDIS (0x1u << 1) // (PDC) Receiver Transfer Disable +#define AT91C_PDC_TXTEN (0x1u << 8) // (PDC) Transmitter Transfer Enable +#define AT91C_PDC_TXTDIS (0x1u << 9) // (PDC) Transmitter Transfer Disable // -------- PDC_PTSR : (PDC Offset: 0x24) PDC Transfer Status Register -------- // ***************************************************************************** @@ -748,20 +748,20 @@ } AT91S_AIC, *AT91PS_AIC; // -------- AIC_SMR : (AIC Offset: 0x0) Control Register -------- -#define AT91C_AIC_PRIOR ((unsigned int) 0x7 << 0) // (AIC) Priority Level -#define AT91C_AIC_PRIOR_LOWEST ((unsigned int) 0x0) // (AIC) Lowest priority level -#define AT91C_AIC_PRIOR_HIGHEST ((unsigned int) 0x7) // (AIC) Highest priority level -#define AT91C_AIC_SRCTYPE ((unsigned int) 0x3 << 5) // (AIC) Interrupt Source Type -#define AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE ((unsigned int) 0x0 << 5) // (AIC) Internal Sources Code Label Level Sensitive -#define AT91C_AIC_SRCTYPE_INT_EDGE_TRIGGERED ((unsigned int) 0x1 << 5) // (AIC) Internal Sources Code Label Edge triggered -#define AT91C_AIC_SRCTYPE_EXT_HIGH_LEVEL ((unsigned int) 0x2 << 5) // (AIC) External Sources Code Label High-level Sensitive -#define AT91C_AIC_SRCTYPE_EXT_POSITIVE_EDGE ((unsigned int) 0x3 << 5) // (AIC) External Sources Code Label Positive Edge triggered +#define AT91C_AIC_PRIOR (0x7u << 0) // (AIC) Priority Level +#define AT91C_AIC_PRIOR_LOWEST 0x0u // (AIC) Lowest priority level +#define AT91C_AIC_PRIOR_HIGHEST 0x7u // (AIC) Highest priority level +#define AT91C_AIC_SRCTYPE (0x3u << 5) // (AIC) Interrupt Source Type +#define AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE (0x0u << 5) // (AIC) Internal Sources Code Label Level Sensitive +#define AT91C_AIC_SRCTYPE_INT_EDGE_TRIGGERED (0x1u << 5) // (AIC) Internal Sources Code Label Edge triggered +#define AT91C_AIC_SRCTYPE_EXT_HIGH_LEVEL (0x2u << 5) // (AIC) External Sources Code Label High-level Sensitive +#define AT91C_AIC_SRCTYPE_EXT_POSITIVE_EDGE (0x3u << 5) // (AIC) External Sources Code Label Positive Edge triggered // -------- AIC_CISR : (AIC Offset: 0x114) AIC Core Interrupt Status Register -------- -#define AT91C_AIC_NFIQ ((unsigned int) 0x1 << 0) // (AIC) NFIQ Status -#define AT91C_AIC_NIRQ ((unsigned int) 0x1 << 1) // (AIC) NIRQ Status +#define AT91C_AIC_NFIQ (0x1u << 0) // (AIC) NFIQ Status +#define AT91C_AIC_NIRQ (0x1u << 1) // (AIC) NIRQ Status // -------- AIC_DCR : (AIC Offset: 0x138) AIC Debug Control Register (Protect) -------- -#define AT91C_AIC_DCR_PROT ((unsigned int) 0x1 << 0) // (AIC) Protection Mode -#define AT91C_AIC_DCR_GMSK ((unsigned int) 0x1 << 1) // (AIC) General Mask +#define AT91C_AIC_DCR_PROT (0x1u << 0) // (AIC) Protection Mode +#define AT91C_AIC_DCR_GMSK (0x1u << 1) // (AIC) General Mask // ***************************************************************************** // SOFTWARE API DEFINITION FOR Serial Parallel Interface @@ -791,55 +791,55 @@ } AT91S_SPI, *AT91PS_SPI; // -------- SPI_CR : (SPI Offset: 0x0) SPI Control Register -------- -#define AT91C_SPI_SPIEN ((unsigned int) 0x1 << 0) // (SPI) SPI Enable -#define AT91C_SPI_SPIDIS ((unsigned int) 0x1 << 1) // (SPI) SPI Disable -#define AT91C_SPI_SWRST ((unsigned int) 0x1 << 7) // (SPI) SPI Software reset +#define AT91C_SPI_SPIEN (0x1u << 0) // (SPI) SPI Enable +#define AT91C_SPI_SPIDIS (0x1u << 1) // (SPI) SPI Disable +#define AT91C_SPI_SWRST (0x1u << 7) // (SPI) SPI Software reset // -------- SPI_MR : (SPI Offset: 0x4) SPI Mode Register -------- -#define AT91C_SPI_MSTR ((unsigned int) 0x1 << 0) // (SPI) Master/Slave Mode -#define AT91C_SPI_PS ((unsigned int) 0x1 << 1) // (SPI) Peripheral Select -#define AT91C_SPI_PS_FIXED ((unsigned int) 0x0 << 1) // (SPI) Fixed Peripheral Select -#define AT91C_SPI_PS_VARIABLE ((unsigned int) 0x1 << 1) // (SPI) Variable Peripheral Select -#define AT91C_SPI_PCSDEC ((unsigned int) 0x1 << 2) // (SPI) Chip Select Decode -#define AT91C_SPI_DIV32 ((unsigned int) 0x1 << 3) // (SPI) Clock Selection -#define AT91C_SPI_MODFDIS ((unsigned int) 0x1 << 4) // (SPI) Mode Fault Detection -#define AT91C_SPI_LLB ((unsigned int) 0x1 << 7) // (SPI) Clock Selection -#define AT91C_SPI_PCS ((unsigned int) 0xF << 16) // (SPI) Peripheral Chip Select -#define AT91C_SPI_DLYBCS ((unsigned int) 0xFF << 24) // (SPI) Delay Between Chip Selects +#define AT91C_SPI_MSTR (0x1u << 0) // (SPI) Master/Slave Mode +#define AT91C_SPI_PS (0x1u << 1) // (SPI) Peripheral Select +#define AT91C_SPI_PS_FIXED (0x0u << 1) // (SPI) Fixed Peripheral Select +#define AT91C_SPI_PS_VARIABLE (0x1u << 1) // (SPI) Variable Peripheral Select +#define AT91C_SPI_PCSDEC (0x1u << 2) // (SPI) Chip Select Decode +#define AT91C_SPI_DIV32 (0x1u << 3) // (SPI) Clock Selection +#define AT91C_SPI_MODFDIS (0x1u << 4) // (SPI) Mode Fault Detection +#define AT91C_SPI_LLB (0x1u << 7) // (SPI) Clock Selection +#define AT91C_SPI_PCS (0xFu << 16) // (SPI) Peripheral Chip Select +#define AT91C_SPI_DLYBCS (0xFFu << 24) // (SPI) Delay Between Chip Selects // -------- SPI_RDR : (SPI Offset: 0x8) Receive Data Register -------- -#define AT91C_SPI_RD ((unsigned int) 0xFFFF << 0) // (SPI) Receive Data -#define AT91C_SPI_RPCS ((unsigned int) 0xF << 16) // (SPI) Peripheral Chip Select Status +#define AT91C_SPI_RD (0xFFFFu << 0) // (SPI) Receive Data +#define AT91C_SPI_RPCS (0xFu << 16) // (SPI) Peripheral Chip Select Status // -------- SPI_TDR : (SPI Offset: 0xc) Transmit Data Register -------- -#define AT91C_SPI_TD ((unsigned int) 0xFFFF << 0) // (SPI) Transmit Data -#define AT91C_SPI_TPCS ((unsigned int) 0xF << 16) // (SPI) Peripheral Chip Select Status +#define AT91C_SPI_TD (0xFFFFu << 0) // (SPI) Transmit Data +#define AT91C_SPI_TPCS (0xFu << 16) // (SPI) Peripheral Chip Select Status // -------- SPI_SR : (SPI Offset: 0x10) Status Register -------- -#define AT91C_SPI_RDRF ((unsigned int) 0x1 << 0) // (SPI) Receive Data Register Full -#define AT91C_SPI_TDRE ((unsigned int) 0x1 << 1) // (SPI) Transmit Data Register Empty -#define AT91C_SPI_MODF ((unsigned int) 0x1 << 2) // (SPI) Mode Fault Error -#define AT91C_SPI_OVRES ((unsigned int) 0x1 << 3) // (SPI) Overrun Error Status -#define AT91C_SPI_SPENDRX ((unsigned int) 0x1 << 4) // (SPI) End of Receiver Transfer -#define AT91C_SPI_SPENDTX ((unsigned int) 0x1 << 5) // (SPI) End of Receiver Transfer -#define AT91C_SPI_RXBUFF ((unsigned int) 0x1 << 6) // (SPI) RXBUFF Interrupt -#define AT91C_SPI_TXBUFE ((unsigned int) 0x1 << 7) // (SPI) TXBUFE Interrupt -#define AT91C_SPI_SPIENS ((unsigned int) 0x1 << 16) // (SPI) Enable Status +#define AT91C_SPI_RDRF (0x1u << 0) // (SPI) Receive Data Register Full +#define AT91C_SPI_TDRE (0x1u << 1) // (SPI) Transmit Data Register Empty +#define AT91C_SPI_MODF (0x1u << 2) // (SPI) Mode Fault Error +#define AT91C_SPI_OVRES (0x1u << 3) // (SPI) Overrun Error Status +#define AT91C_SPI_SPENDRX (0x1u << 4) // (SPI) End of Receiver Transfer +#define AT91C_SPI_SPENDTX (0x1u << 5) // (SPI) End of Receiver Transfer +#define AT91C_SPI_RXBUFF (0x1u << 6) // (SPI) RXBUFF Interrupt +#define AT91C_SPI_TXBUFE (0x1u << 7) // (SPI) TXBUFE Interrupt +#define AT91C_SPI_SPIENS (0x1u << 16) // (SPI) Enable Status // -------- SPI_IER : (SPI Offset: 0x14) Interrupt Enable Register -------- // -------- SPI_IDR : (SPI Offset: 0x18) Interrupt Disable Register -------- // -------- SPI_IMR : (SPI Offset: 0x1c) Interrupt Mask Register -------- // -------- SPI_CSR : (SPI Offset: 0x30) Chip Select Register -------- -#define AT91C_SPI_CPOL ((unsigned int) 0x1 << 0) // (SPI) Clock Polarity -#define AT91C_SPI_NCPHA ((unsigned int) 0x1 << 1) // (SPI) Clock Phase -#define AT91C_SPI_BITS ((unsigned int) 0xF << 4) // (SPI) Bits Per Transfer -#define AT91C_SPI_BITS_8 ((unsigned int) 0x0 << 4) // (SPI) 8 Bits Per transfer -#define AT91C_SPI_BITS_9 ((unsigned int) 0x1 << 4) // (SPI) 9 Bits Per transfer -#define AT91C_SPI_BITS_10 ((unsigned int) 0x2 << 4) // (SPI) 10 Bits Per transfer -#define AT91C_SPI_BITS_11 ((unsigned int) 0x3 << 4) // (SPI) 11 Bits Per transfer -#define AT91C_SPI_BITS_12 ((unsigned int) 0x4 << 4) // (SPI) 12 Bits Per transfer -#define AT91C_SPI_BITS_13 ((unsigned int) 0x5 << 4) // (SPI) 13 Bits Per transfer -#define AT91C_SPI_BITS_14 ((unsigned int) 0x6 << 4) // (SPI) 14 Bits Per transfer -#define AT91C_SPI_BITS_15 ((unsigned int) 0x7 << 4) // (SPI) 15 Bits Per transfer -#define AT91C_SPI_BITS_16 ((unsigned int) 0x8 << 4) // (SPI) 16 Bits Per transfer -#define AT91C_SPI_SCBR ((unsigned int) 0xFF << 8) // (SPI) Serial Clock Baud Rate -#define AT91C_SPI_DLYBS ((unsigned int) 0xFF << 16) // (SPI) Serial Clock Baud Rate -#define AT91C_SPI_DLYBCT ((unsigned int) 0xFF << 24) // (SPI) Delay Between Consecutive Transfers +#define AT91C_SPI_CPOL (0x1u << 0) // (SPI) Clock Polarity +#define AT91C_SPI_NCPHA (0x1u << 1) // (SPI) Clock Phase +#define AT91C_SPI_BITS (0xFu << 4) // (SPI) Bits Per Transfer +#define AT91C_SPI_BITS_8 (0x0u << 4) // (SPI) 8 Bits Per transfer +#define AT91C_SPI_BITS_9 (0x1u << 4) // (SPI) 9 Bits Per transfer +#define AT91C_SPI_BITS_10 (0x2u << 4) // (SPI) 10 Bits Per transfer +#define AT91C_SPI_BITS_11 (0x3u << 4) // (SPI) 11 Bits Per transfer +#define AT91C_SPI_BITS_12 (0x4u << 4) // (SPI) 12 Bits Per transfer +#define AT91C_SPI_BITS_13 (0x5u << 4) // (SPI) 13 Bits Per transfer +#define AT91C_SPI_BITS_14 (0x6u << 4) // (SPI) 14 Bits Per transfer +#define AT91C_SPI_BITS_15 (0x7u << 4) // (SPI) 15 Bits Per transfer +#define AT91C_SPI_BITS_16 (0x8u << 4) // (SPI) 16 Bits Per transfer +#define AT91C_SPI_SCBR (0xFFu << 8) // (SPI) Serial Clock Baud Rate +#define AT91C_SPI_DLYBS (0xFFu << 16) // (SPI) Serial Clock Baud Rate +#define AT91C_SPI_DLYBCT (0xFFu << 24) // (SPI) Delay Between Consecutive Transfers // ***************************************************************************** // SOFTWARE API DEFINITION FOR Synchronous Serial Controller Interface @@ -877,72 +877,72 @@ } AT91S_SSC, *AT91PS_SSC; // -------- SSC_CR : (SSC Offset: 0x0) SSC Control Register -------- -#define AT91C_SSC_RXEN ((unsigned int) 0x1 << 0) // (SSC) Receive Enable -#define AT91C_SSC_RXDIS ((unsigned int) 0x1 << 1) // (SSC) Receive Disable -#define AT91C_SSC_TXEN ((unsigned int) 0x1 << 8) // (SSC) Transmit Enable -#define AT91C_SSC_TXDIS ((unsigned int) 0x1 << 9) // (SSC) Transmit Disable -#define AT91C_SSC_SWRST ((unsigned int) 0x1 << 15) // (SSC) Software Reset +#define AT91C_SSC_RXEN (0x1u << 0) // (SSC) Receive Enable +#define AT91C_SSC_RXDIS (0x1u << 1) // (SSC) Receive Disable +#define AT91C_SSC_TXEN (0x1u << 8) // (SSC) Transmit Enable +#define AT91C_SSC_TXDIS (0x1u << 9) // (SSC) Transmit Disable +#define AT91C_SSC_SWRST (0x1u << 15) // (SSC) Software Reset // -------- SSC_RCMR : (SSC Offset: 0x10) SSC Receive Clock Mode Register -------- -#define AT91C_SSC_CKS ((unsigned int) 0x3 << 0) // (SSC) Receive/Transmit Clock Selection -#define AT91C_SSC_CKS_DIV ((unsigned int) 0x0) // (SSC) Divided Clock -#define AT91C_SSC_CKS_TK ((unsigned int) 0x1) // (SSC) TK Clock signal -#define AT91C_SSC_CKS_RK ((unsigned int) 0x2) // (SSC) RK pin -#define AT91C_SSC_CKO ((unsigned int) 0x7 << 2) // (SSC) Receive/Transmit Clock Output Mode Selection -#define AT91C_SSC_CKO_NONE ((unsigned int) 0x0 << 2) // (SSC) Receive/Transmit Clock Output Mode: None RK pin: Input-only -#define AT91C_SSC_CKO_CONTINOUS ((unsigned int) 0x1 << 2) // (SSC) Continuous Receive/Transmit Clock RK pin: Output -#define AT91C_SSC_CKO_DATA_TX ((unsigned int) 0x2 << 2) // (SSC) Receive/Transmit Clock only during data transfers RK pin: Output -#define AT91C_SSC_CKI ((unsigned int) 0x1 << 5) // (SSC) Receive/Transmit Clock Inversion -#define AT91C_SSC_CKG ((unsigned int) 0x3 << 6) // (SSC) Receive/Transmit Clock Gating Selection -#define AT91C_SSC_CKG_NONE ((unsigned int) 0x0 << 6) // (SSC) Receive/Transmit Clock Gating: None, continuous clock -#define AT91C_SSC_CKG_LOW ((unsigned int) 0x1 << 6) // (SSC) Receive/Transmit Clock enabled only if RF Low -#define AT91C_SSC_CKG_HIGH ((unsigned int) 0x2 << 6) // (SSC) Receive/Transmit Clock enabled only if RF High -#define AT91C_SSC_START ((unsigned int) 0xF << 8) // (SSC) Receive/Transmit Start Selection -#define AT91C_SSC_START_CONTINOUS ((unsigned int) 0x0 << 8) // (SSC) Continuous, as soon as the receiver is enabled, and immediately after the end of transfer of the previous data. -#define AT91C_SSC_START_TX ((unsigned int) 0x1 << 8) // (SSC) Transmit/Receive start -#define AT91C_SSC_START_LOW_RF ((unsigned int) 0x2 << 8) // (SSC) Detection of a low level on RF input -#define AT91C_SSC_START_HIGH_RF ((unsigned int) 0x3 << 8) // (SSC) Detection of a high level on RF input -#define AT91C_SSC_START_FALL_RF ((unsigned int) 0x4 << 8) // (SSC) Detection of a falling edge on RF input -#define AT91C_SSC_START_RISE_RF ((unsigned int) 0x5 << 8) // (SSC) Detection of a rising edge on RF input -#define AT91C_SSC_START_LEVEL_RF ((unsigned int) 0x6 << 8) // (SSC) Detection of any level change on RF input -#define AT91C_SSC_START_EDGE_RF ((unsigned int) 0x7 << 8) // (SSC) Detection of any edge on RF input -#define AT91C_SSC_START_0 ((unsigned int) 0x8 << 8) // (SSC) Compare 0 -#define AT91C_SSC_STOP ((unsigned int) 0x1 << 12) // (SSC) Receive Stop Selection -#define AT91C_SSC_STTOUT ((unsigned int) 0x1 << 15) // (SSC) Receive/Transmit Start Output Selection -#define AT91C_SSC_STTDLY ((unsigned int) 0xFF << 16) // (SSC) Receive/Transmit Start Delay -#define AT91C_SSC_PERIOD ((unsigned int) 0xFF << 24) // (SSC) Receive/Transmit Period Divider Selection +#define AT91C_SSC_CKS (0x3u << 0) // (SSC) Receive/Transmit Clock Selection +#define AT91C_SSC_CKS_DIV 0x0u // (SSC) Divided Clock +#define AT91C_SSC_CKS_TK 0x1u // (SSC) TK Clock signal +#define AT91C_SSC_CKS_RK 0x2u // (SSC) RK pin +#define AT91C_SSC_CKO (0x7u << 2) // (SSC) Receive/Transmit Clock Output Mode Selection +#define AT91C_SSC_CKO_NONE (0x0u << 2) // (SSC) Receive/Transmit Clock Output Mode: None RK pin: Input-only +#define AT91C_SSC_CKO_CONTINOUS (0x1u << 2) // (SSC) Continuous Receive/Transmit Clock RK pin: Output +#define AT91C_SSC_CKO_DATA_TX (0x2u << 2) // (SSC) Receive/Transmit Clock only during data transfers RK pin: Output +#define AT91C_SSC_CKI (0x1u << 5) // (SSC) Receive/Transmit Clock Inversion +#define AT91C_SSC_CKG (0x3u << 6) // (SSC) Receive/Transmit Clock Gating Selection +#define AT91C_SSC_CKG_NONE (0x0u << 6) // (SSC) Receive/Transmit Clock Gating: None, continuous clock +#define AT91C_SSC_CKG_LOW (0x1u << 6) // (SSC) Receive/Transmit Clock enabled only if RF Low +#define AT91C_SSC_CKG_HIGH (0x2u << 6) // (SSC) Receive/Transmit Clock enabled only if RF High +#define AT91C_SSC_START (0xFu << 8) // (SSC) Receive/Transmit Start Selection +#define AT91C_SSC_START_CONTINOUS (0x0u << 8) // (SSC) Continuous, as soon as the receiver is enabled, and immediately after the end of transfer of the previous data. +#define AT91C_SSC_START_TX (0x1u << 8) // (SSC) Transmit/Receive start +#define AT91C_SSC_START_LOW_RF (0x2u << 8) // (SSC) Detection of a low level on RF input +#define AT91C_SSC_START_HIGH_RF (0x3u << 8) // (SSC) Detection of a high level on RF input +#define AT91C_SSC_START_FALL_RF (0x4u << 8) // (SSC) Detection of a falling edge on RF input +#define AT91C_SSC_START_RISE_RF (0x5u << 8) // (SSC) Detection of a rising edge on RF input +#define AT91C_SSC_START_LEVEL_RF (0x6u << 8) // (SSC) Detection of any level change on RF input +#define AT91C_SSC_START_EDGE_RF (0x7u << 8) // (SSC) Detection of any edge on RF input +#define AT91C_SSC_START_0 (0x8u << 8) // (SSC) Compare 0 +#define AT91C_SSC_STOP (0x1u << 12) // (SSC) Receive Stop Selection +#define AT91C_SSC_STTOUT (0x1u << 15) // (SSC) Receive/Transmit Start Output Selection +#define AT91C_SSC_STTDLY (0xFFu << 16) // (SSC) Receive/Transmit Start Delay +#define AT91C_SSC_PERIOD (0xFFu << 24) // (SSC) Receive/Transmit Period Divider Selection // -------- SSC_RFMR : (SSC Offset: 0x14) SSC Receive Frame Mode Register -------- -#define AT91C_SSC_DATLEN ((unsigned int) 0x1F << 0) // (SSC) Data Length -#define AT91C_SSC_LOOP ((unsigned int) 0x1 << 5) // (SSC) Loop Mode -#define AT91C_SSC_MSBF ((unsigned int) 0x1 << 7) // (SSC) Most Significant Bit First -#define AT91C_SSC_DATNB ((unsigned int) 0xF << 8) // (SSC) Data Number per Frame -#define AT91C_SSC_FSLEN ((unsigned int) 0xF << 16) // (SSC) Receive/Transmit Frame Sync length -#define AT91C_SSC_FSOS ((unsigned int) 0x7 << 20) // (SSC) Receive/Transmit Frame Sync Output Selection -#define AT91C_SSC_FSOS_NONE ((unsigned int) 0x0 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: None RK pin Input-only -#define AT91C_SSC_FSOS_NEGATIVE ((unsigned int) 0x1 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Negative Pulse -#define AT91C_SSC_FSOS_POSITIVE ((unsigned int) 0x2 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Positive Pulse -#define AT91C_SSC_FSOS_LOW ((unsigned int) 0x3 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver Low during data transfer -#define AT91C_SSC_FSOS_HIGH ((unsigned int) 0x4 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver High during data transfer -#define AT91C_SSC_FSOS_TOGGLE ((unsigned int) 0x5 << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Toggling at each start of data transfer -#define AT91C_SSC_FSEDGE ((unsigned int) 0x1 << 24) // (SSC) Frame Sync Edge Detection +#define AT91C_SSC_DATLEN (0x1Fu << 0) // (SSC) Data Length +#define AT91C_SSC_LOOP (0x1u << 5) // (SSC) Loop Mode +#define AT91C_SSC_MSBF (0x1u << 7) // (SSC) Most Significant Bit First +#define AT91C_SSC_DATNB (0xFu << 8) // (SSC) Data Number per Frame +#define AT91C_SSC_FSLEN (0xFu << 16) // (SSC) Receive/Transmit Frame Sync length +#define AT91C_SSC_FSOS (0x7u << 20) // (SSC) Receive/Transmit Frame Sync Output Selection +#define AT91C_SSC_FSOS_NONE (0x0u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: None RK pin Input-only +#define AT91C_SSC_FSOS_NEGATIVE (0x1u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Negative Pulse +#define AT91C_SSC_FSOS_POSITIVE (0x2u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Positive Pulse +#define AT91C_SSC_FSOS_LOW (0x3u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver Low during data transfer +#define AT91C_SSC_FSOS_HIGH (0x4u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver High during data transfer +#define AT91C_SSC_FSOS_TOGGLE (0x5u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Toggling at each start of data transfer +#define AT91C_SSC_FSEDGE (0x1u << 24) // (SSC) Frame Sync Edge Detection // -------- SSC_TCMR : (SSC Offset: 0x18) SSC Transmit Clock Mode Register -------- // -------- SSC_TFMR : (SSC Offset: 0x1c) SSC Transmit Frame Mode Register -------- -#define AT91C_SSC_DATDEF ((unsigned int) 0x1 << 5) // (SSC) Data Default Value -#define AT91C_SSC_FSDEN ((unsigned int) 0x1 << 23) // (SSC) Frame Sync Data Enable +#define AT91C_SSC_DATDEF (0x1u << 5) // (SSC) Data Default Value +#define AT91C_SSC_FSDEN (0x1u << 23) // (SSC) Frame Sync Data Enable // -------- SSC_SR : (SSC Offset: 0x40) SSC Status Register -------- -#define AT91C_SSC_TXRDY ((unsigned int) 0x1 << 0) // (SSC) Transmit Ready -#define AT91C_SSC_TXEMPTY ((unsigned int) 0x1 << 1) // (SSC) Transmit Empty -#define AT91C_SSC_ENDTX ((unsigned int) 0x1 << 2) // (SSC) End Of Transmission -#define AT91C_SSC_TXBUFE ((unsigned int) 0x1 << 3) // (SSC) Transmit Buffer Empty -#define AT91C_SSC_RXRDY ((unsigned int) 0x1 << 4) // (SSC) Receive Ready -#define AT91C_SSC_OVRUN ((unsigned int) 0x1 << 5) // (SSC) Receive Overrun -#define AT91C_SSC_ENDRX ((unsigned int) 0x1 << 6) // (SSC) End of Reception -#define AT91C_SSC_RXBUFF ((unsigned int) 0x1 << 7) // (SSC) Receive Buffer Full -#define AT91C_SSC_CP0 ((unsigned int) 0x1 << 8) // (SSC) Compare 0 -#define AT91C_SSC_CP1 ((unsigned int) 0x1 << 9) // (SSC) Compare 1 -#define AT91C_SSC_TXSYN ((unsigned int) 0x1 << 10) // (SSC) Transmit Sync -#define AT91C_SSC_RXSYN ((unsigned int) 0x1 << 11) // (SSC) Receive Sync -#define AT91C_SSC_TXENA ((unsigned int) 0x1 << 16) // (SSC) Transmit Enable -#define AT91C_SSC_RXENA ((unsigned int) 0x1 << 17) // (SSC) Receive Enable +#define AT91C_SSC_TXRDY (0x1u << 0) // (SSC) Transmit Ready +#define AT91C_SSC_TXEMPTY (0x1u << 1) // (SSC) Transmit Empty +#define AT91C_SSC_ENDTX (0x1u << 2) // (SSC) End Of Transmission +#define AT91C_SSC_TXBUFE (0x1u << 3) // (SSC) Transmit Buffer Empty +#define AT91C_SSC_RXRDY (0x1u << 4) // (SSC) Receive Ready +#define AT91C_SSC_OVRUN (0x1u << 5) // (SSC) Receive Overrun +#define AT91C_SSC_ENDRX (0x1u << 6) // (SSC) End of Reception +#define AT91C_SSC_RXBUFF (0x1u << 7) // (SSC) Receive Buffer Full +#define AT91C_SSC_CP0 (0x1u << 8) // (SSC) Compare 0 +#define AT91C_SSC_CP1 (0x1u << 9) // (SSC) Compare 1 +#define AT91C_SSC_TXSYN (0x1u << 10) // (SSC) Transmit Sync +#define AT91C_SSC_RXSYN (0x1u << 11) // (SSC) Receive Sync +#define AT91C_SSC_TXENA (0x1u << 16) // (SSC) Transmit Enable +#define AT91C_SSC_RXENA (0x1u << 17) // (SSC) Receive Enable // -------- SSC_IER : (SSC Offset: 0x44) SSC Interrupt Enable Register -------- // -------- SSC_IDR : (SSC Offset: 0x48) SSC Interrupt Disable Register -------- // -------- SSC_IMR : (SSC Offset: 0x4c) SSC Interrupt Mask Register -------- @@ -981,67 +981,67 @@ } AT91S_USART, *AT91PS_USART; // -------- US_CR : (USART Offset: 0x0) Debug Unit Control Register -------- -#define AT91C_US_RSTSTA ((unsigned int) 0x1 << 8) // (USART) Reset Status Bits -#define AT91C_US_STTBRK ((unsigned int) 0x1 << 9) // (USART) Start Break -#define AT91C_US_STPBRK ((unsigned int) 0x1 << 10) // (USART) Stop Break -#define AT91C_US_STTTO ((unsigned int) 0x1 << 11) // (USART) Start Time-out -#define AT91C_US_SENDA ((unsigned int) 0x1 << 12) // (USART) Send Address -#define AT91C_US_RSTIT ((unsigned int) 0x1 << 13) // (USART) Reset Iterations -#define AT91C_US_RSTNACK ((unsigned int) 0x1 << 14) // (USART) Reset Non Acknowledge -#define AT91C_US_RETTO ((unsigned int) 0x1 << 15) // (USART) Rearm Time-out -#define AT91C_US_DTREN ((unsigned int) 0x1 << 16) // (USART) Data Terminal ready Enable -#define AT91C_US_DTRDIS ((unsigned int) 0x1 << 17) // (USART) Data Terminal ready Disable -#define AT91C_US_RTSEN ((unsigned int) 0x1 << 18) // (USART) Request to Send enable -#define AT91C_US_RTSDIS ((unsigned int) 0x1 << 19) // (USART) Request to Send Disable +#define AT91C_US_RSTSTA (0x1u << 8) // (USART) Reset Status Bits +#define AT91C_US_STTBRK (0x1u << 9) // (USART) Start Break +#define AT91C_US_STPBRK (0x1u << 10) // (USART) Stop Break +#define AT91C_US_STTTO (0x1u << 11) // (USART) Start Time-out +#define AT91C_US_SENDA (0x1u << 12) // (USART) Send Address +#define AT91C_US_RSTIT (0x1u << 13) // (USART) Reset Iterations +#define AT91C_US_RSTNACK (0x1u << 14) // (USART) Reset Non Acknowledge +#define AT91C_US_RETTO (0x1u << 15) // (USART) Rearm Time-out +#define AT91C_US_DTREN (0x1u << 16) // (USART) Data Terminal ready Enable +#define AT91C_US_DTRDIS (0x1u << 17) // (USART) Data Terminal ready Disable +#define AT91C_US_RTSEN (0x1u << 18) // (USART) Request to Send enable +#define AT91C_US_RTSDIS (0x1u << 19) // (USART) Request to Send Disable // -------- US_MR : (USART Offset: 0x4) Debug Unit Mode Register -------- -#define AT91C_US_USMODE ((unsigned int) 0xF << 0) // (USART) Usart mode -#define AT91C_US_USMODE_NORMAL ((unsigned int) 0x0) // (USART) Normal -#define AT91C_US_USMODE_RS485 ((unsigned int) 0x1) // (USART) RS485 -#define AT91C_US_USMODE_HWHSH ((unsigned int) 0x2) // (USART) Hardware Handshaking -#define AT91C_US_USMODE_MODEM ((unsigned int) 0x3) // (USART) Modem -#define AT91C_US_USMODE_ISO7816_0 ((unsigned int) 0x4) // (USART) ISO7816 protocol: T = 0 -#define AT91C_US_USMODE_ISO7816_1 ((unsigned int) 0x6) // (USART) ISO7816 protocol: T = 1 -#define AT91C_US_USMODE_IRDA ((unsigned int) 0x8) // (USART) IrDA -#define AT91C_US_USMODE_SWHSH ((unsigned int) 0xC) // (USART) Software Handshaking -#define AT91C_US_CLKS ((unsigned int) 0x3 << 4) // (USART) Clock Selection (Baud Rate generator Input Clock -#define AT91C_US_CLKS_CLOCK ((unsigned int) 0x0 << 4) // (USART) Clock -#define AT91C_US_CLKS_FDIV1 ((unsigned int) 0x1 << 4) // (USART) fdiv1 -#define AT91C_US_CLKS_SLOW ((unsigned int) 0x2 << 4) // (USART) slow_clock (ARM) -#define AT91C_US_CLKS_EXT ((unsigned int) 0x3 << 4) // (USART) External (SCK) -#define AT91C_US_CHRL ((unsigned int) 0x3 << 6) // (USART) Clock Selection (Baud Rate generator Input Clock -#define AT91C_US_CHRL_5_BITS ((unsigned int) 0x0 << 6) // (USART) Character Length: 5 bits -#define AT91C_US_CHRL_6_BITS ((unsigned int) 0x1 << 6) // (USART) Character Length: 6 bits -#define AT91C_US_CHRL_7_BITS ((unsigned int) 0x2 << 6) // (USART) Character Length: 7 bits -#define AT91C_US_CHRL_8_BITS ((unsigned int) 0x3 << 6) // (USART) Character Length: 8 bits -#define AT91C_US_SYNC ((unsigned int) 0x1 << 8) // (USART) Synchronous Mode Select -#define AT91C_US_NBSTOP ((unsigned int) 0x3 << 12) // (USART) Number of Stop bits -#define AT91C_US_NBSTOP_1_BIT ((unsigned int) 0x0 << 12) // (USART) 1 stop bit -#define AT91C_US_NBSTOP_15_BIT ((unsigned int) 0x1 << 12) // (USART) Asynchronous (SYNC=0) 2 stop bits Synchronous (SYNC=1) 2 stop bits -#define AT91C_US_NBSTOP_2_BIT ((unsigned int) 0x2 << 12) // (USART) 2 stop bits -#define AT91C_US_MSBF ((unsigned int) 0x1 << 16) // (USART) Bit Order -#define AT91C_US_MODE9 ((unsigned int) 0x1 << 17) // (USART) 9-bit Character length -#define AT91C_US_CKLO ((unsigned int) 0x1 << 18) // (USART) Clock Output Select -#define AT91C_US_OVER ((unsigned int) 0x1 << 19) // (USART) Over Sampling Mode -#define AT91C_US_INACK ((unsigned int) 0x1 << 20) // (USART) Inhibit Non Acknowledge -#define AT91C_US_DSNACK ((unsigned int) 0x1 << 21) // (USART) Disable Successive NACK -#define AT91C_US_MAX_ITER ((unsigned int) 0x1 << 24) // (USART) Number of Repetitions -#define AT91C_US_FILTER ((unsigned int) 0x1 << 28) // (USART) Receive Line Filter +#define AT91C_US_USMODE (0xFu << 0) // (USART) Usart mode +#define AT91C_US_USMODE_NORMAL 0x0u // (USART) Normal +#define AT91C_US_USMODE_RS485 0x1u // (USART) RS485 +#define AT91C_US_USMODE_HWHSH 0x2u // (USART) Hardware Handshaking +#define AT91C_US_USMODE_MODEM 0x3u // (USART) Modem +#define AT91C_US_USMODE_ISO7816_0 0x4u // (USART) ISO7816 protocol: T = 0 +#define AT91C_US_USMODE_ISO7816_1 0x6u // (USART) ISO7816 protocol: T = 1 +#define AT91C_US_USMODE_IRDA 0x8u // (USART) IrDA +#define AT91C_US_USMODE_SWHSH 0xCu // (USART) Software Handshaking +#define AT91C_US_CLKS (0x3u << 4) // (USART) Clock Selection (Baud Rate generator Input Clock +#define AT91C_US_CLKS_CLOCK (0x0u << 4) // (USART) Clock +#define AT91C_US_CLKS_FDIV1 (0x1u << 4) // (USART) fdiv1 +#define AT91C_US_CLKS_SLOW (0x2u << 4) // (USART) slow_clock (ARM) +#define AT91C_US_CLKS_EXT (0x3u << 4) // (USART) External (SCK) +#define AT91C_US_CHRL (0x3u << 6) // (USART) Clock Selection (Baud Rate generator Input Clock +#define AT91C_US_CHRL_5_BITS (0x0u << 6) // (USART) Character Length: 5 bits +#define AT91C_US_CHRL_6_BITS (0x1u << 6) // (USART) Character Length: 6 bits +#define AT91C_US_CHRL_7_BITS (0x2u << 6) // (USART) Character Length: 7 bits +#define AT91C_US_CHRL_8_BITS (0x3u << 6) // (USART) Character Length: 8 bits +#define AT91C_US_SYNC (0x1u << 8) // (USART) Synchronous Mode Select +#define AT91C_US_NBSTOP (0x3u << 12) // (USART) Number of Stop bits +#define AT91C_US_NBSTOP_1_BIT (0x0u << 12) // (USART) 1 stop bit +#define AT91C_US_NBSTOP_15_BIT (0x1u << 12) // (USART) Asynchronous (SYNC=0) 2 stop bits Synchronous (SYNC=1) 2 stop bits +#define AT91C_US_NBSTOP_2_BIT (0x2u << 12) // (USART) 2 stop bits +#define AT91C_US_MSBF (0x1u << 16) // (USART) Bit Order +#define AT91C_US_MODE9 (0x1u << 17) // (USART) 9-bit Character length +#define AT91C_US_CKLO (0x1u << 18) // (USART) Clock Output Select +#define AT91C_US_OVER (0x1u << 19) // (USART) Over Sampling Mode +#define AT91C_US_INACK (0x1u << 20) // (USART) Inhibit Non Acknowledge +#define AT91C_US_DSNACK (0x1u << 21) // (USART) Disable Successive NACK +#define AT91C_US_MAX_ITER (0x1u << 24) // (USART) Number of Repetitions +#define AT91C_US_FILTER (0x1u << 28) // (USART) Receive Line Filter // -------- US_IER : (USART Offset: 0x8) Debug Unit Interrupt Enable Register -------- -#define AT91C_US_RXBRK ((unsigned int) 0x1 << 2) // (USART) Break Received/End of Break -#define AT91C_US_TIMEOUT ((unsigned int) 0x1 << 8) // (USART) Receiver Time-out -#define AT91C_US_ITERATION ((unsigned int) 0x1 << 10) // (USART) Max number of Repetitions Reached -#define AT91C_US_NACK ((unsigned int) 0x1 << 13) // (USART) Non Acknowledge -#define AT91C_US_RIIC ((unsigned int) 0x1 << 16) // (USART) Ring INdicator Input Change Flag -#define AT91C_US_DSRIC ((unsigned int) 0x1 << 17) // (USART) Data Set Ready Input Change Flag -#define AT91C_US_DCDIC ((unsigned int) 0x1 << 18) // (USART) Data Carrier Flag -#define AT91C_US_CTSIC ((unsigned int) 0x1 << 19) // (USART) Clear To Send Input Change Flag +#define AT91C_US_RXBRK (0x1u << 2) // (USART) Break Received/End of Break +#define AT91C_US_TIMEOUT (0x1u << 8) // (USART) Receiver Time-out +#define AT91C_US_ITERATION (0x1u << 10) // (USART) Max number of Repetitions Reached +#define AT91C_US_NACK (0x1u << 13) // (USART) Non Acknowledge +#define AT91C_US_RIIC (0x1u << 16) // (USART) Ring INdicator Input Change Flag +#define AT91C_US_DSRIC (0x1u << 17) // (USART) Data Set Ready Input Change Flag +#define AT91C_US_DCDIC (0x1u << 18) // (USART) Data Carrier Flag +#define AT91C_US_CTSIC (0x1u << 19) // (USART) Clear To Send Input Change Flag // -------- US_IDR : (USART Offset: 0xc) Debug Unit Interrupt Disable Register -------- // -------- US_IMR : (USART Offset: 0x10) Debug Unit Interrupt Mask Register -------- // -------- US_CSR : (USART Offset: 0x14) Debug Unit Channel Status Register -------- -#define AT91C_US_RI ((unsigned int) 0x1 << 20) // (USART) Image of RI Input -#define AT91C_US_DSR ((unsigned int) 0x1 << 21) // (USART) Image of DSR Input -#define AT91C_US_DCD ((unsigned int) 0x1 << 22) // (USART) Image of DCD Input -#define AT91C_US_CTS ((unsigned int) 0x1 << 23) // (USART) Image of CTS Input +#define AT91C_US_RI (0x1u << 20) // (USART) Image of RI Input +#define AT91C_US_DSR (0x1u << 21) // (USART) Image of DSR Input +#define AT91C_US_DCD (0x1u << 22) // (USART) Image of DCD Input +#define AT91C_US_CTS (0x1u << 23) // (USART) Image of CTS Input // ***************************************************************************** // SOFTWARE API DEFINITION FOR Two-wire Interface @@ -1062,38 +1062,38 @@ } AT91S_TWI, *AT91PS_TWI; // -------- TWI_CR : (TWI Offset: 0x0) TWI Control Register -------- -#define AT91C_TWI_START ((unsigned int) 0x1 << 0) // (TWI) Send a START Condition -#define AT91C_TWI_STOP ((unsigned int) 0x1 << 1) // (TWI) Send a STOP Condition -#define AT91C_TWI_MSEN ((unsigned int) 0x1 << 2) // (TWI) TWI Master Transfer Enabled -#define AT91C_TWI_MSDIS ((unsigned int) 0x1 << 3) // (TWI) TWI Master Transfer Disabled -#define AT91C_TWI_SVEN ((unsigned int) 0x1 << 4) // (TWI) TWI Slave Transfer Enabled -#define AT91C_TWI_SVDIS ((unsigned int) 0x1 << 5) // (TWI) TWI Slave Transfer Disabled -#define AT91C_TWI_SWRST ((unsigned int) 0x1 << 7) // (TWI) Software Reset +#define AT91C_TWI_START (0x1u << 0) // (TWI) Send a START Condition +#define AT91C_TWI_STOP (0x1u << 1) // (TWI) Send a STOP Condition +#define AT91C_TWI_MSEN (0x1u << 2) // (TWI) TWI Master Transfer Enabled +#define AT91C_TWI_MSDIS (0x1u << 3) // (TWI) TWI Master Transfer Disabled +#define AT91C_TWI_SVEN (0x1u << 4) // (TWI) TWI Slave Transfer Enabled +#define AT91C_TWI_SVDIS (0x1u << 5) // (TWI) TWI Slave Transfer Disabled +#define AT91C_TWI_SWRST (0x1u << 7) // (TWI) Software Reset // -------- TWI_MMR : (TWI Offset: 0x4) TWI Master Mode Register -------- -#define AT91C_TWI_IADRSZ ((unsigned int) 0x3 << 8) // (TWI) Internal Device Address Size -#define AT91C_TWI_IADRSZ_NO ((unsigned int) 0x0 << 8) // (TWI) No internal device address -#define AT91C_TWI_IADRSZ_1_BYTE ((unsigned int) 0x1 << 8) // (TWI) One-byte internal device address -#define AT91C_TWI_IADRSZ_2_BYTE ((unsigned int) 0x2 << 8) // (TWI) Two-byte internal device address -#define AT91C_TWI_IADRSZ_3_BYTE ((unsigned int) 0x3 << 8) // (TWI) Three-byte internal device address -#define AT91C_TWI_MREAD ((unsigned int) 0x1 << 12) // (TWI) Master Read Direction -#define AT91C_TWI_DADR ((unsigned int) 0x7F << 16) // (TWI) Device Address +#define AT91C_TWI_IADRSZ (0x3u << 8) // (TWI) Internal Device Address Size +#define AT91C_TWI_IADRSZ_NO (0x0u << 8) // (TWI) No internal device address +#define AT91C_TWI_IADRSZ_1_BYTE (0x1u << 8) // (TWI) One-byte internal device address +#define AT91C_TWI_IADRSZ_2_BYTE (0x2u << 8) // (TWI) Two-byte internal device address +#define AT91C_TWI_IADRSZ_3_BYTE (0x3u << 8) // (TWI) Three-byte internal device address +#define AT91C_TWI_MREAD (0x1u << 12) // (TWI) Master Read Direction +#define AT91C_TWI_DADR (0x7Fu << 16) // (TWI) Device Address // -------- TWI_SMR : (TWI Offset: 0x8) TWI Slave Mode Register -------- -#define AT91C_TWI_SADR ((unsigned int) 0x7F << 16) // (TWI) Slave Device Address +#define AT91C_TWI_SADR (0x7Fu << 16) // (TWI) Slave Device Address // -------- TWI_CWGR : (TWI Offset: 0x10) TWI Clock Waveform Generator Register -------- -#define AT91C_TWI_CLDIV ((unsigned int) 0xFF << 0) // (TWI) Clock Low Divider -#define AT91C_TWI_CHDIV ((unsigned int) 0xFF << 8) // (TWI) Clock High Divider -#define AT91C_TWI_CKDIV ((unsigned int) 0x7 << 16) // (TWI) Clock Divider +#define AT91C_TWI_CLDIV (0xFFu << 0) // (TWI) Clock Low Divider +#define AT91C_TWI_CHDIV (0xFFu << 8) // (TWI) Clock High Divider +#define AT91C_TWI_CKDIV (0x7u << 16) // (TWI) Clock Divider // -------- TWI_SR : (TWI Offset: 0x20) TWI Status Register -------- -#define AT91C_TWI_TXCOMP ((unsigned int) 0x1 << 0) // (TWI) Transmission Completed -#define AT91C_TWI_RXRDY ((unsigned int) 0x1 << 1) // (TWI) Receive holding register ReaDY -#define AT91C_TWI_TXRDY ((unsigned int) 0x1 << 2) // (TWI) Transmit holding register ReaDY -#define AT91C_TWI_SVREAD ((unsigned int) 0x1 << 3) // (TWI) Slave Read -#define AT91C_TWI_SVACC ((unsigned int) 0x1 << 4) // (TWI) Slave Access -#define AT91C_TWI_GCACC ((unsigned int) 0x1 << 5) // (TWI) General Call Access -#define AT91C_TWI_OVRE ((unsigned int) 0x1 << 6) // (TWI) Overrun Error -#define AT91C_TWI_UNRE ((unsigned int) 0x1 << 7) // (TWI) Underrun Error -#define AT91C_TWI_NACK ((unsigned int) 0x1 << 8) // (TWI) Not Acknowledged -#define AT91C_TWI_ARBLST ((unsigned int) 0x1 << 9) // (TWI) Arbitration Lost +#define AT91C_TWI_TXCOMP (0x1u << 0) // (TWI) Transmission Completed +#define AT91C_TWI_RXRDY (0x1u << 1) // (TWI) Receive holding register ReaDY +#define AT91C_TWI_TXRDY (0x1u << 2) // (TWI) Transmit holding register ReaDY +#define AT91C_TWI_SVREAD (0x1u << 3) // (TWI) Slave Read +#define AT91C_TWI_SVACC (0x1u << 4) // (TWI) Slave Access +#define AT91C_TWI_GCACC (0x1u << 5) // (TWI) General Call Access +#define AT91C_TWI_OVRE (0x1u << 6) // (TWI) Overrun Error +#define AT91C_TWI_UNRE (0x1u << 7) // (TWI) Underrun Error +#define AT91C_TWI_NACK (0x1u << 8) // (TWI) Not Acknowledged +#define AT91C_TWI_ARBLST (0x1u << 9) // (TWI) Arbitration Lost // -------- TWI_IER : (TWI Offset: 0x24) TWI Interrupt Enable Register -------- // -------- TWI_IDR : (TWI Offset: 0x28) TWI Interrupt Disable Register -------- // -------- TWI_IMR : (TWI Offset: 0x2c) TWI Interrupt Mask Register -------- @@ -1131,73 +1131,73 @@ } AT91S_MCI, *AT91PS_MCI; // -------- MCI_CR : (MCI Offset: 0x0) MCI Control Register -------- -#define AT91C_MCI_MCIEN ((unsigned int) 0x1 << 0) // (MCI) Multimedia Interface Enable -#define AT91C_MCI_MCIDIS ((unsigned int) 0x1 << 1) // (MCI) Multimedia Interface Disable -#define AT91C_MCI_PWSEN ((unsigned int) 0x1 << 2) // (MCI) Power Save Mode Enable -#define AT91C_MCI_PWSDIS ((unsigned int) 0x1 << 3) // (MCI) Power Save Mode Disable +#define AT91C_MCI_MCIEN (0x1u << 0) // (MCI) Multimedia Interface Enable +#define AT91C_MCI_MCIDIS (0x1u << 1) // (MCI) Multimedia Interface Disable +#define AT91C_MCI_PWSEN (0x1u << 2) // (MCI) Power Save Mode Enable +#define AT91C_MCI_PWSDIS (0x1u << 3) // (MCI) Power Save Mode Disable // -------- MCI_MR : (MCI Offset: 0x4) MCI Mode Register -------- -#define AT91C_MCI_CLKDIV ((unsigned int) 0x1 << 0) // (MCI) Clock Divider -#define AT91C_MCI_PWSDIV ((unsigned int) 0x1 << 8) // (MCI) Power Saving Divider -#define AT91C_MCI_PDCPADV ((unsigned int) 0x1 << 14) // (MCI) PDC Padding Value -#define AT91C_MCI_PDCMODE ((unsigned int) 0x1 << 15) // (MCI) PDC Oriented Mode -#define AT91C_MCI_BLKLEN ((unsigned int) 0x1 << 18) // (MCI) Data Block Length +#define AT91C_MCI_CLKDIV (0x1u << 0) // (MCI) Clock Divider +#define AT91C_MCI_PWSDIV (0x1u << 8) // (MCI) Power Saving Divider +#define AT91C_MCI_PDCPADV (0x1u << 14) // (MCI) PDC Padding Value +#define AT91C_MCI_PDCMODE (0x1u << 15) // (MCI) PDC Oriented Mode +#define AT91C_MCI_BLKLEN (0x1u << 18) // (MCI) Data Block Length // -------- MCI_DTOR : (MCI Offset: 0x8) MCI Data Timeout Register -------- -#define AT91C_MCI_DTOCYC ((unsigned int) 0x1 << 0) // (MCI) Data Timeout Cycle Number -#define AT91C_MCI_DTOMUL ((unsigned int) 0x7 << 4) // (MCI) Data Timeout Multiplier -#define AT91C_MCI_DTOMUL_1 ((unsigned int) 0x0 << 4) // (MCI) DTOCYC x 1 -#define AT91C_MCI_DTOMUL_16 ((unsigned int) 0x1 << 4) // (MCI) DTOCYC x 16 -#define AT91C_MCI_DTOMUL_128 ((unsigned int) 0x2 << 4) // (MCI) DTOCYC x 128 -#define AT91C_MCI_DTOMUL_256 ((unsigned int) 0x3 << 4) // (MCI) DTOCYC x 256 -#define AT91C_MCI_DTOMUL_1024 ((unsigned int) 0x4 << 4) // (MCI) DTOCYC x 1024 -#define AT91C_MCI_DTOMUL_4096 ((unsigned int) 0x5 << 4) // (MCI) DTOCYC x 4096 -#define AT91C_MCI_DTOMUL_65536 ((unsigned int) 0x6 << 4) // (MCI) DTOCYC x 65536 -#define AT91C_MCI_DTOMUL_1048576 ((unsigned int) 0x7 << 4) // (MCI) DTOCYC x 1048576 +#define AT91C_MCI_DTOCYC (0x1u << 0) // (MCI) Data Timeout Cycle Number +#define AT91C_MCI_DTOMUL (0x7u << 4) // (MCI) Data Timeout Multiplier +#define AT91C_MCI_DTOMUL_1 (0x0u << 4) // (MCI) DTOCYC x 1 +#define AT91C_MCI_DTOMUL_16 (0x1u << 4) // (MCI) DTOCYC x 16 +#define AT91C_MCI_DTOMUL_128 (0x2u << 4) // (MCI) DTOCYC x 128 +#define AT91C_MCI_DTOMUL_256 (0x3u << 4) // (MCI) DTOCYC x 256 +#define AT91C_MCI_DTOMUL_1024 (0x4u << 4) // (MCI) DTOCYC x 1024 +#define AT91C_MCI_DTOMUL_4096 (0x5u << 4) // (MCI) DTOCYC x 4096 +#define AT91C_MCI_DTOMUL_65536 (0x6u << 4) // (MCI) DTOCYC x 65536 +#define AT91C_MCI_DTOMUL_1048576 (0x7u << 4) // (MCI) DTOCYC x 1048576 // -------- MCI_SDCR : (MCI Offset: 0xc) MCI SD Card Register -------- -#define AT91C_MCI_SCDSEL ((unsigned int) 0x1 << 0) // (MCI) SD Card Selector -#define AT91C_MCI_SCDBUS ((unsigned int) 0x1 << 7) // (MCI) SD Card Bus Width +#define AT91C_MCI_SCDSEL (0x1u << 0) // (MCI) SD Card Selector +#define AT91C_MCI_SCDBUS (0x1u << 7) // (MCI) SD Card Bus Width // -------- MCI_CMDR : (MCI Offset: 0x14) MCI Command Register -------- -#define AT91C_MCI_CMDNB ((unsigned int) 0x1F << 0) // (MCI) Command Number -#define AT91C_MCI_RSPTYP ((unsigned int) 0x3 << 6) // (MCI) Response Type -#define AT91C_MCI_RSPTYP_NO ((unsigned int) 0x0 << 6) // (MCI) No response -#define AT91C_MCI_RSPTYP_48 ((unsigned int) 0x1 << 6) // (MCI) 48-bit response -#define AT91C_MCI_RSPTYP_136 ((unsigned int) 0x2 << 6) // (MCI) 136-bit response >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 13 17:28:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9291016A409; Thu, 13 Apr 2006 17:28:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3708816A404 for ; Thu, 13 Apr 2006 17:28:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAB9A43D46 for ; Thu, 13 Apr 2006 17:28:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DHSfF1082014 for ; Thu, 13 Apr 2006 17:28:41 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DHSffj082011 for perforce@freebsd.org; Thu, 13 Apr 2006 17:28:41 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Apr 2006 17:28:41 GMT Message-Id: <200604131728.k3DHSffj082011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 17:28:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=95166 Change 95166 by imp@imp_hammer on 2006/04/13 17:27:44 When the SDRAM width is 32-bits, we need to enable D16..D31 in the PIO controller to be peripheral A. Otherwise we read back all ff's. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#4 (text) ==== @@ -151,6 +151,11 @@ AT91C_BASE_SDRC->SDRC_MR = SDRAM_WIDTH | AT91C_SDRC_MODE_NORMAL_CMD; *p = 0; +#if SDRAM_WIDTH == AT91C_SDRC_DBW_32_BITS + // Turn on the upper 16 bits on the SDRAM bus. + AT91C_BASE_PIOC->PIO_ASR = 0xffff0000; + AT91C_BASE_PIOC->PIO_PDR = 0xffff0000; +#endif // Configure DBGU -use local routine optimized for space AT91C_BASE_PIOA->PIO_ASR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; AT91C_BASE_PIOA->PIO_PDR = AT91C_PA31_DTXD | AT91C_PA30_DRXD; From owner-p4-projects@FreeBSD.ORG Thu Apr 13 20:30:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17F7C16A402; Thu, 13 Apr 2006 20:30:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E49B416A405 for ; Thu, 13 Apr 2006 20:30:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9729E43D5A for ; Thu, 13 Apr 2006 20:30:30 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DKUUdm087519 for ; Thu, 13 Apr 2006 20:30:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DKUUvL087489 for perforce@freebsd.org; Thu, 13 Apr 2006 20:30:30 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Apr 2006 20:30:30 GMT Message-Id: <200604132030.k3DKUUvL087489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 20:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=95180 Change 95180 by marcel@marcel_nfs on 2006/04/13 20:30:23 Make a big leap and reduce the puc_devices array by a factor of 10 (i.e. 25K to 2.5K): o Eliminate PUC_MAX_PORTS. The number and type of ports is encoded by a single 8-bit entity. For non-standard cards, use PUC_PORT_NONSTANDARD, which causes the number of ports and the type of each to be determined at runtime. There's currently one card that needs PUC_PORT_NONSTANDARD -- it's a 2S1P2S1P card. o Specify the RID/BAR and offset for each of the ports by 3 8-bit values. The first value is the RID/BAR of the first port. The second is a delta value for the RID/BAR and is added to the RID/BAR for subsequent ports. The third value is a delta value for the offset of a sub-region of the resource specified by a RID/BAR. The 2 common configurations are now encoded as follows: 0x10, 0, 8 - All ports use the same RID, but have different offsets within the RID. port 1: 0x10, 0 port 2: 0x10, 8 : 0x14, 4, 0 - All ports have a seperate RID and use offset 0 within the resource. port 1: 0x14, 0 port 2: 0x18, 0 : There are currently 3 cards that cannot directly be encoded this way and will be handled at runtime. o Change the type of the ILR related variables to 8-bit entities. The details of how the configuration is obtained at runtime has not yet been fleshed out beyond calling a function. This will be done when puc.c is brought in sync with these changes. At this time puc.c cannot be compiled. Affected files ... .. //depot/projects/uart/dev/puc/pucdata.c#21 edit .. //depot/projects/uart/dev/puc/pucvar.h#17 edit Differences ... ==== //depot/projects/uart/dev/puc/pucdata.c#21 (text+ko) ==== @@ -44,53 +44,37 @@ #include #include -int puc_config_win877(struct puc_softc *); +static puc_config_f puc_config_cronyx; +static puc_config_f puc_config_diva; +static puc_config_f puc_config_syba; +static puc_config_f puc_config_siig; +static puc_config_f puc_config_titan; const struct puc_device_description puc_devices[] = { { 0x0009, 0x7168, 0xffff, 0, "Sunix SUN1889", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - }, + PUC_PORT_2S, 0x10, 0, 8, }, { 0x103c, 0x1048, 0x103c, 0x1282, "Diva Serial [GSP] Multiport UART", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x38 }, - }, + PUC_PORT_3S, 0x10, 0, -1, + .config_function = puc_config_diva }, { 0x10b5, 0x1076, 0x10b5, 0x1076, "VScom PCI-800", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - { PUC_PORT_TYPE_COM, 0x18, 0x20 }, - { PUC_PORT_TYPE_COM, 0x18, 0x28 }, - { PUC_PORT_TYPE_COM, 0x18, 0x30 }, - { PUC_PORT_TYPE_COM, 0x18, 0x38 }, - }, + PUC_PORT_8S, 0x18, 0, 8, }, { 0x10b5, 0x1077, 0x10b5, 0x1077, "VScom PCI-400", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - }, + PUC_PORT_4S, 0x18, 0, 8, }, /* @@ -101,27 +85,13 @@ { 0x10b5, 0x9050, 0x12e0, 0x0021, "Boca Research Turbo Serial 658", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - { PUC_PORT_TYPE_COM, 0x18, 0x20 }, - { PUC_PORT_TYPE_COM, 0x18, 0x28 }, - { PUC_PORT_TYPE_COM, 0x18, 0x30 }, - { PUC_PORT_TYPE_COM, 0x18, 0x38 }, - }, + PUC_PORT_8S, 0x18, 0, 8, }, { 0x10b5, 0x9050, 0x12e0, 0x0031, "Boca Research Turbo Serial 654", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - }, + PUC_PORT_4S, 0x18, 0, 8, }, /* @@ -133,10 +103,7 @@ { 0x10b5, 0x9050, 0xd84d, 0x6808, "Dolphin Peripherals 4035", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_2S, 0x18, 4, 0, }, /* @@ -148,128 +115,67 @@ { 0x10b5, 0x9050, 0xd84d, 0x6810, "Dolphin Peripherals 4014", 0, - { - { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x24, 0x00 }, - }, + PUC_PORT_2P, 0x20, 4, 0, }, { 0x11fe, 0x8010, 0xffff, 0, "Comtrol RocketPort 550/8 RJ11 part A", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x11fe, 0x8011, 0xffff, 0, "Comtrol RocketPort 550/8 RJ11 part B", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x11fe, 0x8012, 0xffff, 0, "Comtrol RocketPort 550/8 Octa part A", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x11fe, 0x8013, 0xffff, 0, "Comtrol RocketPort 550/8 Octa part B", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x11fe, 0x8014, 0xffff, 0, "Comtrol RocketPort 550/4 RJ45", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x11fe, 0x8015, 0xffff, 0, "Comtrol RocketPort 550/Quad", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x11fe, 0x8016, 0xffff, 0, "Comtrol RocketPort 550/16 part A", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x11fe, 0x8017, 0xffff, 0, "Comtrol RocketPort 550/16 part B", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - { PUC_PORT_TYPE_COM, 0x10, 0x20 }, - { PUC_PORT_TYPE_COM, 0x10, 0x28 }, - { PUC_PORT_TYPE_COM, 0x10, 0x30 }, - { PUC_PORT_TYPE_COM, 0x10, 0x38 }, - { PUC_PORT_TYPE_COM, 0x10, 0x40 }, - { PUC_PORT_TYPE_COM, 0x10, 0x48 }, - { PUC_PORT_TYPE_COM, 0x10, 0x50 }, - { PUC_PORT_TYPE_COM, 0x10, 0x58 }, - }, + PUC_PORT_12S, 0x10, 0, 8, }, { 0x11fe, 0x8018, 0xffff, 0, "Comtrol RocketPort 550/8 part A", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x11fe, 0x8019, 0xffff, 0, "Comtrol RocketPort 550/8 part B", DEFAULT_RCLK * 4, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, /* @@ -285,414 +191,251 @@ { 0x131f, 0x1010, 0xffff, 0, "SIIG Cyber I/O PCI 16C550 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, - }, + PUC_PORT_1S1P, 0x18, 4, 0, }, { 0x131f, 0x1011, 0xffff, 0, "SIIG Cyber I/O PCI 16C650 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, - }, + PUC_PORT_1S1P, 0x18, 4, 0, }, { 0x131f, 0x1012, 0xffff, 0, "SIIG Cyber I/O PCI 16C850 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, - }, + PUC_PORT_1S1P, 0x18, 4, 0, }, { 0x131f, 0x1020, 0xffff, 0, "SIIG Cyber Parallel PCI (10x family)", 0, - { - { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, - }, + PUC_PORT_1P, 0x18, 0, 0, }, { 0x131f, 0x1021, 0xffff, 0, "SIIG Cyber Parallel Dual PCI (10x family)", 0, - { - { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, - }, + PUC_PORT_2P, 0x18, 8, 0, }, { 0x131f, 0x1030, 0xffff, 0, "SIIG Cyber Serial Dual PCI 16C550 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_2S, 0x18, 4, 0, }, { 0x131f, 0x1031, 0xffff, 0, "SIIG Cyber Serial Dual PCI 16C650 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_2S, 0x18, 4, 0, }, { 0x131f, 0x1032, 0xffff, 0, "SIIG Cyber Serial Dual PCI 16C850 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_2S, 0x18, 4, 0, }, { 0x131f, 0x1034, 0xffff, 0, /* XXX really? */ "SIIG Cyber 2S1P PCI 16C550 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, - }, + PUC_PORT_2S1P, 0x18, 4, 0, }, { 0x131f, 0x1035, 0xffff, 0, /* XXX really? */ "SIIG Cyber 2S1P PCI 16C650 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, - }, + PUC_PORT_2S1P, 0x18, 4, 0, }, { 0x131f, 0x1036, 0xffff, 0, /* XXX really? */ "SIIG Cyber 2S1P PCI 16C850 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x20, 0x00 }, - }, + PUC_PORT_2S1P, 0x18, 4, 0, }, { 0x131f, 0x1050, 0xffff, 0, "SIIG Cyber 4S PCI 16C550 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - { PUC_PORT_TYPE_COM, 0x20, 0x00 }, - { PUC_PORT_TYPE_COM, 0x24, 0x00 }, - }, + PUC_PORT_4S, 0x18, 4, 0, }, { 0x131f, 0x1051, 0xffff, 0, "SIIG Cyber 4S PCI 16C650 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - { PUC_PORT_TYPE_COM, 0x20, 0x00 }, - { PUC_PORT_TYPE_COM, 0x24, 0x00 }, - }, + PUC_PORT_4S, 0x18, 4, 0, }, { 0x131f, 0x1052, 0xffff, 0, "SIIG Cyber 4S PCI 16C850 (10x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - { PUC_PORT_TYPE_COM, 0x20, 0x00 }, - { PUC_PORT_TYPE_COM, 0x24, 0x00 }, - }, + PUC_PORT_4S, 0x18, 4, 0, }, { 0x131f, 0x2010, 0xffff, 0, "SIIG Cyber I/O PCI 16C550 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - }, + PUC_PORT_1S1P, 0x10, 4, 0, }, { 0x131f, 0x2011, 0xffff, 0, "SIIG Cyber I/O PCI 16C650 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - }, + PUC_PORT_1S1P, 0x10, 4, 0, }, { 0x131f, 0x2012, 0xffff, 0, "SIIG Cyber I/O PCI 16C850 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - }, + PUC_PORT_1S1P, 0x10, 4, 0, }, { 0x131f, 0x2020, 0xffff, 0, "SIIG Cyber Parallel PCI (20x family)", 0, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, - }, + PUC_PORT_1P, 0x10, 0, 0, }, { 0x131f, 0x2021, 0xffff, 0, "SIIG Cyber Parallel Dual PCI (20x family)", 0, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, - }, + PUC_PORT_2P, 0x10, 8, 0, }, { 0x131f, 0x2030, 0xffff, 0, "SIIG Cyber Serial Dual PCI 16C550 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - }, + PUC_PORT_2S, 0x10, 4, 0, }, { 0x131f, 0x2031, 0xffff, 0, "SIIG Cyber Serial Dual PCI 16C650 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - }, + PUC_PORT_2S, 0x10, 4, 0, }, { 0x131f, 0x2032, 0xffff, 0, "SIIG Cyber Serial Dual PCI 16C850 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - }, + PUC_PORT_2S, 0x10, 4, 0, }, { 0x131f, 0x2040, 0xffff, 0, "SIIG Cyber 2P1S PCI 16C550 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, - }, + PUC_PORT_1S2P, 0x10, -1, 0, + .config_function = puc_config_siig }, { 0x131f, 0x2041, 0xffff, 0, "SIIG Cyber 2P1S PCI 16C650 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, - }, + PUC_PORT_1S2P, 0x10, -1, 0, + .config_function = puc_config_siig }, { 0x131f, 0x2042, 0xffff, 0, "SIIG Cyber 2P1S PCI 16C850 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x1c, 0x00 }, - }, + PUC_PORT_1S2P, 0x10, -1, 0, + .config_function = puc_config_siig }, { 0x131f, 0x2050, 0xffff, 0, "SIIG Cyber 4S PCI 16C550 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_4S, 0x10, 4, 0, }, { 0x131f, 0x2051, 0xffff, 0, "SIIG Cyber 4S PCI 16C650 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_4S, 0x10, 4, 0, }, { 0x131f, 0x2052, 0xffff, 0, "SIIG Cyber 4S PCI 16C850 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_4S, 0x10, 4, 0, }, { 0x131f, 0x2060, 0xffff, 0, "SIIG Cyber 2S1P PCI 16C550 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, - }, + PUC_PORT_2S1P, 0x10, 4, 0, }, { 0x131f, 0x2061, 0xffff, 0, "SIIG Cyber 2S1P PCI 16C650 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, - }, + PUC_PORT_2S1P, 0x10, 4, 0, }, { 0x131f, 0x2062, 0xffff, 0, "SIIG Cyber 2S1P PCI 16C850 (20x family)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, - }, + PUC_PORT_2S1P, 0x10, 4, 0, }, { 0x1393, 0x1040, 0xffff, 0, "Moxa Technologies, Smartio C104H/PCI", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - }, + PUC_PORT_4S, 0x18, 0, 8, }, { 0x1393, 0x1041, 0xffff, 0, "Moxa Technologies, Smartio CP-104UL/PCI", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - }, + PUC_PORT_4S, 0x18, 0, 8, }, { 0x1393, 0x1141, 0xffff, 0, "Moxa Technologies, Industio CP-114", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - }, + PUC_PORT_4S, 0x18, 0, 8, }, { 0x1393, 0x1680, 0xffff, 0, "Moxa Technologies, C168H/PCI", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - { PUC_PORT_TYPE_COM, 0x18, 0x20 }, - { PUC_PORT_TYPE_COM, 0x18, 0x28 }, - { PUC_PORT_TYPE_COM, 0x18, 0x30 }, - { PUC_PORT_TYPE_COM, 0x18, 0x38 }, - }, + PUC_PORT_8S, 0x18, 0, 8, }, { 0x1393, 0x1681, 0xffff, 0, "Moxa Technologies, C168U/PCI", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x08 }, - { PUC_PORT_TYPE_COM, 0x18, 0x10 }, - { PUC_PORT_TYPE_COM, 0x18, 0x18 }, - { PUC_PORT_TYPE_COM, 0x18, 0x20 }, - { PUC_PORT_TYPE_COM, 0x18, 0x28 }, - { PUC_PORT_TYPE_COM, 0x18, 0x30 }, - { PUC_PORT_TYPE_COM, 0x18, 0x38 }, - }, + PUC_PORT_8S, 0x18, 0, 8, }, { 0x13a8, 0x0158, 0xffff, 0, "Cronyx Omega2-PCI", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x010, 0x000 }, - { PUC_PORT_TYPE_COM, 0x010, 0x200 }, - { PUC_PORT_TYPE_COM, 0x010, 0x400 }, - { PUC_PORT_TYPE_COM, 0x010, 0x600 }, - { PUC_PORT_TYPE_COM, 0x010, 0x800 }, - { PUC_PORT_TYPE_COM, 0x010, 0xA00 }, - { PUC_PORT_TYPE_COM, 0x010, 0xC00 }, - { PUC_PORT_TYPE_COM, 0x010, 0xE00 }, - }, + PUC_PORT_8S, 0x10, 0, -1, + .config_function = puc_config_cronyx }, { 0x1407, 0x0100, 0xffff, 0, /* MASK */ "Lava Computers dual serial port", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - }, + PUC_PORT_2S, 0x10, 4, 0, }, { 0x1407, 0x0120, 0xffff, 0, /* MASK */ "Lava Computers Quattro-PCI serial port", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - }, + PUC_PORT_2S, 0x10, 4, 0, }, { 0x1407, 0x0180, 0xffff, 0, /* MASK */ "Lava Computers Octopus-550 8-port serial", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_4S, 0x10, 4, 0, }, { 0x1407, 0x8000, 0xffff, 0, "Lava Computers 2SP-PCI parallel port", 0, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, - }, + PUC_PORT_1P, 0x10, 0, 0, }, /* @@ -702,10 +445,7 @@ { 0x1409, 0x7168, 0xffff, 0, "Dolphin Peripherals 4036", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - }, + PUC_PORT_2S, 0x10, 0, 8, }, /* @@ -721,68 +461,43 @@ { 0x1415, 0x8403, 0xffff, 0, "Oxford Semiconductor OX12PCI840 Parallel port", 0, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, - }, + PUC_PORT_1P, 0x10, 0, 0, }, { 0x1415, 0x9501, 0xffff, 0, "Oxford Semiconductor OX16PCI954 UARTs", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x1415, 0x950a, 0xffff, 0, "Oxford Semiconductor OX16PCI954 UARTs", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x1415, 0x9511, 0xffff, 0, "Oxford Semiconductor OX9160/OX16PCI954 UARTs (function 1)", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x1415, 0x9513, 0xffff, 0, "Oxford Semiconductor OX16PCI954 Parallel port", 0, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, - }, + PUC_PORT_1P, 0x10, 0, 0, }, { 0x14d2, 0x8020, 0xffff, 0, "VScom PCI-200L", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - }, + PUC_PORT_2S, 0x14, 4, 0, }, { 0x14d2, 0x8028, 0xffff, 0, "VScom 200Li", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x20, 0x00 }, - { PUC_PORT_TYPE_COM, 0x20, 0x08 }, - }, + PUC_PORT_2S, 0x20, 0, 8, }, /* @@ -797,16 +512,8 @@ { 0x14d2, 0x8080, 0xffff, 0, "Titan VScom PCI-800L", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x20, 0x00 }, - { PUC_PORT_TYPE_COM, 0x20, 0x08 }, - { PUC_PORT_TYPE_COM, 0x20, 0x10 }, - { PUC_PORT_TYPE_COM, 0x20, 0x18 }, - { PUC_PORT_TYPE_COM, 0x20, 0x20 }, - { PUC_PORT_TYPE_COM, 0x20, 0x28 }, - }, + PUC_PORT_8S, 0x14, -1, -1, + .config_function = puc_config_titan }, /* @@ -817,249 +524,154 @@ { 0x14d2, 0xa003, 0xffff, 0, "Titan PCI-800H", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x14d2, 0xa004, 0xffff, 0, "Titan PCI-800H", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - { PUC_PORT_TYPE_COM, 0x10, 0x10 }, - { PUC_PORT_TYPE_COM, 0x10, 0x18 }, - }, + PUC_PORT_4S, 0x10, 0, 8, }, { 0x14d2, 0xa005, 0xffff, 0, "Titan PCI-200H", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x10, 0x08 }, - }, + PUC_PORT_2S, 0x10, 0, 8, }, { 0x14d2, 0xe020, 0xffff, 0, "Titan VScom PCI-200HV2", DEFAULT_RCLK * 8, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - }, + PUC_PORT_2S, 0x10, 4, 0, }, { 0x14db, 0x2130, 0xffff, 0, /* MASK */ "Avlab Technology, PCI IO 2S", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - }, + PUC_PORT_2S, 0x10, 4, 0, }, { 0x14db, 0x2150, 0xffff, 0, "Avlab Low Profile PCI 4 Serial", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_4S, 0x10, 4, 0, }, { 0x1592, 0x0781, 0xffff, 0, "Syba Tech Ltd. PCI-4S2P-550-ECP", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x2e8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x2f8 }, - { PUC_PORT_TYPE_LPT, 0x10, 0x000 }, - { PUC_PORT_TYPE_COM, 0x10, 0x3e8 }, - { PUC_PORT_TYPE_COM, 0x10, 0x3f8 }, - { PUC_PORT_TYPE_LPT, 0x10, 0x000 }, - }, - .init = puc_config_win877, + PUC_PORT_NONSTANDARD, 0x10, 0, -1, + .config_function = puc_config_syba }, { 0x6666, 0x0001, 0xffff, 0, "Decision Computer Inc, PCCOM 4-port serial", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x08 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x10 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x18 }, - }, + PUC_PORT_4S, 0x1c, 0, 8, }, { 0x6666, 0x0004, 0xffff, 0, "PCCOM dual port RS232/422/485", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x08 }, - }, + PUC_PORT_2S, 0x1c, 0, 8, }, { 0x9710, 0x9805, 0xffff, 0, "NetMos NM9805 1284 Printer port", 0, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00 }, - }, + PUC_PORT_1P, 0x10, 0, 0, }, { 0x9710, 0x9835, 0xffff, 0, "NetMos NM9835 Dual UART and 1284 Printer port", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_LPT, 0x18, 0x00 }, - }, + PUC_PORT_2S1P, 0x10, 4, 0, }, { 0x9710, 0x9845, 0xffff, 0, "NetMos NM9845 Quad UART", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, - { PUC_PORT_TYPE_COM, 0x14, 0x00 }, - { PUC_PORT_TYPE_COM, 0x18, 0x00 }, - { PUC_PORT_TYPE_COM, 0x1c, 0x00 }, - }, + PUC_PORT_4S, 0x10, 4, 0, }, { 0xb00c, 0x021c, 0xffff, 0, "IC Book Labs Gunboat x4 Lite", DEFAULT_RCLK, - { - { PUC_PORT_TYPE_COM, 0x10, 0x00 }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 13 22:13:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D38B916A409; Thu, 13 Apr 2006 22:13:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD7AF16A400 for ; Thu, 13 Apr 2006 22:13:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EA1143D68 for ; Thu, 13 Apr 2006 22:13:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DMDrXh066921 for ; Thu, 13 Apr 2006 22:13:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMDrrn066915 for perforce@freebsd.org; Thu, 13 Apr 2006 22:13:53 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 22:13:53 GMT Message-Id: <200604132213.k3DMDrrn066915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 22:13:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=95185 Change 95185 by jb@jb_freebsd2 on 2006/04/13 22:12:56 Add libdwarf, conditional on building CDDL code which it depends on. Affected files ... .. //depot/projects/dtrace/src/gnu/lib/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/gnu/lib/Makefile#2 (text+ko) ==== @@ -18,4 +18,11 @@ SUBDIR+= libg2c .endif +# libdwarf is LGPL'd, but requires Sun's libelf which is CDDL'd, +# so we can only build libdwarf if we are building the CDDL code +# too. +.if !defined(NO_CDDL) && !defined(NO_DTRACE) +SUBDIR+= libdwarf +.endif + .include From owner-p4-projects@FreeBSD.ORG Thu Apr 13 22:16:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A29816A482; Thu, 13 Apr 2006 22:16:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A077316A481 for ; Thu, 13 Apr 2006 22:16:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5756743D45 for ; Thu, 13 Apr 2006 22:16:58 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DMGw3I069402 for ; Thu, 13 Apr 2006 22:16:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMGwTR069396 for perforce@freebsd.org; Thu, 13 Apr 2006 22:16:58 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 22:16:58 GMT Message-Id: <200604132216.k3DMGwTR069396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 22:16:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=95186 Change 95186 by jb@jb_freebsd2 on 2006/04/13 22:16:38 Generated by configure. But we don't need to run configure all the time --- we don't need to guess what features we've got, so just add this file here and customise it to support our architectures (such as endian order). To start with, this is an i386 version. Affected files ... .. //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 22:33:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 633E716A402; Thu, 13 Apr 2006 22:33:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EA6316A400 for ; Thu, 13 Apr 2006 22:33:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AFBD43D64 for ; Thu, 13 Apr 2006 22:33:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DMXIFc077062 for ; Thu, 13 Apr 2006 22:33:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMXIwY077054 for perforce@freebsd.org; Thu, 13 Apr 2006 22:33:18 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 22:33:18 GMT Message-Id: <200604132233.k3DMXIwY077054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 22:33:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=95187 Change 95187 by jb@jb_freebsd2 on 2006/04/13 22:32:55 Suck most of the libdwarf sources. Affected files ... .. //depot/projects/dtrace/src/contrib/libdwarf/COPYING#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/ChangeLog#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/LIBDWARFCOPYRIGHT#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_abbrev.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_abbrev.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_addr_finder.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_arange.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_arange.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_base_types.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_die_deliv.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_die_deliv.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_error.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_error.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_form.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_frame.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_frame.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_funcs.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_funcs.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_global.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_global.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_incl.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_leb.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_line.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_line.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_loc.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_loc.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_macro.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_macro.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_opaque.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_print_lines.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_query.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_string.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_stubs.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_types.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_types.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_util.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_util.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_vars.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_vars.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_weaks.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_weaks.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarf.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarfdefs.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_alloc.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_alloc.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_arange.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_arange.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_die.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_die.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_encode_nm.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_encode_nm.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_error.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_error.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_expr.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_expr.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_finish.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_forms.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_frame.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_frame.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_funcs.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_incl.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_init.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_line.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_line.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_macinfo.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_macinfo.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_opaque.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_pubnames.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc_stream.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc_stream.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc_symbolic.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc_symbolic.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_section.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_section.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_types.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_types.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_util.h#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_vars.c#1 branch .. //depot/projects/dtrace/src/contrib/libdwarf/pro_weaks.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 22:42:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C58C516A52F; Thu, 13 Apr 2006 22:42:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 667FD16A52C for ; Thu, 13 Apr 2006 22:42:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A6DB43D5D for ; Thu, 13 Apr 2006 22:42:30 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DMgUPo084231 for ; Thu, 13 Apr 2006 22:42:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMgTa1084220 for perforce@freebsd.org; Thu, 13 Apr 2006 22:42:29 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 22:42:29 GMT Message-Id: <200604132242.k3DMgTa1084220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 22:42:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=95188 Change 95188 by jb@jb_freebsd2 on 2006/04/13 22:41:49 Don't include malloc.h where stdlib.h is already included. Affected files ... .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#2 edit .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#2 edit .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#2 (text) ==== @@ -41,7 +41,9 @@ #include #include +#if defined(sun) #include +#endif /* These files are included to get the sizes ==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#2 (text) ==== @@ -61,7 +61,9 @@ #include #include #include +#if defined(sun) #include +#endif #include "dwarf_incl.h" ==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#2 (text) ==== @@ -43,7 +43,9 @@ #ifdef HAVE_ALLOCA_H #include #endif +#if defined(sun) #include +#endif #define MINIMUM_POSSIBLE_PROLOG_LEN 10 /* 10 is based on */ /* the definition of the DWARF2/3 line table prolog. ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 (text) ==== @@ -27,6 +27,10 @@ #pragma ident "@(#)dt_module.c 1.11 05/11/09 SMI" #include +#if !defined(sun) +#include +#endif +#ifdef DOODAD #include #include #include @@ -43,6 +47,7 @@ #include #include #include +#endif #include #include From owner-p4-projects@FreeBSD.ORG Thu Apr 13 22:44:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD54216A411; Thu, 13 Apr 2006 22:44:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CD0516A405 for ; Thu, 13 Apr 2006 22:44:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E31443D45 for ; Thu, 13 Apr 2006 22:44:33 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DMiX3G084757 for ; Thu, 13 Apr 2006 22:44:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMiWqm084754 for perforce@freebsd.org; Thu, 13 Apr 2006 22:44:32 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 22:44:32 GMT Message-Id: <200604132244.k3DMiWqm084754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 22:44:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=95189 Change 95189 by jb@jb_freebsd2 on 2006/04/13 22:43:42 Such the lone dwarf header who just wanted to live in a different place. Affected files ... .. //depot/projects/dtrace/src/contrib/libdwarf/cmplrs/dwarf_addr_finder.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Apr 13 22:53:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B297116A403; Thu, 13 Apr 2006 22:53:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E29716A400 for ; Thu, 13 Apr 2006 22:53:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4585C43D45 for ; Thu, 13 Apr 2006 22:53:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DMrjBh087879 for ; Thu, 13 Apr 2006 22:53:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMrjZS087873 for perforce@freebsd.org; Thu, 13 Apr 2006 22:53:45 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 22:53:45 GMT Message-Id: <200604132253.k3DMrjZS087873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 22:53:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=95191 Change 95191 by jb@jb_freebsd2 on 2006/04/13 22:52:55 FreeBSD always supports 64-bit types. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#3 (text) ==== @@ -37,6 +37,13 @@ #include #include +/* + * FreeBSD always supports 64-bit types. + */ +#if defined(__FreeBSD__) && !defined(_INT64_TYPE) +#define _INT64_TYPE +#endif + #ifdef __cplusplus extern "C" { #endif From owner-p4-projects@FreeBSD.ORG Thu Apr 13 22:57:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36BE916A409; Thu, 13 Apr 2006 22:57:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF8CD16A405 for ; Thu, 13 Apr 2006 22:57:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A638643D46 for ; Thu, 13 Apr 2006 22:57:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DMvoi7091155 for ; Thu, 13 Apr 2006 22:57:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMvohG091152 for perforce@freebsd.org; Thu, 13 Apr 2006 22:57:50 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Apr 2006 22:57:50 GMT Message-Id: <200604132257.k3DMvohG091152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 22:57:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=95192 Change 95192 by jb@jb_freebsd2 on 2006/04/13 22:57:14 We have libelf.h (in CDDL code). Affected files ... .. //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#2 edit Differences ... ==== //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#2 (text+ko) ==== @@ -82,7 +82,7 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBELF_H */ +#define HAVE_LIBELF_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_LIBELF_LIBELF_H */ From owner-p4-projects@FreeBSD.ORG Fri Apr 14 00:00:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F075716A405; Fri, 14 Apr 2006 00:00:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBE3A16A404 for ; Fri, 14 Apr 2006 00:00:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7510443D45 for ; Fri, 14 Apr 2006 00:00:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E006ZI026443 for ; Fri, 14 Apr 2006 00:00:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E006Dv026437 for perforce@freebsd.org; Fri, 14 Apr 2006 00:00:06 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 00:00:06 GMT Message-Id: <200604140000.k3E006Dv026437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 00:00:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=95194 Change 95194 by jb@jb_freebsd2 on 2006/04/13 23:59:51 This is a hack to handle things that Sun has added to their ELF implementation which don't seem to be implemented in any BSD licensed headers. Is there a standard somewhere which refers to Elf64_Move, Elf64_Cap, Elf64_Lvalue and Elf64_Syminfo? I'd prefer make sure that the OpenSolaris code uses out ELF and link headers. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#4 (text) ==== @@ -29,13 +29,40 @@ #pragma ident "@(#)gelf.h 1.14 05/06/08 SMI" -#if !defined(sun) -#include -#endif #include #include +#if defined(sun) #include +#else +#include +#include +#include + +/* + * Non Sun ELF implementations don't have these. + * Where is the standard that defines them? + */ +typedef unsigned long long Elf64_Lword; +typedef struct { + Elf64_Lword m_value; /* symbol value */ + Elf64_Xword m_info; /* size + index */ + Elf64_Xword m_poffset; /* symbol offset */ + Elf64_Half m_repeat; /* repeat count */ + Elf64_Half m_stride; /* stride info */ +} Elf64_Move; +typedef struct { + Elf64_Xword c_tag; /* how to interpret value */ + union { + Elf64_Xword c_val; + Elf64_Addr c_ptr; + } c_un; +} Elf64_Cap; +typedef struct { + Elf64_Half si_boundto; /* direct bindings - symbol bound to */ + Elf64_Half si_flags; /* per symbol flags */ +} Elf64_Syminfo; +#endif /* * FreeBSD always supports 64-bit types. From owner-p4-projects@FreeBSD.ORG Fri Apr 14 00:01:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACC9C16A40D; Fri, 14 Apr 2006 00:01:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CC9A16A409 for ; Fri, 14 Apr 2006 00:01:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3609F43D46 for ; Fri, 14 Apr 2006 00:01:08 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E018wi027167 for ; Fri, 14 Apr 2006 00:01:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E017ql027161 for perforce@freebsd.org; Fri, 14 Apr 2006 00:01:07 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 00:01:07 GMT Message-Id: <200604140001.k3E017ql027161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 00:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=95195 Change 95195 by jb@jb_freebsd2 on 2006/04/14 00:00:31 Use our ELF headers, not the ones from OpenSolaris. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/head/libelf.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/head/libelf.h#2 (text) ==== @@ -33,7 +33,11 @@ #pragma ident "@(#)libelf.h 1.29 05/11/17 SMI" /* SVr4.0 1.9 */ #include +#if defined(sun) #include +#else +#include +#endif #ifdef __cplusplus From owner-p4-projects@FreeBSD.ORG Fri Apr 14 00:03:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B94F16A405; Fri, 14 Apr 2006 00:03:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63A4516A403 for ; Fri, 14 Apr 2006 00:03:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EE7243D48 for ; Fri, 14 Apr 2006 00:03:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E03BtU030104 for ; Fri, 14 Apr 2006 00:03:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E03AN3030101 for perforce@freebsd.org; Fri, 14 Apr 2006 00:03:10 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 00:03:10 GMT Message-Id: <200604140003.k3E03AN3030101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 00:03:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=95196 Change 95196 by jb@jb_freebsd2 on 2006/04/14 00:02:59 Remove the OpenSolaris ELF and link headers because they just cause us to have to suck in more and more of their code. We don't really want to have to do things their way unless those things aren't things we do at all yet. 8-) Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_386.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_SPARC.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_amd64.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elftypes.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/link.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 00:30:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA7C316A405; Fri, 14 Apr 2006 00:30:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7949F16A400 for ; Fri, 14 Apr 2006 00:30:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C97D743D4C for ; Fri, 14 Apr 2006 00:30:44 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E0UiFD041578 for ; Fri, 14 Apr 2006 00:30:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E0Ui6Y041572 for perforce@freebsd.org; Fri, 14 Apr 2006 00:30:44 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 00:30:44 GMT Message-Id: <200604140030.k3E0Ui6Y041572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 00:30:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=95197 Change 95197 by jb@jb_freebsd2 on 2006/04/14 00:30:04 Change the include paths to support OpenSolaris compatibility headers for ELF and link, using the FreeBSD ones for everything except Sun's extensions. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#6 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#6 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Apr 14 00:31:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 349AC16A406; Fri, 14 Apr 2006 00:31:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1200C16A400 for ; Fri, 14 Apr 2006 00:31:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9020643D4C for ; Fri, 14 Apr 2006 00:31:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E0Vk8b042503 for ; Fri, 14 Apr 2006 00:31:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E0VkRV042495 for perforce@freebsd.org; Fri, 14 Apr 2006 00:31:46 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 00:31:46 GMT Message-Id: <200604140031.k3E0VkRV042495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 00:31:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=95198 Change 95198 by jb@jb_freebsd2 on 2006/04/14 00:31:19 Stop using Sun's ELF and link headers and use ours instead. Include a couple of compatibility headers for Sun's extensions. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#3 (text) ==== @@ -33,18 +33,26 @@ extern "C" { #endif +#if defined(sun) #if defined(__amd64) #include #elif defined(__i386) #include #endif +#endif + #ifndef _ASM #include -#if !defined(sun) +#if defined(sun) +#include +#include /* for Elf*_Dyn */ +#else +#include +#include #include +#include +#include #endif -#include -#include /* for Elf*_Dyn */ #endif /* _ASM */ /* From owner-p4-projects@FreeBSD.ORG Fri Apr 14 00:58:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F86116A403; Fri, 14 Apr 2006 00:58:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E199016A400 for ; Fri, 14 Apr 2006 00:58:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96B3A43D49 for ; Fri, 14 Apr 2006 00:58:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E0wKJu065762 for ; Fri, 14 Apr 2006 00:58:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E0wJ9N065744 for perforce@freebsd.org; Fri, 14 Apr 2006 00:58:19 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 00:58:19 GMT Message-Id: <200604140058.k3E0wJ9N065744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 00:58:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=95199 Change 95199 by jb@jb_freebsd2 on 2006/04/14 00:57:38 Revise the include paths. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#2 (text+ko) ==== @@ -15,10 +15,6 @@ .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common .PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/ctf -# This definition is checked in Sun's code to determine if the 64-bit -# types are defined. FreeBSD always has them. -CFLAGS+= -D_INT64_TYPE - CFLAGS+= -DCTF_OLD_VERSIONS CFLAGS+= -I${.CURDIR}/../../../contrib \ From owner-p4-projects@FreeBSD.ORG Fri Apr 14 00:59:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E92116A406; Fri, 14 Apr 2006 00:59:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B8E016A400 for ; Fri, 14 Apr 2006 00:59:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2024D43D45 for ; Fri, 14 Apr 2006 00:59:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E0xMHQ066512 for ; Fri, 14 Apr 2006 00:59:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E0xLMP066506 for perforce@freebsd.org; Fri, 14 Apr 2006 00:59:21 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 00:59:21 GMT Message-Id: <200604140059.k3E0xLMP066506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 00:59:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=95200 Change 95200 by jb@jb_freebsd2 on 2006/04/14 00:59:11 Only use FreeBSD ELF headers and include a couple of compatibility headers to get Sun's extensions. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#3 (text) ==== @@ -43,11 +43,14 @@ #pragma ident "@(#)ctf_api.h 1.4 05/06/08 SMI" #include -#if !defined(sun) +#include +#if defined(sun) +#include +#else +#include #include +#include #endif -#include -#include #include #ifdef __cplusplus From owner-p4-projects@FreeBSD.ORG Fri Apr 14 01:01:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8146216A405; Fri, 14 Apr 2006 01:01:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48C6D16A400 for ; Fri, 14 Apr 2006 01:01:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 140CD43D45 for ; Fri, 14 Apr 2006 01:01:25 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E11Of5067963 for ; Fri, 14 Apr 2006 01:01:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E11OEu067953 for perforce@freebsd.org; Fri, 14 Apr 2006 01:01:24 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 01:01:24 GMT Message-Id: <200604140101.k3E11OEu067953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 01:01:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=95201 Change 95201 by jb@jb_freebsd2 on 2006/04/14 01:01:11 Include compatibility headers to get Sun's extensions. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#5 (text) ==== @@ -30,38 +30,16 @@ #pragma ident "@(#)gelf.h 1.14 05/06/08 SMI" #include +#include -#include #if defined(sun) #include #else -#include #include #include - -/* - * Non Sun ELF implementations don't have these. - * Where is the standard that defines them? - */ -typedef unsigned long long Elf64_Lword; -typedef struct { - Elf64_Lword m_value; /* symbol value */ - Elf64_Xword m_info; /* size + index */ - Elf64_Xword m_poffset; /* symbol offset */ - Elf64_Half m_repeat; /* repeat count */ - Elf64_Half m_stride; /* stride info */ -} Elf64_Move; -typedef struct { - Elf64_Xword c_tag; /* how to interpret value */ - union { - Elf64_Xword c_val; - Elf64_Addr c_ptr; - } c_un; -} Elf64_Cap; -typedef struct { - Elf64_Half si_boundto; /* direct bindings - symbol bound to */ - Elf64_Half si_flags; /* per symbol flags */ -} Elf64_Syminfo; +#include +#include +#include #endif /* From owner-p4-projects@FreeBSD.ORG Fri Apr 14 01:07:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52A9616A403; Fri, 14 Apr 2006 01:07:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3337516A401 for ; Fri, 14 Apr 2006 01:07:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE67343D46 for ; Fri, 14 Apr 2006 01:07:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E17WvE070996 for ; Fri, 14 Apr 2006 01:07:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E17Wo7070993 for perforce@freebsd.org; Fri, 14 Apr 2006 01:07:32 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 01:07:32 GMT Message-Id: <200604140107.k3E17Wo7070993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 01:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=95202 Change 95202 by jb@jb_freebsd2 on 2006/04/14 01:06:34 Oops, we really need these after all. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_386.h#3 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_SPARC.h#3 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_amd64.h#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 01:53:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C6E916A403; Fri, 14 Apr 2006 01:53:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0826816A400 for ; Fri, 14 Apr 2006 01:53:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE68B43D48 for ; Fri, 14 Apr 2006 01:53:28 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E1rSil094922 for ; Fri, 14 Apr 2006 01:53:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E1rSjr094915 for perforce@freebsd.org; Fri, 14 Apr 2006 01:53:28 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 01:53:28 GMT Message-Id: <200604140153.k3E1rSjr094915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 01:53:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=95203 Change 95203 by jb@jb_freebsd2 on 2006/04/14 01:53:10 Just get this file to compile for now. It's still Solaris-centric. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/gelf.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/gelf.c#3 (text) ==== @@ -1095,6 +1095,7 @@ GElf_Xword _gelf_getdyndtflags_1(Elf *elf) { +#ifdef DOODAD Elf_Scn *scn = NULL; Elf_Data *data; GElf_Shdr shdr; @@ -1117,5 +1118,6 @@ } break; } +#endif return (0); } From owner-p4-projects@FreeBSD.ORG Fri Apr 14 02:01:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6C0816A407; Fri, 14 Apr 2006 02:01:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D67A16A403 for ; Fri, 14 Apr 2006 02:01:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25AFD43D48 for ; Fri, 14 Apr 2006 02:01:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E21dDo001025 for ; Fri, 14 Apr 2006 02:01:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E21cZ6001019 for perforce@freebsd.org; Fri, 14 Apr 2006 02:01:38 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 02:01:38 GMT Message-Id: <200604140201.k3E21cZ6001019@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 02:01:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=95204 Change 95204 by jb@jb_freebsd2 on 2006/04/14 02:01:27 A couple of compatibility headers containing Sun extensions. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/elf.h#1 add .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/link.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 02:04:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCA1A16A402; Fri, 14 Apr 2006 02:04:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9850516A400 for ; Fri, 14 Apr 2006 02:04:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5140343D46 for ; Fri, 14 Apr 2006 02:04:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E24hh3003879 for ; Fri, 14 Apr 2006 02:04:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E24hCD003876 for perforce@freebsd.org; Fri, 14 Apr 2006 02:04:43 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 02:04:43 GMT Message-Id: <200604140204.k3E24hCD003876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95205 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 02:04:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=95205 Change 95205 by jb@jb_freebsd2 on 2006/04/14 02:03:49 Remove libdwarf from this list, it's LGPL'd. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 02:06:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C403316A406; Fri, 14 Apr 2006 02:06:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BDE216A404 for ; Fri, 14 Apr 2006 02:06:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44F7343D45 for ; Fri, 14 Apr 2006 02:06:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E26kWB004012 for ; Fri, 14 Apr 2006 02:06:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E26jb4004009 for perforce@freebsd.org; Fri, 14 Apr 2006 02:06:45 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 02:06:45 GMT Message-Id: <200604140206.k3E26jb4004009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95206 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 02:06:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=95206 Change 95206 by jb@jb_freebsd2 on 2006/04/14 02:06:19 Build the dwarf library. This one is LGPL'd. Affected files ... .. //depot/projects/dtrace/src/gnu/lib/libdwarf/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 02:07:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E7C116A407; Fri, 14 Apr 2006 02:07:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D85D16A400 for ; Fri, 14 Apr 2006 02:07:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0669543D45 for ; Fri, 14 Apr 2006 02:07:48 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E27lXP004047 for ; Fri, 14 Apr 2006 02:07:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E27lkB004044 for perforce@freebsd.org; Fri, 14 Apr 2006 02:07:47 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 02:07:47 GMT Message-Id: <200604140207.k3E27lkB004044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95207 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 02:07:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=95207 Change 95207 by jb@jb_freebsd2 on 2006/04/14 02:07:36 Just build smsmsg for the time being. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 02:09:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6520616A408; Fri, 14 Apr 2006 02:09:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4567216A400 for ; Fri, 14 Apr 2006 02:09:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F03D743D45 for ; Fri, 14 Apr 2006 02:09:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E29okL004093 for ; Fri, 14 Apr 2006 02:09:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E29oMF004090 for perforce@freebsd.org; Fri, 14 Apr 2006 02:09:50 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 02:09:50 GMT Message-Id: <200604140209.k3E29oMF004090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 02:09:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=95208 Change 95208 by jb@jb_freebsd2 on 2006/04/14 02:08:59 Just the one program to build here. 'dtrace' is the main command line interface to the dtrace device. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 03:03:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87FCF16A405; Fri, 14 Apr 2006 03:03:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E02916A400 for ; Fri, 14 Apr 2006 03:03:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0034643D4C for ; Fri, 14 Apr 2006 03:03:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E33uN1037927 for ; Fri, 14 Apr 2006 03:03:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E33uxE037924 for perforce@freebsd.org; Fri, 14 Apr 2006 03:03:56 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 03:03:56 GMT Message-Id: <200604140303.k3E33uxE037924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95210 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 03:03:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=95210 Change 95210 by jb@jb_freebsd2 on 2006/04/14 03:03:17 Suck another header. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/libproc.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 03:06:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A67A16A403; Fri, 14 Apr 2006 03:06:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A55316A400 for ; Fri, 14 Apr 2006 03:06:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E50DA43D45 for ; Fri, 14 Apr 2006 03:05:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E35xxW038040 for ; Fri, 14 Apr 2006 03:05:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E35xr8038037 for perforce@freebsd.org; Fri, 14 Apr 2006 03:05:59 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 03:05:59 GMT Message-Id: <200604140305.k3E35xr8038037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 03:06:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=95211 Change 95211 by jb@jb_freebsd2 on 2006/04/14 03:05:17 Suck for libdtrace. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libgen/common/gmatch.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 04:12:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82C9416A404; Fri, 14 Apr 2006 04:12:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C0BF16A402 for ; Fri, 14 Apr 2006 04:12:24 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C044F43D46 for ; Fri, 14 Apr 2006 04:12:23 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E4CNAe073709 for ; Fri, 14 Apr 2006 04:12:23 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E4CNvr073700 for perforce@freebsd.org; Fri, 14 Apr 2006 04:12:23 GMT (envelope-from gnn@neville-neil.com) Date: Fri, 14 Apr 2006 04:12:23 GMT Message-Id: <200604140412.k3E4CNvr073700@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 95214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 04:12:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=95214 Change 95214 by gnn@gnn_laptop_sctp on 2006/04/14 04:11:50 Pull integration branch into personal branch before attempting to insert SCTP files. Affected files ... .. //depot/projects/gnn_sctp/src/sys/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/support.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/conf/.cvsignore#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/conf/MAC#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/conf/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/conf/NOTES#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/_bus.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/_limits.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/_types.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/asm.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/atomic.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/bus.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/bwx.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/chipset.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/clock.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/cpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/elf.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/endian.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/exec.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/float.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/fpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/frame.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/ieee.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/inst.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/intr.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/kdb.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/limits.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/md_var.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/memdev.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/mutex.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pal.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/param.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pcb.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pmap.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/ppireg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/proc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/profile.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/prom.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/pte.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/reg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/reloc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/resource.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/rpb.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/runq.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/signal.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/smp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/swiz.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/timerreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/varargs.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/isa/isa.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/cia.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/lca.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/t2.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/float.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/param.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/gnn_sctp/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/support.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/_types.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/asm.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/bus.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/clock.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/elf.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/endian.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/exec.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/float.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/fp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/frame.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/intr.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/limits.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/param.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/proc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/profile.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/psl.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/pte.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/reg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/resource.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/runq.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/signal.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/smp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/swi.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/trap.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/README#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/common/ldscript#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/loader/version#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arc/loader/version#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/lib.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/lib.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/xmodem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/boot0/xmodem.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/arm/at91/inc/AT91RM9200.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/boot.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/commands.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/console.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/help.common#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/interp.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/load.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/loader.8#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/ls.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/misc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/module.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/panic.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/pnpdata#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/README#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/gnn_sctp/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/gnn_sctp/src/sys/bsm/audit.h#1 branch .. //depot/projects/gnn_sctp/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/gnn_sctp/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/gnn_sctp/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/gnn_sctp/src/sys/cam/cam.c#1 branch .. //depot/projects/gnn_sctp/src/sys/cam/cam.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 14 04:17:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5CA616A405; Fri, 14 Apr 2006 04:17:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BA1616A403 for ; Fri, 14 Apr 2006 04:17:31 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4607643D45 for ; Fri, 14 Apr 2006 04:17:31 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E4HVdA077744 for ; Fri, 14 Apr 2006 04:17:31 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E4HUTJ077738 for perforce@freebsd.org; Fri, 14 Apr 2006 04:17:31 GMT (envelope-from soc-andrew@freebsd.org) Date: Fri, 14 Apr 2006 04:17:31 GMT Message-Id: <200604140417.k3E4HUTJ077738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 95216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 04:17:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=95216 Change 95216 by soc-andrew@soc-andrew_serv on 2006/04/14 04:16:45 Detach the compat51, mime, posix and socket modules from the build. They are now installed from packages. This realy happened in change 95124 when it shouldn't have. Fix the BSDInstaller to use the new location of the smtp module from the package Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/cmdchain.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#6 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/cmdchain.lua#3 (text+ko) ==== @@ -35,7 +35,7 @@ local App = require("app") local Pty = require("pty") -local SMTP = require("smtp") +local SMTP = require("socket.smtp") --[[----------]]-- --[[ CmdChain ]]-- ==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/Makefile#6 (text+ko) ==== @@ -1,4 +1,3 @@ SUBDIR= lua lualib -#SUBDIR+= compat51 mime posix socket .include From owner-p4-projects@FreeBSD.ORG Fri Apr 14 05:33:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79D1316A405; Fri, 14 Apr 2006 05:33:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57E4C16A402 for ; Fri, 14 Apr 2006 05:33:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CD1343D48 for ; Fri, 14 Apr 2006 05:33:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E5X53C025834 for ; Fri, 14 Apr 2006 05:33:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E5X5mR025828 for perforce@freebsd.org; Fri, 14 Apr 2006 05:33:05 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 05:33:05 GMT Message-Id: <200604140533.k3E5X5mR025828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 05:33:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=95224 Change 95224 by jb@jb_freebsd2 on 2006/04/14 05:32:38 First hack to get this to compile. Some functions missing. Some contain DOODADs. Lots and lots of Solaris-isms in here. It's easier to work on if it compiles though. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 05:34:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 637A016A402; Fri, 14 Apr 2006 05:34:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1234B16A400 for ; Fri, 14 Apr 2006 05:34:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEF5C43D49 for ; Fri, 14 Apr 2006 05:34:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E5Y7C3026633 for ; Fri, 14 Apr 2006 05:34:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E5Y7PM026627 for perforce@freebsd.org; Fri, 14 Apr 2006 05:34:07 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 05:34:07 GMT Message-Id: <200604140534.k3E5Y7PM026627@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 05:34:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=95225 Change 95225 by jb@jb_freebsd2 on 2006/04/14 05:33:07 Compatibility header. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/bitmap.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 05:35:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63D0516A403; Fri, 14 Apr 2006 05:35:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2929A16A401 for ; Fri, 14 Apr 2006 05:35:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C976343D48 for ; Fri, 14 Apr 2006 05:35:09 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E5Z940027658 for ; Fri, 14 Apr 2006 05:35:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E5Z9iC027649 for perforce@freebsd.org; Fri, 14 Apr 2006 05:35:09 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 05:35:09 GMT Message-Id: <200604140535.k3E5Z9iC027649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 05:35:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=95226 Change 95226 by jb@jb_freebsd2 on 2006/04/14 05:34:54 Only include Solaris-specific headers on Solaris. A bucket load of hacks to get this stuff to compile. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_options.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mknames.sh#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libgen/common/gmatch.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/libproc.h#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#2 (text) ==== @@ -32,7 +32,9 @@ #include #include #include +#if defined(sun) #include +#endif #include #define DTRACE_AHASHSIZE 32779 /* big 'ol prime */ @@ -254,6 +256,7 @@ static void dt_aggregate_umod(dtrace_hdl_t *dtp, uint64_t *data) { +#ifdef DOODAD uint64_t pid = data[0]; uint64_t *pc = &data[1]; struct ps_prochandle *P; @@ -272,6 +275,7 @@ dt_proc_unlock(dtp, P); dt_proc_release(dtp, P); +#endif } static void @@ -967,8 +971,10 @@ assert(agp->dtat_ncpu == 0); assert(agp->dtat_cpus == NULL); +#ifdef DOODAD agp->dtat_maxcpu = dt_sysconf(dtp, _SC_CPUID_MAX) + 1; agp->dtat_ncpu = dt_sysconf(dtp, _SC_NPROCESSORS_MAX); +#endif agp->dtat_cpus = malloc(agp->dtat_ncpu * sizeof (processorid_t)); if (agp->dtat_cpus == NULL) ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#2 (text) ==== @@ -39,7 +39,9 @@ * to check for errors and then perform a single check before using the buffer. */ +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#2 (text) ==== @@ -27,7 +27,9 @@ #pragma ident "@(#)dt_cg.c 1.13 05/07/31 SMI" #include +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#2 (text) ==== @@ -33,7 +33,9 @@ #include #include #include +#if defined(sun) #include +#endif #include /* @@ -521,7 +523,7 @@ return (dt_set_errno(dtp, EDT_BADSTACKPC)); } - if (pc == NULL) + if (pc == 0) break; addr += size; @@ -609,8 +611,10 @@ if (P != NULL) dt_proc_lock(dtp, P); /* lock handle while we perform lookups */ - for (i = 0; i < depth && pc[i] != NULL; i++) { + for (i = 0; i < depth && pc[i] != 0; i++) { +#ifdef DOODAD const prmap_t *map; +#endif if ((err = dt_printf(dtp, fp, "%*s", indent, "")) < 0) break; @@ -627,6 +631,7 @@ (void) snprintf(c, sizeof (c), "%s`%s", dt_basename(objname), name); } +#ifdef DOODAD } else if (str != NULL && str[0] != '\0' && str[0] != '@' && (P != NULL && ((map = Paddr_to_map(P, pc[i])) == NULL || (map->pr_mflags & MA_WRITE)))) { @@ -644,9 +649,10 @@ * case and we refuse to use the string. */ (void) snprintf(c, sizeof (c), "%s", str); +#endif } else { if (P != NULL && Pobjname(P, pc[i], objname, - sizeof (objname)) != NULL) { + sizeof (objname)) != 0) { (void) snprintf(c, sizeof (c), "%s`0x%llx", dt_basename(objname), (u_longlong_t)pc[i]); } else { @@ -758,7 +764,7 @@ if (P != NULL) dt_proc_lock(dtp, P); /* lock handle while we perform lookups */ - if (P != NULL && Pobjname(P, pc, objname, sizeof (objname)) != NULL) { + if (P != NULL && Pobjname(P, pc, objname, sizeof (objname)) != 0) { (void) snprintf(c, sizeof (c), "%s", dt_basename(objname)); } else { (void) snprintf(c, sizeof (c), "0x%llx", (u_longlong_t)pc); @@ -1783,8 +1789,10 @@ if ((nbuf.dtbd_data = malloc(size)) == NULL) return (dt_set_errno(dtp, EDT_NOMEM)); +#ifdef DOODAD if (max_ncpus == 0) max_ncpus = dt_sysconf(dtp, _SC_CPUID_MAX) + 1; +#endif for (i = 0; i < max_ncpus; i++) { nbuf.dtbd_cpu = i; @@ -1861,8 +1869,10 @@ if (!dtp->dt_active) return (dt_set_errno(dtp, EINVAL)); +#ifdef DOODAD if (max_ncpus == 0) max_ncpus = dt_sysconf(dtp, _SC_CPUID_MAX) + 1; +#endif if (pf == NULL) pf = (dtrace_consume_probe_f *)dt_nullprobe; ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#2 (text) ==== @@ -29,7 +29,9 @@ #include #include #include +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#2 (text) ==== @@ -32,7 +32,9 @@ #include #include #include +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#2 (text) ==== @@ -26,14 +26,20 @@ #pragma ident "@(#)dt_ident.c 1.15 06/02/22 SMI" +#if defined(sun) #include +#endif #include #include +#if defined(sun) #include +#endif #include #include #include +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#2 (text) ==== @@ -29,7 +29,13 @@ #pragma ident "@(#)dt_impl.h 1.20 06/03/24 SMI" #include +#if defined(sun) #include +#else +#include +#include +#include +#endif #include #include #include @@ -105,7 +111,9 @@ struct dt_module *dm_next; /* pointer to next module in hash chain */ const dt_modops_t *dm_ops; /* pointer to data model's ops vector */ Elf *dm_elf; /* libelf handle for module object */ +#if defined(sun) objfs_info_t dm_info; /* object filesystem private info */ +#endif ctf_sect_t dm_symtab; /* symbol table for module */ ctf_sect_t dm_strtab; /* string table for module */ ctf_sect_t dm_ctdata; /* CTF data for module */ ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 (text) ==== @@ -30,18 +30,24 @@ #include #include +#if defined(sun) #include +#endif #include #include +#if defined(sun) #include +#endif #include #include #include #include #include #include +#if defined(sun) #include +#endif #include #include @@ -390,6 +396,7 @@ s = &dofs[dofrh->dofr_tgtsec]; for (j = 0; j < nrel; j++) { +#ifdef DOODAD #if defined(__i386) || defined(__amd64) rel->r_offset = s->dofs_offset + dofr[j].dofr_offset; @@ -403,6 +410,7 @@ #else #error unknown ISA #endif +#endif sym->st_name = base + dofr[j].dofr_name - 1; sym->st_value = 0; @@ -1368,10 +1376,12 @@ * already been processed by an earlier link * invocation. */ +#ifdef DOODAD if (rsym.st_shndx != SHN_SUNW_IGNORE) { rsym.st_shndx = SHN_SUNW_IGNORE; (void) gelf_update_sym(data_sym, ndx, &rsym); } +#endif } /* ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 (text) ==== @@ -27,13 +27,17 @@ #pragma ident "@(#)dt_open.c 1.30 06/04/03 SMI" #include +#if defined(sun) #include #include +#endif #include #include #include +#if defined(sun) #include +#endif #include #include #include @@ -620,7 +624,9 @@ int _dtrace_debug = 0; /* debug messages enabled (off) */ const char *const _dtrace_version = DT_VERS_STRING; /* API version string */ +#ifdef DOODAD int _dtrace_rdvers = RD_VERSION; /* rtld_db feature version */ +#endif typedef struct dt_fdlist { int *df_fds; /* array of provider driver file descriptors */ @@ -628,6 +634,7 @@ uint_t df_size; /* size of df_fds[] */ } dt_fdlist_t; +#ifdef DOODAD #pragma init(_dtrace_init) void _dtrace_init(void) @@ -639,6 +646,7 @@ break; } } +#endif static dtrace_hdl_t * set_open_errno(dtrace_hdl_t *dtp, int *errp, int err) @@ -899,9 +907,11 @@ (void) snprintf(isadef, sizeof (isadef), "-D__SUNW_D_%u", (uint_t)(sizeof (void *) * NBBY)); +#ifdef DOODAD (void) snprintf(utsdef, sizeof (utsdef), "-D__%s_%s", dt_get_sysinfo(SI_SYSNAME, s1, sizeof (s1)), dt_get_sysinfo(SI_RELEASE, s2, sizeof (s2))); +#endif if (dt_cpp_add_arg(dtp, "-D__sun") == NULL || dt_cpp_add_arg(dtp, "-D__unix") == NULL || ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_options.c#2 (text) ==== @@ -34,7 +34,9 @@ #include #include #include +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#2 (text) ==== @@ -100,7 +100,9 @@ #include #include #include +#if defined(sun) #include +#endif #include #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#2 (text) ==== @@ -31,7 +31,9 @@ #pragma ident "@(#)dt_pid.h 1.7 06/02/08 SMI" #include +#if defined(sun) #include +#endif #include #ifdef __cplusplus @@ -45,6 +47,7 @@ dt_pcb_t *pcb); extern int dt_pid_create_probes_module(dtrace_hdl_t *, dt_proc_t *); +#ifdef DOODAD extern int dt_pid_create_entry_probe(struct ps_prochandle *, dtrace_hdl_t *, fasttrap_probe_spec_t *, const GElf_Sym *); @@ -56,6 +59,7 @@ extern int dt_pid_create_glob_offset_probes(struct ps_prochandle *, dtrace_hdl_t *, fasttrap_probe_spec_t *, const GElf_Sym *, const char *); +#endif #ifdef __cplusplus } ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#2 (text) ==== @@ -27,7 +27,9 @@ #pragma ident "@(#)dt_pragma.c 1.5 05/06/08 SMI" #include +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (text) ==== @@ -27,10 +27,14 @@ #pragma ident "@(#)dt_printf.c 1.19 06/01/07 SMI" +#if defined(sun) #include +#endif #include #include +#if defined(sun) #include +#endif #include #include #include @@ -455,7 +459,11 @@ * Below, we turn this into the canonical adb/mdb /[yY] format, * "1973 Dec 3 17:20:00". */ +#if defined(sun) (void) ctime_r(&sec, src, sizeof (src)); +#else + (void) ctime_r(&sec, src); +#endif /* * Place the 4-digit year at the head of the string... @@ -1598,7 +1606,8 @@ * fails, we can fail the operation without destroying stdout. */ if ((nfp = fopen(filename, "aw")) == NULL) { - char *msg = strerror(errno), *faultstr; + char *msg = strerror(errno); + char *faultstr; int len = 80; len += strlen(msg) + strlen(filename); ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 (text) ==== @@ -32,7 +32,9 @@ #include #include #include +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#2 (text) ==== @@ -27,13 +27,17 @@ #pragma ident "@(#)dt_provider.c 1.11 06/04/04 SMI" #include +#if defined(sun) #include +#endif #include #include #include #include +#if defined(sun) #include +#endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#2 (text) ==== @@ -27,7 +27,11 @@ #pragma ident "@(#)dt_regset.c 1.2 05/06/08 SMI" #include +#if defined(sun) #include +#else +#include +#endif #include #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#2 (text) ==== @@ -30,6 +30,9 @@ #pragma ident "@(#)dt_regset.h 1.2 05/06/08 SMI" #include +#if !defined(sun) +#include +#endif #ifdef __cplusplus extern "C" { ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#2 (text) ==== @@ -27,7 +27,9 @@ #pragma ident "@(#)dt_strtab.c 1.3 05/06/08 SMI" #include +#if defined(sun) #include +#endif #include #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#2 (text) ==== @@ -30,6 +30,9 @@ #pragma ident "@(#)dt_strtab.h 1.3 05/06/08 SMI" #include +#if !defined(sun) +#include +#endif #ifdef __cplusplus extern "C" { ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#2 (text) ==== @@ -26,7 +26,9 @@ #pragma ident "@(#)dt_subr.c 1.12 05/11/29 SMI" +#if defined(sun) #include +#endif #include #include @@ -36,7 +38,9 @@ #include #include #include +#if defined(sun) #include +#endif #include #include #include @@ -486,8 +490,10 @@ { const dtrace_vector_t *v = dtp->dt_vector; +#ifdef DOODAD if (v == NULL) return (p_online(cpu, P_STATUS)); +#endif return (v->dtv_status(dtp->dt_varg, cpu)); } @@ -922,7 +928,7 @@ } else { (void) snprintf(c, sizeof (c), "%s`%s", obj, name); } - } else if (Pobjname(P, addr, objname, sizeof (objname)) != NULL) { + } else if (Pobjname(P, addr, objname, sizeof (objname)) != 0) { (void) snprintf(c, sizeof (c), "%s`0x%llx", dt_basename(objname), addr); } else { ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#2 (text) ==== @@ -32,14 +32,19 @@ #include #include #include +#if !defined(sun) +#include +#endif static const struct { int dtslt_option; size_t dtslt_offs; } _dtrace_sleeptab[] = { +#if defined(sun) { DTRACEOPT_STATUSRATE, offsetof(dtrace_hdl_t, dt_laststatus) }, { DTRACEOPT_AGGRATE, offsetof(dtrace_hdl_t, dt_lastagg) }, { DTRACEOPT_SWITCHRATE, offsetof(dtrace_hdl_t, dt_lastswitch) }, +#endif { DTRACEOPT_MAX, 0 } }; ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#2 (text) ==== @@ -26,7 +26,9 @@ # #ident "@(#)mkerrtags.sh 1.2 05/06/08 SMI" -echo "\ +BSDECHO=-e + +echo ${BSDECHO} "\ /*\n\ * Copyright 2003 Sun Microsystems, Inc. All rights reserved.\n\ * Use is subject to license terms.\n\ @@ -43,7 +45,7 @@ sed -n "s/$pattern/$replace/p" || exit 1 -echo "\ +echo ${BSDECHO} "\ };\n\ \n\ static const int _dt_ntag = sizeof (_dt_errtags) / sizeof (_dt_errtags[0]);\n\ ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mknames.sh#2 (text) ==== @@ -26,7 +26,9 @@ # #ident "@(#)mknames.sh 1.1 05/07/31 SMI" -echo "\ +BSDECHO=-e + +echo ${BSDECHO} "\ /*\n\ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.\n\ * Use is subject to license terms.\n\ @@ -47,7 +49,7 @@ printf("\tcase %s: return (\"%s\");\n", $2, tolower(substr($2, 10))); }' -echo "\ +echo ${BSDECHO} "\ default: return (\"unknown\");\n\ }\n\ }" ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libgen/common/gmatch.c#2 (text) ==== @@ -32,15 +32,23 @@ /*LINTLIBRARY*/ +#if defined(sun) #pragma weak gmatch = _gmatch +#endif +#if defined(sun) #include "gen_synonyms.h" +#endif #include #include #include #include +#if defined(sun) #include #include "_range.h" +#else +/* DOODAD */ static int multibyte = 0; +#endif #define Popwchar(p, c) \ n = mbtowc(&cl, p, MB_LEN_MAX); \ ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/libproc.h#2 (text) ==== @@ -48,8 +48,11 @@ #include #include #include +#if defined(sun) #include +#endif #include +#if defined(sun) #include #include #include @@ -65,6 +68,7 @@ #if defined(__i386) || defined(__amd64) #include #endif +#endif #ifdef __cplusplus extern "C" { @@ -200,6 +204,7 @@ extern void Prelease(struct ps_prochandle *, int); extern void Pfree(struct ps_prochandle *); +#if defined(sun) extern int Pasfd(struct ps_prochandle *); extern int Pctlfd(struct ps_prochandle *); extern int Pcreate_agent(struct ps_prochandle *); @@ -696,6 +701,7 @@ extern int proc_initstdio(void); extern int proc_flushstdio(void); extern int proc_finistdio(void); +#endif /* defined(sun) */ #ifdef __cplusplus } ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#2 (text) ==== @@ -47,12 +47,20 @@ #ifndef _ASM #include +#if defined(sun) #include #include #include +#else +#include +#endif #include +#if defined(sun) #include #include +#else +#include +#endif /* * DTrace Universal Constants and Typedefs From owner-p4-projects@FreeBSD.ORG Fri Apr 14 05:42:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DA3D16A406; Fri, 14 Apr 2006 05:42:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40A1A16A402 for ; Fri, 14 Apr 2006 05:42:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED39743D45 for ; Fri, 14 Apr 2006 05:42:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E5gMsv033593 for ; Fri, 14 Apr 2006 05:42:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E5gMLY033587 for perforce@freebsd.org; Fri, 14 Apr 2006 05:42:22 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 05:42:22 GMT Message-Id: <200604140542.k3E5gMLY033587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 05:42:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=95227 Change 95227 by jb@jb_freebsd2 on 2006/04/14 05:41:22 Add usr.sbin back into the subdirectory list. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile#5 (text+ko) ==== @@ -3,8 +3,7 @@ SUBDIR= .if !defined(NO_CDDL) -SUBDIR+= lib usr.bin -#SUBDIR+= lib usr.bin usr.sbin +SUBDIR+= lib usr.bin usr.sbin .endif .include From owner-p4-projects@FreeBSD.ORG Fri Apr 14 05:43:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D43616A405; Fri, 14 Apr 2006 05:43:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E6FB16A401; Fri, 14 Apr 2006 05:43:43 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id F21EA43D45; Fri, 14 Apr 2006 05:43:42 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [127.0.0.1] (may be forged)) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k3E5haW0005332; Thu, 13 Apr 2006 23:43:36 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 13 Apr 2006 23:43:49 -0600 (MDT) Message-Id: <20060413.234349.66709460.imp@bsdimp.com> To: marcel@xcllnt.net From: "M. Warner Losh" In-Reply-To: <014B1689-1A9A-4AC3-BE76-AF8E35FF0A9C@xcllnt.net> References: <200604121450.k3CEoUJh071640@repoman.freebsd.org> <200604121202.29736.jhb@freebsd.org> <014B1689-1A9A-4AC3-BE76-AF8E35FF0A9C@xcllnt.net> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org, jhb@freebsd.org Subject: Re: PERFORCE change 95068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 05:43:43 -0000 In message: <014B1689-1A9A-4AC3-BE76-AF8E35FF0A9C@xcllnt.net> Marcel Moolenaar writes: : : On Apr 12, 2006, at 9:02 AM, John Baldwin wrote: : : > On Wednesday 12 April 2006 10:50, Marcel Moolenaar wrote: : >> http://perforce.freebsd.org/chv.cgi?CH=95068 : >> : >> Change 95068 by marcel@marcel_nfs on 2006/04/12 14:49:30 : >> : >> Replace the rmask and rval arrays with vendor, device, subvendor : >> and subdevice variables. When subvendor is 0xffff, don't test the : >> subvendor and subdevice values. This strips 24 bytes from the : >> description. : >> While here, sort the list on vendor, device, subvendor and : >> subdevice. : > : > I guess you expanded any entries that were using masks other than : > 0xffff? (I think there were only a handful if any). : : Not yet. I looked at the latest pucdata.c in NetBSD and more entries : with masks other than 0xffff have been added. While the handful we : had looked like mistakes (was 0xfffc, should probably be 0xfffe), the : new ones don't. I need to investigate, because if the mask is used : as a quick and dirty way to add multiple boards with a single entry : then I'm not sure it's a good thing. For different boards, different : descriptions are better. In that case I will expand. Otherwise I may : end up bringing back the mask. : : The entries in question have a /* MASK */ comment as a reminder. You might want to take a look at some of what I did in my newcard tree, since I reduce the data quite a bit. I think I may have committed it to head, but I might have forgotten. The mask was indeed for multiple boards to make the table smaller, but it really made it larger. Warner From owner-p4-projects@FreeBSD.ORG Fri Apr 14 05:58:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6475816A404; Fri, 14 Apr 2006 05:58:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F55F16A402 for ; Fri, 14 Apr 2006 05:58:43 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CF1E43D46 for ; Fri, 14 Apr 2006 05:58:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E5wgNv041545 for ; Fri, 14 Apr 2006 05:58:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E5wg5E041537 for perforce@freebsd.org; Fri, 14 Apr 2006 05:58:42 GMT (envelope-from imp@freebsd.org) Date: Fri, 14 Apr 2006 05:58:42 GMT Message-Id: <200604140558.k3E5wg5E041537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 05:58:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=95228 Change 95228 by imp@imp_hammer on 2006/04/14 05:57:43 All this code has migrated to at91/boot0, et al. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/AT91RM9200.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#6 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/README#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/arm_init.s#3 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.c#12 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/at91rm9200_lowlevel.h#6 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/lib.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/lib.h#3 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/linker.cfg#3 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.c#5 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/xmodem.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 05:58:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C463A16A468; Fri, 14 Apr 2006 05:58:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1D7516A466 for ; Fri, 14 Apr 2006 05:58:43 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B10543D46 for ; Fri, 14 Apr 2006 05:58:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E5whAP041556 for ; Fri, 14 Apr 2006 05:58:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E5whf0041548 for perforce@freebsd.org; Fri, 14 Apr 2006 05:58:43 GMT (envelope-from imp@freebsd.org) Date: Fri, 14 Apr 2006 05:58:43 GMT Message-Id: <200604140558.k3E5whf0041548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95229 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 05:58:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=95229 Change 95229 by imp@imp_hammer on 2006/04/14 05:58:25 Kill one more. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/main.c#9 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 06:03:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8997416A405; Fri, 14 Apr 2006 06:03:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C3F316A403 for ; Fri, 14 Apr 2006 06:03:50 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 166DF43D45 for ; Fri, 14 Apr 2006 06:03:50 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E63nYb046313 for ; Fri, 14 Apr 2006 06:03:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E63n4h046310 for perforce@freebsd.org; Fri, 14 Apr 2006 06:03:49 GMT (envelope-from imp@freebsd.org) Date: Fri, 14 Apr 2006 06:03:49 GMT Message-Id: <200604140603.k3E63n4h046310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 06:03:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=95230 Change 95230 by imp@imp_hammer on 2006/04/14 06:03:08 virgin import of bootloader for kb9202 board. This will be the basis for the bootiic and maybe bootspi loaders that I'll be developing. I've already done a lot of work on boot0 that will directly translate to these files. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/AT91RM9200.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/README#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.s#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/at91rm9200_lowlevel.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/at91rm9200_lowlevel.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/debug_io.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/debug_io.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/eeprom.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/eeprom.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/emac.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/emac.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/linker.cfg#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/p_string.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/p_string.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/tag_list.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/tag_list.h#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/xmodem.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/xmodem.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 06:27:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E81F616A402; Fri, 14 Apr 2006 06:27:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C487C16A400 for ; Fri, 14 Apr 2006 06:27:18 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DDFE43D49 for ; Fri, 14 Apr 2006 06:27:18 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E6RIgl057504 for ; Fri, 14 Apr 2006 06:27:18 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E6RINa057501 for perforce@freebsd.org; Fri, 14 Apr 2006 06:27:18 GMT (envelope-from jmg@freebsd.org) Date: Fri, 14 Apr 2006 06:27:18 GMT Message-Id: <200604140627.k3E6RINa057501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95231 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 06:27:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=95231 Change 95231 by jmg@jmg_carbon-60 on 2006/04/14 06:27:12 man I feel stupid, enable a few things that should of been enabled a while back, this should get ata working... Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/bus.h#7 (text+ko) ==== @@ -521,7 +521,7 @@ { __BUS_DEBUG_ACCESS(h, o, "read stream", 1); - return (0); + return (lduba_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type])); } static __inline uint16_t @@ -529,7 +529,7 @@ { __BUS_DEBUG_ACCESS(h, o, "read stream", 2); - return (0); + return (lduha_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type])); } static __inline uint32_t @@ -537,7 +537,7 @@ { __BUS_DEBUG_ACCESS(h, o, "read stream", 4); - return (0); + return (lduwa_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type])); } static __inline uint64_t @@ -545,7 +545,7 @@ { __BUS_DEBUG_ACCESS(h, o, "read stream", 8); - return (0); + return (ldxa_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type])); } static __inline void @@ -599,6 +599,7 @@ { __BUS_DEBUG_ACCESS(h, o, "write stream", 2); + stha_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type], v); } static __inline void @@ -607,6 +608,7 @@ { __BUS_DEBUG_ACCESS(h, o, "write stream", 4); + stwa_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type], v); } static __inline void @@ -615,6 +617,7 @@ { __BUS_DEBUG_ACCESS(h, o, "write stream", 8); + stxa_nc((caddr_t)(h + o), bus_stream_asi[t->bst_type], v); } static __inline void From owner-p4-projects@FreeBSD.ORG Fri Apr 14 06:30:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F84F16A407; Fri, 14 Apr 2006 06:30:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55D0216A405 for ; Fri, 14 Apr 2006 06:30:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D051543D49 for ; Fri, 14 Apr 2006 06:30:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E6UM3Y057826 for ; Fri, 14 Apr 2006 06:30:22 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E6UM7f057820 for perforce@freebsd.org; Fri, 14 Apr 2006 06:30:22 GMT (envelope-from imp@freebsd.org) Date: Fri, 14 Apr 2006 06:30:22 GMT Message-Id: <200604140630.k3E6UM7f057820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 06:30:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=95232 Change 95232 by imp@imp_hammer on 2006/04/14 06:29:43 Initial integration into the tree. The text + data is now under 8k, but the bss makes it over 12.5k. I believe that we need to initialize this area, since we read the whole 16k eeprom with the loader as it stands. I think that we should be able to do away with the extra 8k read if we get bss working right (otherwise the bss gets junk in it, which is likely why my experiments with the bootloader failed last time). More could be done to better integrate this, as well as chopping it up into smaller bits. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/AT91RM9200.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/debug_io.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.h#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#2 (text+ko) ==== @@ -1,77 +1,24 @@ -#/****************************************************************************** -# * -# * Filename: Makefile -# * -# * Classic makefile intended for use in gnu environment. The entries listed -# * here are intentionally simple to aid the novice user in his/her own -# * development - for easy modification. -# * -# * Revision information: -# * -# * 20AUG2004 kb_admin initial creation -# * 12JAN2005 kb_admin re-org, added emac -# * -# * BEGIN_KBDD_BLOCK -# * No warranty, expressed or implied, is included with this software. It is -# * provided "AS IS" and no warranty of any kind including statutory or aspects -# * relating to merchantability or fitness for any purpose is provided. All -# * intellectual property rights of others is maintained with the respective -# * owners. This software is not copyrighted and is intended for reference -# * only. -# * END_BLOCK -# ****************************************************************************** -# - -SHELL = /bin/sh - -basetoolsdir = /usr/local/arm -bindir = ${basetoolsdir}/bin -libdir = ${basetoolsdir}/lib/gcc/arm-linux-uclibc/3.4.2 - -CC = ${bindir}/arm-linux-gcc -AS = ${bindir}/arm-linux-as -LD = ${bindir}/arm-linux-ld -OBJCOPY = ${bindir}/arm-linux-objcopy - -CFILES = eeprom.o at91rm9200_lowlevel.o main.o env_vars.o debug_io.o loader_prompt.o p_string.o xmodem.o tag_list.o emac.o -ASFILES = arm_init.o - -bootloader: ${CFILES} ${ASFILES} - ${LD} -e 0 -o bootloader.out -T linker.cfg ${ASFILES} ${CFILES} - ${OBJCOPY} -O binary bootloader.out bootloader.bin - -main.o: main.c - ${CC} -c $? - -env_vars.o: env_vars.c - ${CC} -c $? - -debug_io.o: debug_io.c - ${CC} -c $? - -at91rm9200_lowlevel.o: at91rm9200_lowlevel.c - ${CC} -c $? - -loader_prompt.o: loader_prompt.c - ${CC} -c $? - -p_string.o: p_string.c - ${CC} -c $? - -xmodem.o: xmodem.c - ${CC} -c $? - -tag_list.o: tag_list.c - ${CC} -c $? - -eeprom.o: eeprom.c - ${CC} -c $? - -emac.o: emac.c - ${CC} -c $? - -arm_init.o: arm_init.s - ${AS} -o $@ $? - -clean: - rm -f *.o +# $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.1 2006/04/12 21:22:44 imp Exp $ + +.PATH: ${.CURDIR}/../boot0 + +PROG=bootiic +SRCS=arm_init.s at91rm9200_lowlevel.c lib.c main.c xmodem.c eeprom.c \ + env_vars.c debug_io.c loader_prompt.c p_string.c emac.c +NO_MAN= +LDFLAGS=-e 0 -T linker.cfg +CFLAGS=-O2 -mcpu=arm9 -ffreestanding -I${.CURDIR}/../inc -I${.CURDIR}/../boot0 +CFLAGS+=-DBOOT0_KB9202 +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +CLEANFILES=${OBJS} ${PROG} ${PROG}.out + +all: ${PROG} + +${PROG}: ${PROG}.out ${OBJS} + objcopy -S -O binary ${PROG}.out ${PROG} + +${PROG}.out: ${OBJS} + ld ${LDFLAGS} -o ${PROG}.out ${OBJS} + +clean: + rm -f ${CLEANFILES} ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/debug_io.c#2 (text+ko) ==== @@ -23,23 +23,6 @@ /* * .KB_C_FN_DEFINITION_START - * void DebugPutc(char) - * This global function writes a character to the debug uart port as soon - * as it is ready to send another character. - * .KB_C_FN_DEFINITION_END - */ -void DebugPutc(char cValue) { - - AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; - - while (!(pUSART->US_CSR & AT91C_US_TXRDY)) ; - - pUSART->US_THR = (cValue & 0x1FF); -} - - -/* - * .KB_C_FN_DEFINITION_START * void DebugPrint(char *) * This global function writes a string to the debug uart port. * .KB_C_FN_DEFINITION_END @@ -48,62 +31,10 @@ if (!buffer) return; - while(*buffer != '\0') { - DebugPutc(*buffer++); - } + while(*buffer != '\0') + putc(*buffer++); } - -/* - * .KB_C_FN_DEFINITION_START - * int DebugGetchar(char *) - * This global function return true if a character was received from the - * debug uart port and sets the character in the pointer passed. Otherwise, - * the function returns 0 if not character was available. - * .KB_C_FN_DEFINITION_END - */ -int DebugGetchar(char *retChar) { - - AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; - - if ((pUSART->US_CSR & AT91C_US_RXRDY)) { - *retChar = (char)((pUSART->US_RHR) & 0x1FF); - return (1); - } - return (0); -} - - -/* - * .KB_C_FN_DEFINITION_START - * int WaitForChar(char *, int) - * This global function waits at least the specified number of seconds for - * a character and returns non-zero if a character was received and stored in - * the pointer. Otherwise, the function returns 0. - * .KB_C_FN_DEFINITION_END - */ -int WaitForChar(char *cPtr, int seconds) { - - unsigned thisSecond; - - ++seconds; - thisSecond = GetSeconds(); - - while (seconds) { - if (DebugGetchar(cPtr)) { - return (1); - } - - if (GetSeconds() != thisSecond) { - --seconds; - thisSecond = GetSeconds(); - } - } - - return (0); -} - - /* * .KB_C_FN_DEFINITION_START * void DebugPrintHex(int, int) ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ #include "p_string.h" #include "debug_io.h" #include "eeprom.h" - +#include "lib.h" /* ****************************** GLOBALS *************************************/ char boot_commands[MAX_BOOT_COMMANDS][MAX_INPUT_SIZE]; @@ -49,17 +49,17 @@ * terminated. Returns 0 to indicate _wait_ condition. * .KB_C_FN_DEFINITION_END */ -static int ReadCharFromEnvironment(char *cPtr) { +static int ReadCharFromEnvironment(int timeout) +{ + int ch; if (currentIndex < MAX_BOOT_COMMANDS) { - - *cPtr = boot_commands[currentIndex][currentOffset++]; - - if ((!*cPtr) || (currentOffset >= MAX_INPUT_SIZE)) { + ch = boot_commands[currentIndex][currentOffset++]; + if (ch == '\0' || (currentOffset >= MAX_INPUT_SIZE)) { currentOffset = 0; ++currentIndex; } - return (1); + return (ch); } return (-1); @@ -143,7 +143,7 @@ DebugPrintHex(2, i); DebugPrint(" : "); for (j = 0; j < MAX_INPUT_SIZE; ++j) { - DebugPutc(boot_commands[i][j]); + putc(boot_commands[i][j]); if (!(boot_commands[i][j])) break; } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#2 (text+ko) ==== @@ -25,9 +25,12 @@ #include "p_string.h" #include "xmodem.h" #include "eeprom.h" +#ifdef SUPPORT_TAG_LIST #include "tag_list.h" +#endif #include "emac.h" #include "loader_prompt.h" +#include "lib.h" /* ****************************** GLOBALS *************************************/ @@ -317,6 +320,7 @@ } break; +#ifdef SUPPORT_TAG_LIST case COMMAND_TAG: { // t
@@ -330,6 +334,7 @@ } break; +#endif case COMMAND_WRITE: // write the command table to non-volatile @@ -379,7 +384,7 @@ inputBuffer[buffCount] = p_char; ++buffCount; - DebugPutc(p_char); + putc(p_char); } } else if (buffCount) { @@ -413,21 +418,20 @@ * the loader will parse. * .KB_C_FN_DEFINITION_END */ -void Bootloader(int(*inputFunction)(char*)) { +void Bootloader(int(*inputFunction)(int)) { - char l_char; - int returnValue = 0; + int ch = 0; p_memset((void*)inputBuffer, 0, sizeof(inputBuffer)); buffCount = 0; if (!inputFunction) { - inputFunction = DebugGetchar; + inputFunction = getc; } DebugPrint("\n\r>"); - while (returnValue >= 0) - if ((returnValue = ((*inputFunction)(&l_char))) > 0) - ServicePrompt(l_char); + while (ch >= 0) + if ((ch = ((*inputFunction)(0))) > 0) + ServicePrompt(ch); } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.h#2 (text+ko) ==== @@ -47,6 +47,6 @@ char *c_string; } command_entry_t; -extern void EnterInteractiveBootloader(int(*inputFunction)(char*)); +extern void EnterInteractiveBootloader(int(*inputFunction)(int)); #endif /* _LOADER_PROMPT_H_ */ ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#2 (text+ko) ==== @@ -47,13 +47,8 @@ DebugPrint("\n\rKB9202(www.kwikbyte.com)\n\r"); DebugPrint("\n\rAuto boot..\n\r"); - /* check for input */ - if (!DebugGetchar(&l_char) && - !DebugGetchar(&l_char) && - !DebugGetchar(&l_char)) { - + if (getc(1) == -1) ExecuteEnvironmentFunctions(); - } Bootloader(0); From owner-p4-projects@FreeBSD.ORG Fri Apr 14 06:33:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 748C816A405; Fri, 14 Apr 2006 06:33:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 550B316A400 for ; Fri, 14 Apr 2006 06:33:27 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24D5D43D48 for ; Fri, 14 Apr 2006 06:33:27 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E6XRAs060508 for ; Fri, 14 Apr 2006 06:33:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E6XQ51060502 for perforce@freebsd.org; Fri, 14 Apr 2006 06:33:26 GMT (envelope-from imp@freebsd.org) Date: Fri, 14 Apr 2006 06:33:26 GMT Message-Id: <200604140633.k3E6XQ51060502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 06:33:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=95233 Change 95233 by imp@imp_hammer on 2006/04/14 06:33:20 We can use boot0's lowlevel routine. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.s#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/at91rm9200_lowlevel.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/at91rm9200_lowlevel.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/emac.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.s#2 (text+ko) ==== @@ -76,9 +76,9 @@ /* Perform system initialization */ - .extern DefaultSystemInit + .extern _init - bl DefaultSystemInit + bl _init ldr r1, = SVC_STACK_USE mov sp, r1 @ ; Move the stack to SDRAM ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/emac.c#2 (text+ko) ==== @@ -23,6 +23,7 @@ #include "AT91RM9200.h" #include "emac.h" #include "p_string.h" +#include "at91rm9200_lowlevel.h" /* ****************************** GLOBALS *************************************/ From owner-p4-projects@FreeBSD.ORG Fri Apr 14 06:39:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DC1116A403; Fri, 14 Apr 2006 06:39:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65C8E16A400 for ; Fri, 14 Apr 2006 06:39:35 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1DCF43D48 for ; Fri, 14 Apr 2006 06:39:34 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E6dY43065269 for ; Fri, 14 Apr 2006 06:39:34 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E6dYTn065266 for perforce@freebsd.org; Fri, 14 Apr 2006 06:39:34 GMT (envelope-from jmg@freebsd.org) Date: Fri, 14 Apr 2006 06:39:34 GMT Message-Id: <200604140639.k3E6dYTn065266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 06:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=95234 Change 95234 by jmg@jmg_arlene on 2006/04/14 06:39:02 copy over the bus_type_asi to bus_stream_asi dropping the little endian bits like sparc64.. this gets the kernel linking.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#5 (text+ko) ==== @@ -139,6 +139,15 @@ 0 }; +int bus_stream_asi[] = { + ASI_REAL_IO, /* UPA */ + ASI_REAL_IO, /* SBUS */ + ASI_REAL_IO, /* PCI configuration space */ + ASI_REAL_IO, /* PCI memory space */ + ASI_REAL_IO, /* PCI I/O space */ + 0 +}; + /* * Convenience function for manipulating driver locks from busdma (during * busdma_swi, for example). Drivers that don't provide their own locks From owner-p4-projects@FreeBSD.ORG Fri Apr 14 06:43:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CC1616A405; Fri, 14 Apr 2006 06:43:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 369F416A403 for ; Fri, 14 Apr 2006 06:43:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0593043D46 for ; Fri, 14 Apr 2006 06:43:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E6heYt067988 for ; Fri, 14 Apr 2006 06:43:40 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E6heBb067985 for perforce@freebsd.org; Fri, 14 Apr 2006 06:43:40 GMT (envelope-from imp@freebsd.org) Date: Fri, 14 Apr 2006 06:43:40 GMT Message-Id: <200604140643.k3E6heBb067985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95235 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 06:43:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=95235 Change 95235 by imp@imp_hammer on 2006/04/14 06:43:39 tweaks, shaves a couple meaningless bytes Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/eeprom.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/eeprom.c#2 (text+ko) ==== @@ -44,25 +44,24 @@ * to be called a single time. * .KB_C_FN_DEFINITION_END */ -void InitEEPROM(void) { +void +InitEEPROM(void) +{ AT91PS_TWI twiPtr = (AT91PS_TWI)AT91C_BASE_TWI; AT91PS_PIO pPio = (AT91PS_PIO)AT91C_BASE_PIOA; AT91PS_PMC pPMC = (AT91PS_PMC)AT91C_BASE_PMC; - pPio->PIO_ASR = - ((unsigned)AT91C_PA25_TWD) | ((unsigned)AT91C_PA26_TWCK); - pPio->PIO_BSR = 0; - pPio->PIO_PDR = - ((unsigned)AT91C_PA25_TWD) | ((unsigned)AT91C_PA26_TWCK); + pPio->PIO_ASR = AT91C_PA25_TWD | AT91C_PA26_TWCK; + pPio->PIO_PDR = AT91C_PA25_TWD | AT91C_PA26_TWCK; - pPio->PIO_MDDR = ~((unsigned)AT91C_PA25_TWD); - pPio->PIO_MDER = (unsigned)AT91C_PA25_TWD; + pPio->PIO_MDDR = ~AT91C_PA25_TWD; + pPio->PIO_MDER = AT91C_PA25_TWD; - pPMC->PMC_PCER = ((unsigned) 1 << AT91C_ID_TWI); + pPMC->PMC_PCER = 1u << AT91C_ID_TWI; - twiPtr->TWI_IDR = (unsigned) -1; + twiPtr->TWI_IDR = 0xffffffffu; twiPtr->TWI_CR = AT91C_TWI_SWRST; twiPtr->TWI_CR = AT91C_TWI_MSEN | AT91C_TWI_SVDIS; From owner-p4-projects@FreeBSD.ORG Fri Apr 14 08:28:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F60F16A407; Fri, 14 Apr 2006 08:28:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C96B16A401 for ; Fri, 14 Apr 2006 08:28:33 +0000 (UTC) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19A8B43D5F for ; Fri, 14 Apr 2006 08:28:20 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3E8SG0U023416 for ; Fri, 14 Apr 2006 08:28:16 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E8SGiB023413 for perforce@freebsd.org; Fri, 14 Apr 2006 08:28:16 GMT (envelope-from jmg@freebsd.org) Date: Fri, 14 Apr 2006 08:28:16 GMT Message-Id: <200604140828.k3E8SGiB023413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Cc: Subject: PERFORCE change 95237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 08:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=95237 Change 95237 by jmg@jmg_arlene on 2006/04/14 08:28:08 pull in updated mpt driver to see if this'll improve anything.. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi_cnfg.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi_ioc.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi_sas.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi_type.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_pci.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt_reg.h#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -33,7 +33,7 @@ * Title: MPI Message independent structures and definitions * Creation Date: July 27, 2000 * - * mpi.h Version: 01.05.09 + * mpi.h Version: 01.05.10 * * Version History * --------------- @@ -102,6 +102,7 @@ * TargetAssistExtended requests. * Added EEDP IOCStatus codes. * 08-03-05 01.05.09 Bumped MPI_HEADER_VERSION_UNIT. + * 08-30-05 01.05.10 Added 2 new IOCStatus codes for Target. * -------------------------------------------------------------------------- */ @@ -132,7 +133,7 @@ /* Note: The major versions of 0xe0 through 0xff are reserved */ /* versioning for this MPI header set */ -#define MPI_HEADER_VERSION_UNIT (0x0B) +#define MPI_HEADER_VERSION_UNIT (0x0C) #define MPI_HEADER_VERSION_DEV (0x00) #define MPI_HEADER_VERSION_UNIT_MASK (0xFF00) #define MPI_HEADER_VERSION_UNIT_SHIFT (8) @@ -739,6 +740,8 @@ #define MPI_IOCSTATUS_TARGET_DATA_OFFSET_ERROR (0x006D) #define MPI_IOCSTATUS_TARGET_TOO_MUCH_WRITE_DATA (0x006E) #define MPI_IOCSTATUS_TARGET_IU_TOO_SHORT (0x006F) +#define MPI_IOCSTATUS_TARGET_ACK_NAK_TIMEOUT (0x0070) +#define MPI_IOCSTATUS_TARGET_NAK_RECEIVED (0x0071) /****************************************************************************/ /* Additional FCP target values (obsolete) */ ==== //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi_cnfg.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -33,7 +33,7 @@ * Title: MPI Config message, structures, and Pages * Creation Date: July 27, 2000 * - * mpi_cnfg.h Version: 01.05.10 + * mpi_cnfg.h Version: 01.05.11 * * Version History * --------------- @@ -285,6 +285,14 @@ * Added EnclosureHandle field to SAS Expander page 0. * Removed redundant NumTableEntriesProg field from SAS * Expander Page 1. + * 08-30-05 01.05.11 Added DeviceID for FC949E and changed the DeviceID for + * SAS1078. + * Added more defines for Manufacturing Page 4 Flags field. + * Added more defines for IOCSettings and added + * ExpanderSpinup field to Bios Page 1. + * Added postpone SATA Init bit to SAS IO Unit Page 1 + * ControlFlags. + * Changed LogEntry format for Log Page 0. * -------------------------------------------------------------------------- */ @@ -530,7 +538,7 @@ #define MPI_MANUFACTPAGE_DEVICEID_FC929X (0x0626) #define MPI_MANUFACTPAGE_DEVICEID_FC939X (0x0642) #define MPI_MANUFACTPAGE_DEVICEID_FC949X (0x0640) -#define MPI_MANUFACTPAGE_DEVICEID_FC949ES (0x0646) +#define MPI_MANUFACTPAGE_DEVICEID_FC949E (0x0646) /* SCSI */ #define MPI_MANUFACTPAGE_DEVID_53C1030 (0x0030) #define MPI_MANUFACTPAGE_DEVID_53C1030ZC (0x0031) @@ -546,7 +554,7 @@ #define MPI_MANUFACTPAGE_DEVID_SAS1066E (0x005A) #define MPI_MANUFACTPAGE_DEVID_SAS1068 (0x0054) #define MPI_MANUFACTPAGE_DEVID_SAS1068E (0x0058) -#define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0060) +#define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0062) typedef struct _CONFIG_PAGE_MANUFACTURING_0 @@ -650,9 +658,14 @@ } CONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4, ManufacturingPage4_t, MPI_POINTER pManufacturingPage4_t; -#define MPI_MANUFACTURING4_PAGEVERSION (0x02) +#define MPI_MANUFACTURING4_PAGEVERSION (0x03) /* defines for the Flags field */ +#define MPI_MANPAGE4_IME_DISABLE (0x20) +#define MPI_MANPAGE4_IM_DISABLE (0x10) +#define MPI_MANPAGE4_IS_DISABLE (0x08) +#define MPI_MANPAGE4_IR_MODEPAGE8_DISABLE (0x04) +#define MPI_MANPAGE4_IM_RESYNC_CACHE_ENABLE (0x02) #define MPI_MANPAGE4_IR_NO_MIX_SAS_SATA (0x01) @@ -1002,7 +1015,8 @@ U32 Reserved1; /* 0Ch */ U32 DeviceSettings; /* 10h */ U16 NumberOfDevices; /* 14h */ - U16 Reserved2; /* 16h */ + U8 ExpanderSpinup; /* 16h */ + U8 Reserved2; /* 17h */ U16 IOTimeoutBlockDevicesNonRM; /* 18h */ U16 IOTimeoutSequential; /* 1Ah */ U16 IOTimeoutOther; /* 1Ch */ @@ -1010,7 +1024,7 @@ } CONFIG_PAGE_BIOS_1, MPI_POINTER PTR_CONFIG_PAGE_BIOS_1, BIOSPage1_t, MPI_POINTER pBIOSPage1_t; -#define MPI_BIOSPAGE1_PAGEVERSION (0x02) +#define MPI_BIOSPAGE1_PAGEVERSION (0x03) /* values for the BiosOptions field */ #define MPI_BIOSPAGE1_OPTIONS_SPI_ENABLE (0x00000400) @@ -1019,8 +1033,15 @@ #define MPI_BIOSPAGE1_OPTIONS_DISABLE_BIOS (0x00000001) /* values for the IOCSettings field */ +#define MPI_BIOSPAGE1_IOCSET_MASK_INITIAL_SPINUP_DELAY (0x0F000000) +#define MPI_BIOSPAGE1_IOCSET_SHIFT_INITIAL_SPINUP_DELAY (24) + #define MPI_BIOSPAGE1_IOCSET_MASK_PORT_ENABLE_DELAY (0x00F00000) #define MPI_BIOSPAGE1_IOCSET_SHIFT_PORT_ENABLE_DELAY (20) + +#define MPI_BIOSPAGE1_IOCSET_AUTO_PORT_ENABLE (0x00080000) +#define MPI_BIOSPAGE1_IOCSET_DIRECT_ATTACH_SPINUP_MODE (0x00040000) + #define MPI_BIOSPAGE1_IOCSET_MASK_BOOT_PREFERENCE (0x00030000) #define MPI_BIOSPAGE1_IOCSET_ENCLOSURE_SLOT_BOOT (0x00000000) #define MPI_BIOSPAGE1_IOCSET_SAS_ADDRESS_BOOT (0x00010000) @@ -1050,6 +1071,11 @@ #define MPI_BIOSPAGE1_DEVSET_DISABLE_NON_RM_LUN (0x00000002) #define MPI_BIOSPAGE1_DEVSET_DISABLE_OTHER_LUN (0x00000001) +/* defines for the ExpanderSpinup field */ +#define MPI_BIOSPAGE1_EXPSPINUP_MASK_MAX_TARGET (0xF0) +#define MPI_BIOSPAGE1_EXPSPINUP_SHIFT_MAX_TARGET (4) +#define MPI_BIOSPAGE1_EXPSPINUP_MASK_DELAY (0x0F) + typedef struct _MPI_BOOT_DEVICE_ADAPTER_ORDER { U32 Reserved1; /* 00h */ @@ -1267,13 +1293,13 @@ #define MPI_SCSIPORTPAGE0_CAP_SHIFT_MIN_SYNC_PERIOD (8) #define MPI_SCSIPORTPAGE0_CAP_GET_MIN_SYNC_PERIOD(Cap) \ - ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MASK_MIN_SYNC_PERIOD) \ + ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MIN_SYNC_PERIOD_MASK) \ >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MIN_SYNC_PERIOD \ ) #define MPI_SCSIPORTPAGE0_CAP_MAX_SYNC_OFFSET_MASK (0x00FF0000) #define MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET (16) #define MPI_SCSIPORTPAGE0_CAP_GET_MAX_SYNC_OFFSET(Cap) \ - ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MASK_MAX_SYNC_OFFSET) \ + ( ((Cap) & MPI_SCSIPORTPAGE0_CAP_MAX_SYNC_OFFSET_MASK) \ >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET \ ) #define MPI_SCSIPORTPAGE0_CAP_IDP (0x08000000) @@ -2404,7 +2430,7 @@ } CONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1, SasIOUnitPage1_t, MPI_POINTER pSasIOUnitPage1_t; -#define MPI_SASIOUNITPAGE1_PAGEVERSION (0x04) +#define MPI_SASIOUNITPAGE1_PAGEVERSION (0x05) /* values for SAS IO Unit Page 1 ControlFlags */ #define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST (0x8000) @@ -2419,6 +2445,7 @@ #define MPI_SAS_IOUNIT1_CONTROL_DEV_SAS_SUPPORT (0x01) #define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT (0x02) +#define MPI_SAS_IOUNIT1_CONTROL_POSTPONE_SATA_INIT (0x0100) #define MPI_SAS_IOUNIT1_CONTROL_SATA_48BIT_LBA_REQUIRED (0x0080) #define MPI_SAS_IOUNIT1_CONTROL_SATA_SMART_REQUIRED (0x0040) #define MPI_SAS_IOUNIT1_CONTROL_SATA_NCQ_REQUIRED (0x0020) @@ -2803,16 +2830,15 @@ #define MPI_LOG_0_NUM_LOG_ENTRIES (1) #endif -#define MPI_LOG_0_LOG_DATA_LENGTH (20) +#define MPI_LOG_0_LOG_DATA_LENGTH (0x1C) typedef struct _MPI_LOG_0_ENTRY { - U64 WWID; /* 00h */ - U32 TimeStamp; /* 08h */ - U32 Reserved1; /* 0Ch */ - U16 LogSequence; /* 10h */ - U16 LogEntryQualifier; /* 12h */ - U8 LogData[MPI_LOG_0_LOG_DATA_LENGTH]; /* 14h */ + U32 TimeStamp; /* 00h */ + U32 Reserved1; /* 04h */ + U16 LogSequence; /* 08h */ + U16 LogEntryQualifier; /* 0Ah */ + U8 LogData[MPI_LOG_0_LOG_DATA_LENGTH]; /* 0Ch */ } MPI_LOG_0_ENTRY, MPI_POINTER PTR_MPI_LOG_0_ENTRY, MpiLog0Entry_t, MPI_POINTER pMpiLog0Entry_t; @@ -2831,7 +2857,7 @@ } CONFIG_PAGE_LOG_0, MPI_POINTER PTR_CONFIG_PAGE_LOG_0, LogPage0_t, MPI_POINTER pLogPage0_t; -#define MPI_LOG_0_PAGEVERSION (0x00) +#define MPI_LOG_0_PAGEVERSION (0x01) #endif ==== //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi_ioc.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.7 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_ioc.h,v 1.8 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -34,7 +34,7 @@ * Title: MPI IOC, Port, Event, FW Download, and FW Upload messages * Creation Date: August 11, 2000 * - * mpi_ioc.h Version: 01.05.09 + * mpi_ioc.h Version: 01.05.10 * * Version History * --------------- @@ -111,6 +111,10 @@ * Removed IOCFacts Reply EEDP Capability bit. * 06-24-05 01.05.09 Added 5 new IOCFacts Reply IOCCapabilities bits. * Added Max SATA Targets to SAS Discovery Error event. + * 08-30-05 01.05.10 Added 4 new events and their event data structures. + * Added new ReasonCode value for SAS Device Status Change + * event. + * Added new family code for FC949E. * -------------------------------------------------------------------------- */ @@ -492,6 +496,10 @@ #define MPI_EVENT_PERSISTENT_TABLE_FULL (0x00000011) #define MPI_EVENT_SAS_PHY_LINK_STATUS (0x00000012) #define MPI_EVENT_SAS_DISCOVERY_ERROR (0x00000013) +#define MPI_EVENT_IR_RESYNC_UPDATE (0x00000014) +#define MPI_EVENT_IR2 (0x00000015) +#define MPI_EVENT_SAS_DISCOVERY (0x00000016) +#define MPI_EVENT_LOG_ENTRY_ADDED (0x00000021) /* AckRequired field values */ @@ -508,6 +516,29 @@ } EVENT_DATA_EVENT_CHANGE, MPI_POINTER PTR_EVENT_DATA_EVENT_CHANGE, EventDataEventChange_t, MPI_POINTER pEventDataEventChange_t; +/* LogEntryAdded Event data */ + +/* this structure matches MPI_LOG_0_ENTRY in mpi_cnfg.h */ +#define MPI_EVENT_DATA_LOG_ENTRY_DATA_LENGTH (0x1C) +typedef struct _EVENT_DATA_LOG_ENTRY +{ + U32 TimeStamp; /* 00h */ + U32 Reserved1; /* 04h */ + U16 LogSequence; /* 08h */ + U16 LogEntryQualifier; /* 0Ah */ + U8 LogData[MPI_EVENT_DATA_LOG_ENTRY_DATA_LENGTH]; /* 0Ch */ +} EVENT_DATA_LOG_ENTRY, MPI_POINTER PTR_EVENT_DATA_LOG_ENTRY, + MpiEventDataLogEntry_t, MPI_POINTER pMpiEventDataLogEntry_t; + +typedef struct _EVENT_DATA_LOG_ENTRY_ADDED +{ + U16 LogSequence; /* 00h */ + U16 Reserved1; /* 02h */ + U32 Reserved2; /* 04h */ + EVENT_DATA_LOG_ENTRY LogEntry; /* 08h */ +} EVENT_DATA_LOG_ENTRY_ADDED, MPI_POINTER PTR_EVENT_DATA_LOG_ENTRY_ADDED, + MpiEventDataLogEntryAdded_t, MPI_POINTER pMpiEventDataLogEntryAdded_t; + /* SCSI Event data for Port, Bus and Device forms */ typedef struct _EVENT_DATA_SCSI @@ -566,6 +597,7 @@ #define MPI_EVENT_SAS_DEV_STAT_RC_SMART_DATA (0x05) #define MPI_EVENT_SAS_DEV_STAT_RC_NO_PERSIST_ADDED (0x06) #define MPI_EVENT_SAS_DEV_STAT_RC_UNSUPPORTED (0x07) +#define MPI_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET (0x08) /* SCSI Event data for Queue Full event */ @@ -607,6 +639,79 @@ #define MPI_EVENT_RAID_RC_SMART_DATA (0x0A) #define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED (0x0B) + +/* MPI Integrated RAID Resync Update Event data */ + +typedef struct _MPI_EVENT_DATA_IR_RESYNC_UPDATE +{ + U8 VolumeID; /* 00h */ + U8 VolumeBus; /* 01h */ + U8 ResyncComplete; /* 02h */ + U8 Reserved1; /* 03h */ + U32 Reserved2; /* 04h */ +} MPI_EVENT_DATA_IR_RESYNC_UPDATE, + MPI_POINTER PTR_MPI_EVENT_DATA_IR_RESYNC_UPDATE, + MpiEventDataIrResyncUpdate_t, MPI_POINTER pMpiEventDataIrResyncUpdate_t; + +/* MPI IR2 Event data */ + +/* MPI_LD_STATE or MPI_PD_STATE */ +typedef struct _IR2_STATE_CHANGED +{ + U16 PreviousState; /* 00h */ + U16 NewState; /* 02h */ +} IR2_STATE_CHANGED, MPI_POINTER PTR_IR2_STATE_CHANGED; + +typedef struct _IR2_PD_INFO +{ + U16 DeviceHandle; /* 00h */ + U8 TruncEnclosureHandle; /* 02h */ + U8 TruncatedSlot; /* 03h */ +} IR2_PD_INFO, MPI_POINTER PTR_IR2_PD_INFO; + +typedef union _MPI_IR2_RC_EVENT_DATA +{ + IR2_STATE_CHANGED StateChanged; + U32 Lba; + IR2_PD_INFO PdInfo; +} MPI_IR2_RC_EVENT_DATA, MPI_POINTER PTR_MPI_IR2_RC_EVENT_DATA; + +typedef struct _MPI_EVENT_DATA_IR2 +{ + U8 TargetID; /* 00h */ + U8 Bus; /* 01h */ + U8 ReasonCode; /* 02h */ + U8 PhysDiskNum; /* 03h */ + MPI_IR2_RC_EVENT_DATA IR2EventData; /* 04h */ +} MPI_EVENT_DATA_IR2, MPI_POINTER PTR_MPI_EVENT_DATA_IR2, + MpiEventDataIR2_t, MPI_POINTER pMpiEventDataIR2_t; + +/* MPI IR2 Event data ReasonCode values */ +#define MPI_EVENT_IR2_RC_LD_STATE_CHANGED (0x01) +#define MPI_EVENT_IR2_RC_PD_STATE_CHANGED (0x02) +#define MPI_EVENT_IR2_RC_BAD_BLOCK_TABLE_FULL (0x03) +#define MPI_EVENT_IR2_RC_PD_INSERTED (0x04) +#define MPI_EVENT_IR2_RC_PD_REMOVED (0x05) +#define MPI_EVENT_IR2_RC_FOREIGN_CFG_DETECTED (0x06) +#define MPI_EVENT_IR2_RC_REBUILD_MEDIUM_ERROR (0x07) + +/* defines for logical disk states */ +#define MPI_LD_STATE_OPTIMAL (0x00) +#define MPI_LD_STATE_DEGRADED (0x01) +#define MPI_LD_STATE_FAILED (0x02) +#define MPI_LD_STATE_MISSING (0x03) +#define MPI_LD_STATE_OFFLINE (0x04) + +/* defines for physical disk states */ +#define MPI_PD_STATE_ONLINE (0x00) +#define MPI_PD_STATE_MISSING (0x01) +#define MPI_PD_STATE_NOT_COMPATIBLE (0x02) +#define MPI_PD_STATE_FAILED (0x03) +#define MPI_PD_STATE_INITIALIZING (0x04) +#define MPI_PD_STATE_OFFLINE_AT_HOST_REQUEST (0x05) +#define MPI_PD_STATE_FAILED_AT_HOST_REQUEST (0x06) +#define MPI_PD_STATE_OFFLINE_FOR_ANOTHER_REASON (0xFF) + /* MPI Link Status Change Event data */ typedef struct _EVENT_DATA_LINK_STATUS @@ -688,6 +793,20 @@ #define MPI_EVENT_SAS_PLS_LR_RATE_1_5 (0x08) #define MPI_EVENT_SAS_PLS_LR_RATE_3_0 (0x09) +/* SAS Discovery Event data */ + +typedef struct _EVENT_DATA_SAS_DISCOVERY +{ + U32 DiscoveryStatus; /* 00h */ + U32 Reserved1; /* 04h */ +} EVENT_DATA_SAS_DISCOVERY, MPI_POINTER PTR_EVENT_DATA_SAS_DISCOVERY, + EventDataSasDiscovery_t, MPI_POINTER pEventDataSasDiscovery_t; + +#define MPI_EVENT_SAS_DSCVRY_COMPLETE (0x00000000) +#define MPI_EVENT_SAS_DSCVRY_IN_PROGRESS (0x00000001) +#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK (0xFFFF0000) +#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT (16) + /* SAS Discovery Errror Event data */ typedef struct _EVENT_DATA_DISCOVERY_ERROR @@ -897,6 +1016,7 @@ #define MPI_FW_HEADER_PID_FAMILY_919XL_FC (0x0003) /* 919XL and 929XL */ #define MPI_FW_HEADER_PID_FAMILY_939X_FC (0x0004) /* 939X and 949X */ #define MPI_FW_HEADER_PID_FAMILY_959_FC (0x0005) +#define MPI_FW_HEADER_PID_FAMILY_949E_FC (0x0006) /* SAS */ #define MPI_FW_HEADER_PID_FAMILY_1064_SAS (0x0001) #define MPI_FW_HEADER_PID_FAMILY_1068_SAS (0x0002) ==== //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi_sas.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_sas.h,v 1.1 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_sas.h,v 1.2 2006/02/25 07:45:54 mjacob Exp $ */ /*- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -34,7 +34,7 @@ * Title: MPI Serial Attached SCSI structures and definitions * Creation Date: August 19, 2004 * - * mpi_sas.h Version: 01.05.01 + * mpi_sas.h Version: 01.05.02 * * Version History * --------------- @@ -42,6 +42,9 @@ * Date Version Description * -------- -------- ------------------------------------------------------ * 08-19-04 01.05.01 Original release. + * 08-30-05 01.05.02 Added DeviceInfo bit for SEP. + * Added PrimFlags and Primitive field to SAS IO Unit + * Control request, and added a new operation code. * -------------------------------------------------------------------------- */ @@ -79,6 +82,7 @@ * Values for the SAS DeviceInfo field used in SAS Device Status Change Event * data and SAS IO Unit Configuration pages. */ +#define MPI_SAS_DEVICE_INFO_SEP (0x00004000) #define MPI_SAS_DEVICE_INFO_ATAPI_DEVICE (0x00002000) #define MPI_SAS_DEVICE_INFO_LSI_DEVICE (0x00001000) #define MPI_SAS_DEVICE_INFO_DIRECT_ATTACH (0x00000800) @@ -240,10 +244,10 @@ U8 TargetID; /* 0Ch */ U8 Bus; /* 0Dh */ U8 PhyNum; /* 0Eh */ - U8 Reserved4; /* 0Fh */ - U32 Reserved5; /* 10h */ + U8 PrimFlags; /* 0Fh */ + U32 Primitive; /* 10h */ U64 SASAddress; /* 14h */ - U32 Reserved6; /* 1Ch */ + U32 Reserved4; /* 1Ch */ } MSG_SAS_IOUNIT_CONTROL_REQUEST, MPI_POINTER PTR_MSG_SAS_IOUNIT_CONTROL_REQUEST, SasIoUnitControlRequest_t, MPI_POINTER pSasIoUnitControlRequest_t; @@ -254,7 +258,13 @@ #define MPI_SAS_OP_PHY_HARD_RESET (0x07) #define MPI_SAS_OP_PHY_CLEAR_ERROR_LOG (0x08) #define MPI_SAS_OP_MAP_CURRENT (0x09) +#define MPI_SAS_OP_SEND_PRIMITIVE (0x0A) +/* values for the PrimFlags field */ +#define MPI_SAS_PRIMFLAGS_SINGLE (0x08) +#define MPI_SAS_PRIMFLAGS_TRIPLE (0x02) +#define MPI_SAS_PRIMFLAGS_REDUNDANT (0x01) + /* SAS IO Unit Control Reply */ typedef struct _MSG_SAS_IOUNIT_CONTROL_REPLY @@ -274,3 +284,5 @@ SasIoUnitControlReply_t, MPI_POINTER pSasIoUnitControlReply_t; #endif + + ==== //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpilib/mpi_type.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.8 2006/01/21 00:29:51 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.10 2006/02/26 22:50:14 mjacob Exp $ */ /* * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -34,7 +34,7 @@ * Title: MPI Basic type definitions * Creation Date: June 6, 2000 * - * mpi_type.h Version: 01.05.01 + * mpi_type.h Version: 01.05.02 * * Version History * --------------- @@ -48,6 +48,7 @@ * 08-08-01 01.02.01 Original release for v1.2 work. * 05-11-04 01.03.01 Original release for MPI v1.3. * 08-19-04 01.05.01 Original release for MPI v1.5. + * 08-30-05 01.05.02 Added PowerPC option to #ifdef's. * -------------------------------------------------------------------------- */ @@ -71,13 +72,32 @@ * *****************************************************************************/ -typedef int8_t S8; -typedef uint8_t U8; -typedef int16_t S16; -typedef uint16_t U16; +typedef signed char S8; +typedef unsigned char U8; +typedef signed short S16; +typedef unsigned short U16; + +#ifdef __FreeBSD__ + typedef int32_t S32; typedef uint32_t U32; +#else + +#if defined(unix) || defined(__arm) || defined(ALPHA) || defined(__PPC__) || defined(__ppc) + + typedef signed int S32; + typedef unsigned int U32; + +#else + + typedef signed long S32; + typedef unsigned long U32; + +#endif +#endif + + typedef struct _S64 { U32 Low; ==== //depot/projects/kmacy_sun4v/src/sys/dev/mpt/mpt.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Generic routines for LSI '909 FC adapters. + * Generic routines for LSI Fusion adapters. * FreeBSD Version. * * Copyright (c) 2000, 2001 by Greg Ansley @@ -24,15 +24,46 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + */ +/*- + * Copyright (c) 2002, 2006 by Matthew Jacob + * All rights reserved. * - * Additional Copyright (c) 2002 by Matthew Jacob under same license. + * 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 at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon including + * a substantially similar Disclaimer requirement for further binary + * redistribution. + * 3. Neither the names of the above listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT + * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Support from Chris Ellsworth in order to make SAS adapters work + * is gratefully acknowledged. */ -/* +/*- * Copyright (c) 2004, Avid Technology, Inc. and its contributors. * Copyright (c) 2005, WHEEL Sp. z o.o. * Copyright (c) 2004, 2005 Justin T. Gibbs * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: @@ -46,7 +77,7 @@ * 3. Neither the names of the above listed copyright holders nor the names * of any contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 @@ -61,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.15 2006/02/11 01:35:29 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.26 2006/04/11 16:47:30 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -69,6 +100,8 @@ #include #include +#include +#include #include @@ -92,7 +125,7 @@ static int mpt_soft_reset(struct mpt_softc *mpt); static void mpt_hard_reset(struct mpt_softc *mpt); static int mpt_configure_ioc(struct mpt_softc *mpt); -static int mpt_enable_ioc(struct mpt_softc *mpt); +static int mpt_enable_ioc(struct mpt_softc *mpt, int); /************************* Personality Module Support *************************/ /* @@ -119,7 +152,7 @@ } /* - * Used infrequenstly, so no need to optimize like a forward + * Used infrequently, so no need to optimize like a forward * traversal where we use the MAX+1 is guaranteed to be NULL * trick. */ @@ -148,6 +181,7 @@ static mpt_load_handler_t mpt_stdload; static mpt_probe_handler_t mpt_stdprobe; static mpt_attach_handler_t mpt_stdattach; +static mpt_enable_handler_t mpt_stdenable; static mpt_event_handler_t mpt_stdevent; static mpt_reset_handler_t mpt_stdreset; static mpt_shutdown_handler_t mpt_stdshutdown; @@ -158,6 +192,7 @@ .load = mpt_stdload, .probe = mpt_stdprobe, .attach = mpt_stdattach, + .enable = mpt_stdenable, .event = mpt_stdevent, .reset = mpt_stdreset, .shutdown = mpt_stdshutdown, @@ -167,6 +202,7 @@ static mpt_load_handler_t mpt_core_load; static mpt_attach_handler_t mpt_core_attach; +static mpt_enable_handler_t mpt_core_enable; static mpt_reset_handler_t mpt_core_ioc_reset; static mpt_event_handler_t mpt_core_event; static mpt_shutdown_handler_t mpt_core_shutdown; @@ -177,6 +213,7 @@ .name = "mpt_core", .load = mpt_core_load, .attach = mpt_core_attach, + .enable = mpt_core_enable, .event = mpt_core_event, .reset = mpt_core_ioc_reset, .shutdown = mpt_core_shutdown, @@ -195,8 +232,7 @@ DECLARE_MODULE(mpt_core, mpt_core_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mpt_core, 1); -#define MPT_PERS_ATACHED(pers, mpt) \ - ((mpt)->pers_mask & (0x1 << pers->id)) +#define MPT_PERS_ATTACHED(pers, mpt) ((mpt)->mpt_pers_mask & (0x1 << pers->id)) int @@ -243,8 +279,10 @@ } case MOD_SHUTDOWN: break; +#if __FreeBSD_version >= 500000 case MOD_QUIESCE: break; +#endif case MOD_UNLOAD: error = pers->unload(pers); mpt_personalities[pers->id] = NULL; @@ -278,6 +316,13 @@ } int +mpt_stdenable(struct mpt_softc *mpt) +{ + /* Enable is always successfull. */ + return (0); +} + +int mpt_stdevent(struct mpt_softc *mpt, request_t *req, MSG_EVENT_NOTIFY_REPLY *msg) { mpt_lprt(mpt, MPT_PRT_DEBUG, "mpt_stdevent: 0x%x\n", msg->Event & 0xFF); @@ -354,13 +399,14 @@ * that the full table is checked to see if * this handler was previously registered. */ - if (free_cbi == MPT_HANDLER_ID_NONE - && (mpt_reply_handlers[cbi] + if (free_cbi == MPT_HANDLER_ID_NONE && + (mpt_reply_handlers[cbi] == mpt_default_reply_handler)) free_cbi = cbi; } - if (free_cbi == MPT_HANDLER_ID_NONE) + if (free_cbi == MPT_HANDLER_ID_NONE) { return (ENOMEM); + } mpt_reply_handlers[free_cbi] = handler.reply_handler; *phandler_id = MPT_CBI_TO_HID(free_cbi); break; @@ -398,22 +444,23 @@ static int mpt_default_reply_handler(struct mpt_softc *mpt, request_t *req, - MSG_DEFAULT_REPLY *reply_frame) + uint32_t reply_desc, MSG_DEFAULT_REPLY *reply_frame) { - mpt_prt(mpt, "XXXX Default Handler Called. Req %p, Frame %p\n", - req, reply_frame); + mpt_prt(mpt, + "Default Handler Called: req=%p:%u reply_descriptor=%x frame=%p\n", + req, req->serno, reply_desc, reply_frame); if (reply_frame != NULL) mpt_dump_reply_frame(mpt, reply_frame); - mpt_prt(mpt, "XXXX Reply Frame Ignored\n"); + mpt_prt(mpt, "Reply Frame Ignored\n"); return (/*free_reply*/TRUE); } static int mpt_config_reply_handler(struct mpt_softc *mpt, request_t *req, - MSG_DEFAULT_REPLY *reply_frame) + uint32_t reply_desc, MSG_DEFAULT_REPLY *reply_frame) { if (req != NULL) { @@ -430,32 +477,30 @@ req->state &= ~REQ_STATE_QUEUED; req->state |= REQ_STATE_DONE; TAILQ_REMOVE(&mpt->request_pending_list, req, links); - - if ((req->state & REQ_STATE_NEED_WAKEUP) != 0) + if ((req->state & REQ_STATE_NEED_WAKEUP) != 0) { wakeup(req); + } } - return (/*free_reply*/TRUE); + return (TRUE); } static int mpt_handshake_reply_handler(struct mpt_softc *mpt, request_t *req, - MSG_DEFAULT_REPLY *reply_frame) + uint32_t reply_desc, MSG_DEFAULT_REPLY *reply_frame) { /* Nothing to be done. */ - return (/*free_reply*/TRUE); + return (TRUE); } static int mpt_event_reply_handler(struct mpt_softc *mpt, request_t *req, - MSG_DEFAULT_REPLY *reply_frame) + uint32_t reply_desc, MSG_DEFAULT_REPLY *reply_frame) { int free_reply; - if (reply_frame == NULL) { - mpt_prt(mpt, "Event Handler: req %p - Unexpected NULL reply\n"); - return (/*free_reply*/TRUE); - } + KASSERT(reply_frame != NULL, ("null reply in mpt_event_reply_handler")); + KASSERT(req != NULL, ("null request in mpt_event_reply_handler")); free_reply = TRUE; switch (reply_frame->Function) { @@ -471,12 +516,12 @@ handled += pers->event(mpt, req, msg); if (handled == 0 && mpt->mpt_pers_mask == 0) { - mpt_lprt(mpt, MPT_PRT_WARN, + mpt_lprt(mpt, MPT_PRT_INFO, "No Handlers For Any Event Notify Frames. " "Event %#x (ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); } else if (handled == 0) { - mpt_prt(mpt, + mpt_lprt(mpt, MPT_PRT_WARN, "Unhandled Event Notify Frame. Event %#x " "(ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); @@ -487,7 +532,7 @@ uint32_t context; context = htole32(req->index|MPT_REPLY_HANDLER_EVENTS); - ack_req = mpt_get_request(mpt, /*sleep_ok*/FALSE); + ack_req = mpt_get_request(mpt, FALSE); if (ack_req == NULL) { struct mpt_evtf_record *evtf; @@ -498,32 +543,59 @@ break; } mpt_send_event_ack(mpt, ack_req, msg, context); + /* + * Don't check for CONTINUATION_REPLY here + */ + return (free_reply); } break; } case MPI_FUNCTION_PORT_ENABLE: - mpt_lprt(mpt, MPT_PRT_DEBUG, "enable port reply\n"); + mpt_lprt(mpt, MPT_PRT_DEBUG , "enable port reply\n"); break; case MPI_FUNCTION_EVENT_ACK: break; default: - mpt_prt(mpt, "Unknown Event Function: %x\n", + mpt_prt(mpt, "unknown event function: %x\n", reply_frame->Function); break; } - if (req != NULL - && (reply_frame->MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY) == 0) { - - req->state &= ~REQ_STATE_QUEUED; - req->state |= REQ_STATE_DONE; + /* + * I'm not sure that this continuation stuff works as it should. + * + * I've had FC async events occur that free the frame up because + * the continuation bit isn't set, and then additional async events + * then occur using the same context. As you might imagine, this + * leads to Very Bad Thing. + * + * Let's just be safe for now and not free them up until we figure + * out what's actually happening here. + */ +#if 0 + if ((reply_frame->MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY) == 0) { TAILQ_REMOVE(&mpt->request_pending_list, req, links); - - if ((req->state & REQ_STATE_NEED_WAKEUP) != 0) - wakeup(req); - else - mpt_free_request(mpt, req); + mpt_free_request(mpt, req); + mpt_prt(mpt, "event_reply %x for req %p:%u NOT a continuation", + reply_frame->Function, req, req->serno); + if (reply_frame->Function == MPI_FUNCTION_EVENT_NOTIFICATION) { + MSG_EVENT_NOTIFY_REPLY *msg = + (MSG_EVENT_NOTIFY_REPLY *)reply_frame; + mpt_prtc(mpt, " Event=0x%x AckReq=%d", + msg->Event, msg->AckRequired); + } + } else { + mpt_prt(mpt, "event_reply %x for %p:%u IS a continuation", + reply_frame->Function, req, req->serno); + if (reply_frame->Function == MPI_FUNCTION_EVENT_NOTIFICATION) { + MSG_EVENT_NOTIFY_REPLY *msg = + (MSG_EVENT_NOTIFY_REPLY *)reply_frame; + mpt_prtc(mpt, " Event=0x%x AckReq=%d", + msg->Event, msg->AckRequired); + } + mpt_prtc(mpt, "\n"); } +#endif return (free_reply); } @@ -561,10 +633,10 @@ case MPI_EVENT_SAS_DEVICE_STATUS_CHANGE: break; default: - return (/*handled*/0); + return (0); break; } - return (/*handled*/1); + return (1); } static void @@ -574,7 +646,7 @@ MSG_EVENT_ACK *ackp; ackp = (MSG_EVENT_ACK *)ack_req->req_vbuf; - bzero(ackp, sizeof *ackp); + memset(ackp, 0, sizeof (*ackp)); ackp->Function = MPI_FUNCTION_EVENT_ACK; ackp->Event = msg->Event; ackp->EventContext = msg->EventContext; @@ -588,44 +660,137 @@ mpt_intr(void *arg) { struct mpt_softc *mpt; - uint32_t reply_desc; + uint32_t reply_desc; + uint32_t last_reply_desc = MPT_REPLY_EMPTY; + int ntrips = 0; mpt = (struct mpt_softc *)arg; + mpt_lprt(mpt, MPT_PRT_DEBUG2, "enter mpt_intr\n"); while ((reply_desc = mpt_pop_reply_queue(mpt)) != MPT_REPLY_EMPTY) { request_t *req; MSG_DEFAULT_REPLY *reply_frame; uint32_t reply_baddr; + uint32_t ctxt_idx; u_int cb_index; u_int req_index; int free_rf; + if (reply_desc == last_reply_desc) { + mpt_prt(mpt, "debounce reply_desc 0x%x\n", reply_desc); + if (ntrips++ == 1000) { + break; + } + continue; + } + last_reply_desc = reply_desc; + req = NULL; reply_frame = NULL; reply_baddr = 0; if ((reply_desc & MPI_ADDRESS_REPLY_A_BIT) != 0) { u_int offset; - /* * Insure that the reply frame is coherent. */ - reply_baddr = (reply_desc << 1); + reply_baddr = MPT_REPLY_BADDR(reply_desc); offset = reply_baddr - (mpt->reply_phys & 0xFFFFFFFF); - bus_dmamap_sync_range(mpt->reply_dmat, mpt->reply_dmap, - offset, MPT_REPLY_SIZE, - BUS_DMASYNC_POSTREAD); + bus_dmamap_sync_range(mpt->reply_dmat, + mpt->reply_dmap, offset, MPT_REPLY_SIZE, + BUS_DMASYNC_POSTREAD); reply_frame = MPT_REPLY_OTOV(mpt, offset); - reply_desc = le32toh(reply_frame->MsgContext); + ctxt_idx = le32toh(reply_frame->MsgContext); + } else { + uint32_t type; + + type = MPI_GET_CONTEXT_REPLY_TYPE(reply_desc); + ctxt_idx = reply_desc; + mpt_lprt(mpt, MPT_PRT_DEBUG1, "Context Reply: 0x%08x\n", + reply_desc); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 14 15:15:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E35A116A401; Fri, 14 Apr 2006 15:15:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBAE816A403 for ; Fri, 14 Apr 2006 15:15:23 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88E1743D49 for ; Fri, 14 Apr 2006 15:15:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EFFNgs007245 for ; Fri, 14 Apr 2006 15:15:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3EFFNiL007231 for perforce@freebsd.org; Fri, 14 Apr 2006 15:15:23 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Apr 2006 15:15:23 GMT Message-Id: <200604141515.k3EFFNiL007231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 15:15:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=95244 Change 95244 by marcel@marcel_nfs on 2006/04/14 15:14:56 Remove Quatech comment about the SPAD jumper. It only applies to sio(4), because sio(4) tests if there's a scratch pad register in order to distinguish between NS8250 and INS16450. uart(4) doesn't care and leaves the scratch pad alone. While here, add an entry for the Quatech SSCLP-100. Note that the manual states that BAR 1 is being used, which would mean RID 0x14. Use 0x18 for now. I have a DSC-100 coming in soon to verify. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_pci.c#15 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_pci.c#15 (text+ko) ==== @@ -82,13 +82,8 @@ { 0x131f, 0x2000, 0xffff, 0, "Siig - CyberSerial (1-port) 16550", 0x10 }, { 0x131f, 0x2001, 0xffff, 0, "Siig - CyberSerial (1-port) 16650", 0x10 }, { 0x131f, 0x2002, 0xffff, 0, "Siig - CyberSerial (1-port) 16850", 0x10 }, -{ 0x135c, 0x01c0, 0xffff, 0, "Quatech - SSCLP-200/300", 0x18 - /* - * NB: You must mount the "SPAD" jumper to correctly detect - * the FIFO on the UART. Set the options on the jumpers, - * we do not support the extra registers on the Quatech. - */ -}, +{ 0x135c, 0x0180, 0xffff, 0, "Quatech - SSCLP-100", 0x18 }, +{ 0x135c, 0x01c0, 0xffff, 0, "Quatech - SSCLP-200/300", 0x18 }, { 0x135e, 0x7101, 0xffff, 0, "Sealevel Systems - Single Port RS-232/422/485/530", 0x18 }, { 0x1407, 0x0110, 0xffff, 0, "Lava Computer mfg - DSerial-PCI Port A", 0x10 }, { 0x1407, 0x0111, 0xffff, 0, "Lava Computer mfg - DSerial-PCI Port B", 0x10 }, From owner-p4-projects@FreeBSD.ORG Fri Apr 14 18:23:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 042C616A405; Fri, 14 Apr 2006 18:23:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B60F516A404 for ; Fri, 14 Apr 2006 18:23:45 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D6A843D45 for ; Fri, 14 Apr 2006 18:23:45 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EINj6Z023918 for ; Fri, 14 Apr 2006 18:23:45 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3EINgef023883 for perforce@freebsd.org; Fri, 14 Apr 2006 18:23:42 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Apr 2006 18:23:42 GMT Message-Id: <200604141823.k3EINgef023883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 95258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 18:23:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=95258 Change 95258 by jhb@jhb_slimer on 2006/04/14 18:23:32 IFC @95254. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#78 integrate .. //depot/projects/smpng/sys/alpha/include/kdb.h#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/gdb_machdep.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#54 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#42 integrate .. //depot/projects/smpng/sys/amd64/include/gdb_machdep.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/kdb.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#21 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#26 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#14 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#17 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#13 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/smpng/sys/arm/include/asmacros.h#5 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#24 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#16 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#9 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/lib.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/lib.h#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/xmodem.c#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/boot0/xmodem.h#1 branch .. //depot/projects/smpng/sys/boot/arm/at91/inc/AT91RM9200.h#1 branch .. //depot/projects/smpng/sys/boot/forth/beastie.4th#10 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#6 integrate .. //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#16 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/gatea20.c#3 delete .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#12 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/gatea20.c#4 delete .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#35 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#29 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#29 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#29 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#29 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#29 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#29 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#27 integrate .. //depot/projects/smpng/sys/conf/NOTES#116 integrate .. //depot/projects/smpng/sys/conf/files#171 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#27 integrate .. //depot/projects/smpng/sys/conf/options#117 integrate .. //depot/projects/smpng/sys/conf/options.arm#7 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#55 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#90 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#40 integrate .. //depot/projects/smpng/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#26 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#82 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#47 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#58 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#27 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#62 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#34 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#37 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#22 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#40 integrate .. //depot/projects/smpng/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/r300_cmdbuf.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#15 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#12 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#14 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#15 integrate .. //depot/projects/smpng/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/sis_ds.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/sis_ds.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/sis_mm.c#9 integrate .. //depot/projects/smpng/sys/dev/em/LICENSE#4 integrate .. //depot/projects/smpng/sys/dev/em/README#12 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#67 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#17 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#18 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#73 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#16 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_x86.c#5 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#15 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#10 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbb.c#5 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicsmb.c#5 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#30 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#17 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#14 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#12 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#12 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#6 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#57 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#13 integrate .. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#8 integrate .. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#10 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#8 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe.h#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_bfe_ebus.c#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_bfe_macio.c#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_bfe_sbus.c#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_bus.h#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_core.c#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_dev_sab82532.c#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_dev_z8530.c#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_if.m#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#42 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#37 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#16 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus.h#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#11 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_scc.c#1 branch .. //depot/projects/smpng/sys/dev/uart/uart_core.c#12 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_powerpc.c#1 branch .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#11 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#18 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#88 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#32 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#18 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#55 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/smpng/sys/geom/geom.h#45 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#40 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#47 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#34 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#48 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#28 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#13 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#11 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#26 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#13 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#12 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#16 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#10 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#10 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#7 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#12 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#72 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#26 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#106 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#94 integrate .. //depot/projects/smpng/sys/i386/include/kdb.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#56 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#35 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#76 integrate .. //depot/projects/smpng/sys/ia64/include/kdb.h#3 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#96 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#116 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#63 integrate .. //depot/projects/smpng/sys/kern/md5c.c#9 integrate .. //depot/projects/smpng/sys/kern/serdev_if.m#1 branch .. //depot/projects/smpng/sys/kern/subr_kdb.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#152 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#33 integrate .. //depot/projects/smpng/sys/kern/uipc_proto.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#82 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#50 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#74 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#56 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#92 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#35 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#60 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#126 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#104 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#71 integrate .. //depot/projects/smpng/sys/modules/Makefile#120 integrate .. //depot/projects/smpng/sys/modules/ath/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/bce/Makefile#1 branch .. //depot/projects/smpng/sys/modules/scc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/uart/Makefile#9 integrate .. //depot/projects/smpng/sys/net/if_arc.h#9 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#22 integrate .. //depot/projects/smpng/sys/net/if_media.h#18 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#40 integrate .. //depot/projects/smpng/sys/net/raw_cb.c#13 integrate .. //depot/projects/smpng/sys/net/raw_usrreq.c#20 integrate .. //depot/projects/smpng/sys/net/rtsock.c#53 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#25 integrate .. //depot/projects/smpng/sys/netatm/atm_aal5.c#14 integrate .. //depot/projects/smpng/sys/netatm/atm_proto.c#9 integrate .. //depot/projects/smpng/sys/netatm/atm_socket.c#17 integrate .. //depot/projects/smpng/sys/netatm/atm_usrreq.c#16 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#16 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#17 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#16 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#15 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#36 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#60 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#40 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#46 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#55 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#84 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#17 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#77 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#28 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#47 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#42 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#65 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#9 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#40 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#12 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#25 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#38 integrate .. //depot/projects/smpng/sys/netinet6/udp6_output.c#19 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#36 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#14 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#9 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#12 integrate .. //depot/projects/smpng/sys/netipsec/xform.h#3 integrate .. //depot/projects/smpng/sys/netipsec/xform_ah.c#8 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#9 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#11 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#23 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#26 integrate .. //depot/projects/smpng/sys/netkey/keysock.c#25 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#26 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#45 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#53 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#58 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#16 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#46 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#27 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#29 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#14 integrate .. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#10 integrate .. //depot/projects/smpng/sys/posix4/ksched.c#15 integrate .. //depot/projects/smpng/sys/posix4/p1003_1b.c#11 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#33 integrate .. //depot/projects/smpng/sys/powerpc/include/bus.h#18 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#11 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#65 integrate .. //depot/projects/smpng/sys/sparc64/include/asi.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/kdb.h#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#80 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#28 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#63 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#66 integrate .. //depot/projects/smpng/sys/sys/ata.h#26 integrate .. //depot/projects/smpng/sys/sys/buf.h#43 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#29 integrate .. //depot/projects/smpng/sys/sys/gmon.h#5 integrate .. //depot/projects/smpng/sys/sys/mac.h#35 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#35 integrate .. //depot/projects/smpng/sys/sys/mount.h#52 integrate .. //depot/projects/smpng/sys/sys/protosw.h#17 integrate .. //depot/projects/smpng/sys/sys/serial.h#3 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#50 integrate .. //depot/projects/smpng/sys/sys/sx.h#18 integrate .. //depot/projects/smpng/sys/sys/umtx.h#15 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#58 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#54 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#83 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#16 integrate .. //depot/projects/smpng/sys/vm/pmap.h#29 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#62 integrate .. //depot/projects/smpng/sys/vm/swap_pager.h#15 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#78 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.189 2006/04/12 04:22:50 alc Exp $"); #include #include @@ -700,21 +700,6 @@ * Low level helper routines..... ***************************************************/ - - -/* - * this routine defines the region(s) of memory that should - * not be tested for the modified bit. - */ -static PMAP_INLINE int -pmap_track_modified(vm_offset_t va) -{ - if ((va < kmi.clean_sva) || (va >= kmi.clean_eva)) - return 1; - else - return 0; -} - /* * Routine: pmap_extract * Function: @@ -1350,10 +1335,8 @@ ("get_pv_entry: wired pte %#lx", tpte)); if ((tpte & PG_FOR) == 0) vm_page_flag_set(m, PG_REFERENCED); - if ((tpte & PG_FOW) == 0) { - if (pmap_track_modified(va)) - vm_page_dirty(m); - } + if ((tpte & PG_FOW) == 0) + vm_page_dirty(m); pmap_invalidate_page(pmap, va); TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -1453,10 +1436,8 @@ pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(pmap_pte_pa(&oldpte)); - if ((oldpte & PG_FOW) == 0) { - if (pmap_track_modified(va)) - vm_page_dirty(m); - } + if ((oldpte & PG_FOW) == 0) + vm_page_dirty(m); if ((oldpte & PG_FOR) == 0) vm_page_flag_set(m, PG_REFERENCED); return pmap_remove_entry(pmap, m, va); @@ -1585,10 +1566,8 @@ /* * Update the vm_page_t clean and reference bits. */ - if ((tpte & PG_FOW) == 0) { - if (pmap_track_modified(pv->pv_va)) - vm_page_dirty(m); - } + if ((tpte & PG_FOW) == 0) + vm_page_dirty(m); if ((tpte & PG_FOR) == 0) vm_page_flag_set(m, PG_REFERENCED); @@ -1670,8 +1649,7 @@ if ((oldpte & PG_FOW) == 0) { if (m == NULL) m = PHYS_TO_VM_PAGE(pmap_pte_pa(pte)); - if (pmap_track_modified(sva)) - vm_page_dirty(m); + vm_page_dirty(m); oldpte |= PG_FOW; } oldpte = (oldpte & ~PG_PROT) | newprot; @@ -1767,8 +1745,7 @@ * so we go ahead and sense modify status. */ if (origpte & PG_MANAGED) { - if ((origpte & PG_FOW) != PG_FOW - && pmap_track_modified(va)) + if ((origpte & PG_FOW) != PG_FOW) vm_page_dirty(m); } @@ -1792,6 +1769,8 @@ * called at interrupt time. */ if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva, + ("pmap_enter: managed mapping within the clean submap")); pmap_insert_entry(pmap, va, mpte, m); managed |= PG_MANAGED; } @@ -1854,6 +1833,9 @@ register pt_entry_t *pte; int managed; + KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || + (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, + ("pmap_enter_quick: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); PMAP_LOCK(pmap); @@ -2129,9 +2111,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2150,11 +2130,6 @@ pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else @@ -2179,8 +2154,7 @@ pmap->pm_stats.resident_count--; if ((tpte & PG_FOW) == 0) - if (pmap_track_modified(pv->pv_va)) - vm_page_dirty(m); + vm_page_dirty(m); npv = TAILQ_NEXT(pv, pv_plist); TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); @@ -2220,14 +2194,6 @@ * setting RO do we need to clear the VAC? */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - /* - * don't write protect pager mappings - */ - if (!setem && bit == (PG_UWE|PG_KWE)) { - if (!pmap_track_modified(pv->pv_va)) - continue; - } - PMAP_LOCK(pv->pv_pmap); pte = pmap_lev3pte(pv->pv_pmap, pv->pv_va); ==== //depot/projects/smpng/sys/alpha/include/kdb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.2 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/kdb.h,v 1.3 2006/04/03 22:51:46 marcel Exp $ */ #ifndef _MACHINE_KDB_H_ @@ -31,6 +31,8 @@ #include +#define KDB_STOPPEDPCB(pc) &stoppcbs[pc->pc_cpuid] + static __inline void kdb_cpu_clear_singlestep(void) { ==== //depot/projects/smpng/sys/amd64/amd64/gdb_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.5 2005/09/27 21:10:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.6 2006/04/04 03:00:20 marcel Exp $"); #include #include @@ -91,3 +91,27 @@ kdb_frame->tf_rip = *(register_t *)val; } } + +int +gdb_cpu_signal(int type, int code) +{ + + switch (type & ~T_USER) { + case 0: return (SIGFPE); /* Divide by zero. */ + case 1: return (SIGTRAP); /* Debug exception. */ + case 3: return (SIGTRAP); /* Breakpoint. */ + case 4: return (SIGSEGV); /* into instr. (overflow). */ + case 5: return (SIGURG); /* bound instruction. */ + case 6: return (SIGILL); /* Invalid opcode. */ + case 7: return (SIGFPE); /* Coprocessor not present. */ + case 8: return (SIGEMT); /* Double fault. */ + case 9: return (SIGSEGV); /* Coprocessor segment overrun. */ + case 10: return (SIGTRAP); /* Invalid TSS (also single-step). */ + case 11: return (SIGSEGV); /* Segment not present. */ + case 12: return (SIGSEGV); /* Stack exception. */ + case 13: return (SIGSEGV); /* General protection. */ + case 14: return (SIGSEGV); /* Page fault. */ + case 16: return (SIGEMT); /* Coprocessor error. */ + } + return (SIGEMT); +} ==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -89,6 +89,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -207,9 +208,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -226,9 +225,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -313,6 +310,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#54 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.539 2006/03/21 18:07:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $"); /* * Manages physical address maps. @@ -106,6 +106,7 @@ */ #include "opt_msgbuf.h" +#include "opt_pmap.h" #include #include @@ -158,6 +159,13 @@ #define PMAP_INLINE #endif +#define PV_STATS +#ifdef PV_STATS +#define PV_STAT(x) do { x ; } while (0) +#else +#define PV_STAT(x) do { } while (0) +#endif + struct pmap kernel_pmap_store; vm_paddr_t avail_start; /* PA of first available physical page */ @@ -182,7 +190,6 @@ /* * Data for the pv entry allocation mechanism */ -static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int shpgperproc = PMAP_SHPGPERPROC; @@ -198,8 +205,8 @@ */ static caddr_t crashdumpmap; -static PMAP_INLINE void free_pv_entry(pv_entry_t pv); -static pv_entry_t get_pv_entry(pmap_t locked_pmap); +static void free_pv_entry(pmap_t pmap, pv_entry_t pv); +static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -208,6 +215,8 @@ static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); +static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, + vm_page_t m); static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, int flags); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); @@ -509,7 +518,7 @@ PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); kernel_pmap->pm_active = -1; /* don't allow deactivation */ - TAILQ_INIT(&kernel_pmap->pm_pvlist); + TAILQ_INIT(&kernel_pmap->pm_pvchunk); nkpt = NKPT; /* @@ -569,8 +578,6 @@ * high water mark so that the system can recover from excessive * numbers of pv entries. */ - pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); @@ -613,20 +620,6 @@ * Low level helper routines..... ***************************************************/ - -/* - * this routine defines the region(s) of memory that should - * not be tested for the modified bit. - */ -static PMAP_INLINE int -pmap_track_modified(vm_offset_t va) -{ - if ((va < kmi.clean_sva) || (va >= kmi.clean_eva)) - return 1; - else - return 0; -} - #ifdef SMP /* * For SMP, these functions have to use the IPI mechanism for coherence. @@ -1063,7 +1056,7 @@ PMAP_LOCK_INIT(pmap); pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + KPML4phys); pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1100,7 +1093,7 @@ pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | PG_V | PG_RW | PG_A | PG_M; pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); + TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } @@ -1437,61 +1430,79 @@ * page management routines. ***************************************************/ -/* - * free the pv_entry back to the free list - */ -static PMAP_INLINE void -free_pv_entry(pv_entry_t pv) +CTASSERT(sizeof(struct pv_chunk) == PAGE_SIZE); +CTASSERT(_NPCM == 3); +CTASSERT(_NPCPV == 168); + +static __inline struct pv_chunk * +pv_to_chunk(pv_entry_t pv) { - pv_entry_count--; - uma_zfree(pvzone, pv); + + return (struct pv_chunk *)((uintptr_t)pv & ~(uintptr_t)PAGE_MASK); } +#define PV_PMAP(pv) (pv_to_chunk(pv)->pc_pmap) + +#define PC_FREE0 0xfffffffffffffffful +#define PC_FREE1 0xfffffffffffffffful +#define PC_FREE2 0x000000fffffffffful + +static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; + +#ifdef PV_STATS +static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_count, CTLFLAG_RD, &pc_chunk_count, 0, + "Current number of pv entry chunks"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_allocs, CTLFLAG_RD, &pc_chunk_allocs, 0, + "Current number of pv entry chunks allocated"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_frees, CTLFLAG_RD, &pc_chunk_frees, 0, + "Current number of pv entry chunks frees"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_tryfail, CTLFLAG_RD, &pc_chunk_tryfail, 0, + "Number of times tried to get a chunk page but failed."); + +static long pv_entry_frees, pv_entry_allocs; +static int pv_entry_spare; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, + "Current number of pv entries"); +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0, + "Current number of pv entry frees"); +SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0, + "Current number of pv entry allocs"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_spare, CTLFLAG_RD, &pv_entry_spare, 0, + "Current number of spare pv entries"); + +static int pmap_collect_inactive, pmap_collect_active; + +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_inactive, CTLFLAG_RD, &pmap_collect_inactive, 0, + "Current number times pmap_collect called on inactive queue"); +SYSCTL_INT(_vm_pmap, OID_AUTO, pmap_collect_active, CTLFLAG_RD, &pmap_collect_active, 0, + "Current number times pmap_collect called on active queue"); +#endif + /* - * get a new pv_entry, allocating a block from the system - * when needed. + * We are in a serious low memory condition. Resort to + * drastic measures to free some pages so we can allocate + * another pv entry chunk. This is normally called to + * unmap inactive pages, and if necessary, active pages. */ -static pv_entry_t -get_pv_entry(pmap_t locked_pmap) +static void +pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) { - static const struct timeval printinterval = { 60, 0 }; - static struct timeval lastprint; - struct vpgqueues *vpq; pd_entry_t ptepde; pmap_t pmap; pt_entry_t *pte, tpte; - pv_entry_t allocated_pv, next_pv, pv; + pv_entry_t next_pv, pv; vm_offset_t va; vm_page_t m; - PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - allocated_pv = uma_zalloc(pvzone, M_NOWAIT); - if (allocated_pv != NULL) { - pv_entry_count++; - if (pv_entry_count > pv_entry_high_water) - pagedaemon_wakeup(); - else - return (allocated_pv); - } - - /* - * Reclaim pv entries: At first, destroy mappings to inactive - * pages. After that, if a pv entry is still needed, destroy - * mappings to active pages. - */ - if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, consider " - "increasing sysctl vm.pmap.shpgperproc or " - "vm.pmap.pv_entry_max\n"); - vpq = &vm_page_queues[PQ_INACTIVE]; -retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; - pmap = pv->pv_pmap; + pmap = PV_PMAP(pv); /* Avoid deadlock and lock recursion. */ if (pmap > locked_pmap) PMAP_LOCK(pmap); @@ -1501,18 +1512,16 @@ pte = pmap_pte_pde(pmap, va, &ptepde); tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, - ("get_pv_entry: wired pte %#lx", tpte)); + ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); if (tpte & PG_M) { KASSERT((tpte & PG_RW), - ("get_pv_entry: modified page not writable: va: %#lx, pte: %#lx", + ("pmap_collect: modified page not writable: va: %#lx, pte: %#lx", va, tpte)); - if (pmap_track_modified(va)) - vm_page_dirty(m); + vm_page_dirty(m); } pmap_invalidate_page(pmap, va); - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); @@ -1520,20 +1529,130 @@ pmap_unuse_pt(pmap, va, ptepde); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); - if (allocated_pv == NULL) - allocated_pv = pv; - else - free_pv_entry(pv); + free_pv_entry(locked_pmap, pv); + } + } +} + + +/* + * free the pv_entry back to the free list + */ +static void +free_pv_entry(pmap_t pmap, pv_entry_t pv) +{ + vm_page_t m; + struct pv_chunk *pc; + int idx, field, bit; + + PV_STAT(pv_entry_frees++); + PV_STAT(pv_entry_spare++); + PV_STAT(pv_entry_count--); + pc = pv_to_chunk(pv); + idx = pv - &pc->pc_pventry[0]; + field = idx / 64; + bit = idx % 64; + pc->pc_map[field] |= 1ul << bit; + /* move to head of list */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || + pc->pc_map[2] != PC_FREE2) + return; + PV_STAT(pv_entry_spare -= _NPCPV); + PV_STAT(pc_chunk_count--); + PV_STAT(pc_chunk_frees++); + /* entire chunk is free, return it */ + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); +} + +/* + * get a new pv_entry, allocating a block from the system + * when needed. + */ +static pv_entry_t +get_pv_entry(pmap_t pmap, int try) +{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + static vm_pindex_t colour; + int bit, field; + pv_entry_t pv; + struct pv_chunk *pc; + vm_page_t m; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PV_STAT(pv_entry_allocs++); + PV_STAT(pv_entry_count++); + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + pc = TAILQ_FIRST(&pmap->pm_pvchunk); + if (pc != NULL) { + for (field = 0; field < _NPCM; field++) { + if (pc->pc_map[field]) { + bit = bsfq(pc->pc_map[field]); + break; + } + } + if (field < _NPCM) { + pv = &pc->pc_pventry[field * 64 + bit]; + pc->pc_map[field] &= ~(1ul << bit); + /* If this was the last item, move it to tail */ + if (pc->pc_map[0] == 0 && pc->pc_map[1] == 0 && + pc->pc_map[2] == 0) { + TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); + TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); + } + PV_STAT(pv_entry_spare--); + return (pv); } } - if (allocated_pv == NULL) { - if (vpq == &vm_page_queues[PQ_INACTIVE]) { - vpq = &vm_page_queues[PQ_ACTIVE]; - goto retry; + /* No free items, allocate another chunk */ + m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + if (try) { + PV_STAT(pc_chunk_tryfail++); + return (NULL); + } + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv chunk entry is still needed, + * destroy mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, consider " + "increasing sysctl vm.pmap.shpgperproc or " + "vm.pmap.pv_entry_max\n"); + PV_STAT(pmap_collect_inactive++); + pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) { + PV_STAT(pmap_collect_active++); + pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); + m = vm_page_alloc(NULL, colour, + VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + if (m == NULL) + panic("get_pv_entry: increase vm.pmap.shpgperproc"); } - panic("get_pv_entry: increase the vm.pmap.shpgperproc tunable"); } - return (allocated_pv); + PV_STAT(pc_chunk_count++); + PV_STAT(pc_chunk_allocs++); + colour++; + pc = (void *)PHYS_TO_DMAP(m->phys_addr); + pc->pc_pmap = pmap; + pc->pc_map[0] = PC_FREE0 & ~1ul; /* preallocated bit 0 */ + pc->pc_map[1] = PC_FREE1; + pc->pc_map[2] = PC_FREE2; + pv = &pc->pc_pventry[0]; + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); + PV_STAT(pv_entry_spare += _NPCPV - 1); + return (pv); } static void @@ -1543,24 +1662,16 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (m->md.pv_list_count < pmap->pm_stats.resident_count) { - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pmap == pv->pv_pmap && va == pv->pv_va) - break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 14 20:58:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04E9916A404; Fri, 14 Apr 2006 20:58:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF36516A400 for ; Fri, 14 Apr 2006 20:58:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 851EA43D45 for ; Fri, 14 Apr 2006 20:58:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EKwoWe015892 for ; Fri, 14 Apr 2006 20:58:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3EKwo1g015886 for perforce@freebsd.org; Fri, 14 Apr 2006 20:58:50 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 20:58:50 GMT Message-Id: <200604142058.k3EKwo1g015886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 20:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=95266 Change 95266 by jb@jb_freebsd2 on 2006/04/14 20:58:18 Suck another libelf source file. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getphnum.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 20:59:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCCEA16A405; Fri, 14 Apr 2006 20:59:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CB3D16A401 for ; Fri, 14 Apr 2006 20:59:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 449C443D48 for ; Fri, 14 Apr 2006 20:59:52 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EKxq7D016774 for ; Fri, 14 Apr 2006 20:59:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3EKxpKU016771 for perforce@freebsd.org; Fri, 14 Apr 2006 20:59:51 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 20:59:51 GMT Message-Id: <200604142059.k3EKxpKU016771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 20:59:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=95267 Change 95267 by jb@jb_freebsd2 on 2006/04/14 20:58:57 Suck a couple more Solaris headers. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fasttrap.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:20:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E34D916A403; Fri, 14 Apr 2006 21:20:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8CE016A402 for ; Fri, 14 Apr 2006 21:20:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72EED43D46 for ; Fri, 14 Apr 2006 21:20:17 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELKHRQ032106 for ; Fri, 14 Apr 2006 21:20:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELKHw2032099 for perforce@freebsd.org; Fri, 14 Apr 2006 21:20:17 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Apr 2006 21:20:17 GMT Message-Id: <200604142120.k3ELKHw2032099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:20:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=95268 Change 95268 by marcel@marcel_nfs on 2006/04/14 21:19:25 o puc(4) uses the serdev I/F for efficient interrupt handling. o remove support for sio(4) as it doesn't support the serdev I/F. Affected files ... .. //depot/projects/uart/conf/files#57 edit Differences ... ==== //depot/projects/uart/conf/files#57 (text+ko) ==== @@ -845,7 +845,6 @@ dev/si/si_pci.c optional si pci dev/sio/sio_pccard.c optional sio pccard dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc pci dev/smbus/smb.c optional smb dev/smbus/smbconf.c optional smbus dev/smbus/smbus.c optional smbus @@ -1320,7 +1319,7 @@ kern/md5c.c standard kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule -kern/serdev_if.m optional scc +kern/serdev_if.m optional puc | scc kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:23:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AACBA16A407; Fri, 14 Apr 2006 21:23:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7277C16A405 for ; Fri, 14 Apr 2006 21:23:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29B3743D46 for ; Fri, 14 Apr 2006 21:23:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELNMv4034499 for ; Fri, 14 Apr 2006 21:23:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELNLLc034496 for perforce@freebsd.org; Fri, 14 Apr 2006 21:23:21 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 21:23:21 GMT Message-Id: <200604142123.k3ELNLLc034496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:23:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=95270 Change 95270 by jb@jb_freebsd2 on 2006/04/14 21:22:31 #if another Solarirs-specific header. Affected files ... .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#3 (text) ==== @@ -54,7 +54,9 @@ #include #include +#if defined(sun) #include +#endif #include #include From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:27:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1855016A419; Fri, 14 Apr 2006 21:27:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E886816A417 for ; Fri, 14 Apr 2006 21:27:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98DF943D46 for ; Fri, 14 Apr 2006 21:27:27 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELRRIr034633 for ; Fri, 14 Apr 2006 21:27:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELRRrh034630 for perforce@freebsd.org; Fri, 14 Apr 2006 21:27:27 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 21:27:27 GMT Message-Id: <200604142127.k3ELRRrh034630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:27:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=95271 Change 95271 by jb@jb_freebsd2 on 2006/04/14 21:26:28 Add some experimental (non-POSIX, non-portable) thread functions to check if a mutex or a rwlock is held. Solaris has these in it's non-standard thread implementation and they've implemented DTrace mostly using the non-standard threads, but with some pthreads thrown in... and to make matters worse, even non-POSIX pthread functions. Yuk. Solaris may well be standards compatible from an outside programmer's perspective, but it sure as hell isn't on the inside. Affected files ... .. //depot/projects/dtrace/src/include/pthread_np.h#2 edit .. //depot/projects/dtrace/src/lib/libpthread/pthread.map#2 edit .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex.c#2 edit .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_rwlock.c#2 edit Differences ... ==== //depot/projects/dtrace/src/include/pthread_np.h#2 (text+ko) ==== @@ -49,8 +49,11 @@ int pthread_multi_np(void); int pthread_mutexattr_getkind_np(pthread_mutexattr_t); int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int); +int pthread_mutex_held_np(pthread_mutex_t *); void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); +int pthread_rwlock_rdheld_np(pthread_rwlock_t *); +int pthread_rwlock_wrheld_np(pthread_rwlock_t *); void pthread_set_name_np(pthread_t, const char *); int pthread_single_np(void); void pthread_suspend_all_np(void); ==== //depot/projects/dtrace/src/lib/libpthread/pthread.map#2 (text+ko) ==== @@ -258,6 +258,7 @@ pthread_multi_np; pthread_mutex_destroy; pthread_mutex_getprioceiling; + pthread_mutex_held_np; pthread_mutex_init; pthread_mutex_lock; pthread_mutex_setprioceiling; @@ -280,6 +281,8 @@ pthread_resume_all_np; pthread_resume_np; pthread_rwlock_destroy; + pthread_rwlock_rdheld_np; + pthread_rwlock_wrheld_np; pthread_rwlock_init; pthread_rwlock_rdlock; pthread_rwlock_timedrdlock; ==== //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex.c#2 (text+ko) ==== @@ -1582,6 +1582,12 @@ } } +int +pthread_mutex_held_np(pthread_mutex_t *m) +{ + return((*m)->m_owner == _get_curthread()); +} + /* * This is called by the current thread when it wants to back out of a * mutex_lock in order to run a signal handler. ==== //depot/projects/dtrace/src/lib/libpthread/thread/thr_rwlock.c#2 (text+ko) ==== @@ -436,3 +436,15 @@ { return (rwlock_wrlock_common (rwlock, abstime)); } + +int +pthread_rwlock_rdheld_np(pthread_rwlock_t *rwlock) +{ + return((*rwlock)->state > 0); +} + +int +pthread_rwlock_wrheld_np(pthread_rwlock_t *rwlock) +{ + return((*rwlock)->state < 0); +} From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:28:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15DE416A408; Fri, 14 Apr 2006 21:28:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E963E16A405 for ; Fri, 14 Apr 2006 21:28:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6DE843D45 for ; Fri, 14 Apr 2006 21:28:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELSTJJ034731 for ; Fri, 14 Apr 2006 21:28:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELSTBG034728 for perforce@freebsd.org; Fri, 14 Apr 2006 21:28:29 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 21:28:29 GMT Message-Id: <200604142128.k3ELSTBG034728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:28:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=95272 Change 95272 by jb@jb_freebsd2 on 2006/04/14 21:28:11 Add some more compatibility cruft. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/compat/thread.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/compat/thread.h#2 (text+ko) ==== @@ -30,6 +30,7 @@ #define _OPENSOLARIS_COMPAT_THREAD_H_ #include +#include #include typedef int thread_key_t; @@ -37,4 +38,20 @@ typedef struct pthread_mutex *mutex_t; typedef struct pthread_rwlock *rwlock_t; +#define mutex_lock pthread_mutex_lock +#define mutex_unlock pthread_mutex_unlock +#define mutex_init(_a,_b,_c) pthread_mutex_init(_a,_c) +#define rwlock_init(_a,_b,_c) pthread_rwlock_init(_a,_c) +#define rw_rdlock pthread_rwlock_rdlock +#define rw_wrlock pthread_rwlock_wrlock +#define rw_unlock pthread_rwlock_unlock +#define thr_keycreate pthread_key_create +#define thr_setspecific pthread_setspecific +#define thr_main pthread_main_np +#define _mutex_held(_a) pthread_mutex_held_np(_a) +#define MUTEX_HELD(_a) pthread_mutex_held_np(_a) +#define RW_READ_HELD(_a) pthread_rwlock_rdheld_np(_a) +#define RW_WRITE_HELD(_a) pthread_rwlock_wrheld_np(_a) +#define RW_LOCK_HELD(x) (RW_READ_HELD(x) || RW_WRITE_HELD(x)) + #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:30:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E04716A405; Fri, 14 Apr 2006 21:30:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0C6016A400 for ; Fri, 14 Apr 2006 21:30:33 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E50843D45 for ; Fri, 14 Apr 2006 21:30:33 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELUX3a035211 for ; Fri, 14 Apr 2006 21:30:33 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELUXWX035203 for perforce@freebsd.org; Fri, 14 Apr 2006 21:30:33 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Apr 2006 21:30:33 GMT Message-Id: <200604142130.k3ELUXWX035203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95274 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:30:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=95274 Change 95274 by marcel@marcel_nfs on 2006/04/14 21:30:22 Eliminate the PUC_FASTINTR option. Interrupts will be fast by default. When there's a subordinate driver that's not fast, the interrupt will become MPSAFE. Affected files ... .. //depot/projects/uart/alpha/conf/DEFAULTS#2 edit .. //depot/projects/uart/amd64/conf/DEFAULTS#2 edit .. //depot/projects/uart/conf/NOTES#33 edit .. //depot/projects/uart/conf/options#27 edit .. //depot/projects/uart/i386/conf/DEFAULTS#2 edit .. //depot/projects/uart/ia64/conf/DEFAULTS#2 edit .. //depot/projects/uart/pc98/conf/DEFAULTS#2 edit Differences ... ==== //depot/projects/uart/alpha/conf/DEFAULTS#2 (text+ko) ==== @@ -7,5 +7,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices - -options PUC_FASTINTR ==== //depot/projects/uart/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -11,5 +11,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device - -options PUC_FASTINTR ==== //depot/projects/uart/conf/NOTES#33 (text+ko) ==== @@ -1684,15 +1684,8 @@ device scc # PCI Universal Communications driver -# Supports various single and multi port PCI serial cards. Maybe later -# also the parallel ports on combination serial/parallel cards. New cards -# can be added in src/sys/dev/puc/pucdata.c. -# -# If the PUC_FASTINTR option is used the driver will try to use fast -# interrupts. The card must then be the only user of that interrupt. -# Interrupts cannot be shared when using PUC_FASTINTR. +# Supports various multi port PCI I/O cards. device puc -options PUC_FASTINTR # # Network interfaces: ==== //depot/projects/uart/conf/options#27 (text+ko) ==== @@ -123,7 +123,6 @@ PANIC_REBOOT_WAIT_TIME opt_panic.h PPS_SYNC opt_ntp.h PREEMPTION opt_sched.h -PUC_FASTINTR opt_puc.h QUOTA SCHED_4BSD opt_sched.h SCHED_ULE opt_sched.h ==== //depot/projects/uart/i386/conf/DEFAULTS#2 (text+ko) ==== @@ -14,5 +14,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device - -options PUC_FASTINTR ==== //depot/projects/uart/ia64/conf/DEFAULTS#2 (text+ko) ==== @@ -10,5 +10,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices - -options PUC_FASTINTR ==== //depot/projects/uart/pc98/conf/DEFAULTS#2 (text+ko) ==== @@ -15,5 +15,3 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device - -options PUC_FASTINTR From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:32:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09F1F16A402; Fri, 14 Apr 2006 21:32:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C56D616A400 for ; Fri, 14 Apr 2006 21:32:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BA9143D45 for ; Fri, 14 Apr 2006 21:32:36 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELWa82037113 for ; Fri, 14 Apr 2006 21:32:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELWaPY037110 for perforce@freebsd.org; Fri, 14 Apr 2006 21:32:36 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 21:32:36 GMT Message-Id: <200604142132.k3ELWaPY037110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:32:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=95275 Change 95275 by jb@jb_freebsd2 on 2006/04/14 21:31:55 Add another compatibility header. Solaris internals are coded using non-standard syscalls like stat64 and lseek64. They munge this to make it look to an outside programmer like they're POSIX and SUS compatible via their header files (which we don't use), but internally they are hopelessly non-standard. They *really* don't need to write code like this! Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/compat/unistd.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:34:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25C1616A406; Fri, 14 Apr 2006 21:34:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBDDC16A404 for ; Fri, 14 Apr 2006 21:34:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71BA343D45 for ; Fri, 14 Apr 2006 21:34:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELYdFP038870 for ; Fri, 14 Apr 2006 21:34:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELYd5W038864 for perforce@freebsd.org; Fri, 14 Apr 2006 21:34:39 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 21:34:39 GMT Message-Id: <200604142134.k3ELYd5W038864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:34:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=95276 Change 95276 by jb@jb_freebsd2 on 2006/04/14 21:33:54 More compatibility cruft. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/elf.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/elf.h#2 (text+ko) ==== @@ -95,6 +95,8 @@ #define SHT_LOUSER 0x80000000 #define SHT_HIUSER 0xffffffff +#define PN_XNUM 0xffff /* extended program header index */ + #ifndef EM_AMD64 #define EM_AMD64 62 /* AMDs x86-64 architecture */ #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:34:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72D7316A46A; Fri, 14 Apr 2006 21:34:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3735B16A429 for ; Fri, 14 Apr 2006 21:34:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0EF343D46 for ; Fri, 14 Apr 2006 21:34:39 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELYdh9038879 for ; Fri, 14 Apr 2006 21:34:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELYdaB038873 for perforce@freebsd.org; Fri, 14 Apr 2006 21:34:39 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 21:34:39 GMT Message-Id: <200604142134.k3ELYdaB038873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:34:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=95277 Change 95277 by jb@jb_freebsd2 on 2006/04/14 21:34:37 More compatibility cruft. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/stat.h#2 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/types.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/stat.h#2 (text+ko) ==== @@ -30,5 +30,6 @@ #define _OPENSOLARIS_COMPAT_SYS_STAT_H_ #define stat64 stat +#define fstat64 fstat #endif ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/types.h#2 (text+ko) ==== @@ -40,6 +40,21 @@ typedef u_short ushort_t; typedef u_long ulong_t; +typedef long long longlong_t; +typedef unsigned long long u_longlong_t; + typedef off_t off64_t; +typedef id_t taskid_t; +typedef id_t projid_t; +typedef id_t poolid_t; +typedef id_t zoneid_t; +typedef id_t ctid_t; + +#if defined(__XOPEN_OR_POSIX) +typedef enum { _B_FALSE, _B_TRUE } boolean_t; +#else +typedef enum { B_FALSE, B_TRUE } boolean_t; +#endif /* defined(__XOPEN_OR_POSIX) */ + #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:36:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21DC116A403; Fri, 14 Apr 2006 21:36:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9F2C16A401 for ; Fri, 14 Apr 2006 21:36:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4F9043D46 for ; Fri, 14 Apr 2006 21:36:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELag2g040589 for ; Fri, 14 Apr 2006 21:36:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELag4R040583 for perforce@freebsd.org; Fri, 14 Apr 2006 21:36:42 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 21:36:42 GMT Message-Id: <200604142136.k3ELag4R040583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:36:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=95280 Change 95280 by jb@jb_freebsd2 on 2006/04/14 21:36:40 Define _ELF32 or _ELF64 (which the Solaris code tests for) in terms of our __ELF_WORD_SIZE. I'm trying to use as many of our headers as possible. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#4 (text) ==== @@ -52,6 +52,11 @@ #include #include #include +#if __ELF_WORD_SIZE == 32 +#define _ELF32 +#else +#define _ELF64 +#endif #endif #endif /* _ASM */ From owner-p4-projects@FreeBSD.ORG Fri Apr 14 21:45:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2599416A404; Fri, 14 Apr 2006 21:45:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB0B516A400 for ; Fri, 14 Apr 2006 21:45:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88BC543D46 for ; Fri, 14 Apr 2006 21:45:54 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ELjs5M045769 for ; Fri, 14 Apr 2006 21:45:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ELjsxe045766 for perforce@freebsd.org; Fri, 14 Apr 2006 21:45:54 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Apr 2006 21:45:54 GMT Message-Id: <200604142145.k3ELjsxe045766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 21:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=95282 Change 95282 by marcel@marcel_nfs on 2006/04/14 21:45:12 Add new header for use by subordinate drivers. The header only defines what subordinate drivers need to know. Change the bus protocol to avoid that puc(4) has to hardcode which driver attaches to what type of port. Each Subordinate driver reads the PUC_IVAR_TYPE ivar to obtain the type of port it's being probed for and either accept or reject it. Which driver actually attaches to a particular port is then left to what the respective probe functions return and thus allows for vendor specific drivers. Affected files ... .. //depot/projects/uart/dev/ppc/ppc_puc.c#3 edit .. //depot/projects/uart/dev/puc/puc_bus.h#1 add .. //depot/projects/uart/dev/uart/uart_bus_puc.c#14 edit Differences ... ==== //depot/projects/uart/dev/ppc/ppc_puc.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2006 Marcel Moolenaar * Copyright (c) 1997-2000 Nicolas Souchu * Copyright (c) 2001 Alcove - Nicolas Souchu * All rights reserved. @@ -23,11 +24,11 @@ * 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. - * - * $FreeBSD: src/sys/dev/ppc/ppc_puc.c,v 1.2 2004/05/30 20:08:37 phk Exp $ - * */ +#include +__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc_puc.c,v 1.2 2004/05/30 20:08:37 phk Exp $"); + #include #include #include @@ -35,6 +36,8 @@ #include +#include + #include #include #include @@ -74,9 +77,17 @@ }; static int -ppc_puc_probe(dev) - device_t dev; +ppc_puc_probe(device_t dev) { + device_t parent; + uintptr_t type; + + parent = device_get_parent(dev); + if (BUS_READ_IVAR(parent, dev, PUC_IVAR_TYPE, &type)) + return (ENXIO); + if (type != PUC_TYPE_PARALLEL) + return (ENXIO); + device_set_desc(dev, "Parallel port"); return (ppc_probe(dev)); } ==== //depot/projects/uart/dev/uart/uart_bus_puc.c#14 (text+ko) ==== @@ -33,16 +33,13 @@ #include #include #include + #include #include #include -#include -#include +#include -#include -#include - #include #include @@ -70,14 +67,19 @@ { device_t parent; struct uart_softc *sc; - uintptr_t rclk; + uintptr_t rclk, type; parent = device_get_parent(dev); sc = device_get_softc(dev); + if (BUS_READ_IVAR(parent, dev, PUC_IVAR_TYPE, &type)) + return (ENXIO); + if (type != PUC_TYPE_SERIAL) + return (ENXIO); + sc->sc_class = &uart_ns8250_class; - if (BUS_READ_IVAR(parent, dev, PUC_IVAR_FREQ, &rclk)) + if (BUS_READ_IVAR(parent, dev, PUC_IVAR_CLOCK, &rclk)) rclk = 0; return (uart_bus_probe(dev, 0, rclk, 0, 0)); } From owner-p4-projects@FreeBSD.ORG Fri Apr 14 22:00:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AE5F16A406; Fri, 14 Apr 2006 22:00:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28BA516A404 for ; Fri, 14 Apr 2006 22:00:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A916743D45 for ; Fri, 14 Apr 2006 22:00:12 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EM0CKb053869 for ; Fri, 14 Apr 2006 22:00:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3EM0CGW053866 for perforce@freebsd.org; Fri, 14 Apr 2006 22:00:12 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 22:00:12 GMT Message-Id: <200604142200.k3EM0CGW053866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 22:00:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=95284 Change 95284 by jb@jb_freebsd2 on 2006/04/14 22:00:11 Include a compatibility header. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#2 (text) ==== @@ -35,6 +35,9 @@ #endif #include #include +#if !defined(sun) +#include +#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Apr 14 22:40:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 781D116A404; Fri, 14 Apr 2006 22:40:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3974B16A400 for ; Fri, 14 Apr 2006 22:40:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9B8D43D48 for ; Fri, 14 Apr 2006 22:40:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EMe0EC076662 for ; Fri, 14 Apr 2006 22:40:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3EMe0kp076659 for perforce@freebsd.org; Fri, 14 Apr 2006 22:40:00 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 22:40:00 GMT Message-Id: <200604142240.k3EMe0kp076659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 22:40:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=95285 Change 95285 by jb@jb_freebsd2 on 2006/04/14 22:39:13 The newest CLOCK_ defines in sys/time.h are supposed to be in time.h too, otherwise they can't be accessed in an code which happens to include time.h first. Affected files ... .. //depot/projects/dtrace/src/include/time.h#2 edit Differences ... ==== //depot/projects/dtrace/src/include/time.h#2 (text+ko) ==== @@ -100,6 +100,14 @@ #define CLOCK_PROF 2 #endif #define CLOCK_MONOTONIC 4 +#define CLOCK_UPTIME 5 /* FreeBSD-specific. */ +#define CLOCK_UPTIME_PRECISE 7 /* FreeBSD-specific. */ +#define CLOCK_UPTIME_FAST 8 /* FreeBSD-specific. */ +#define CLOCK_REALTIME_PRECISE 9 /* FreeBSD-specific. */ +#define CLOCK_REALTIME_FAST 10 /* FreeBSD-specific. */ +#define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */ +#define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */ +#define CLOCK_SECOND 13 /* FreeBSD-specific. */ #endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */ #if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 From owner-p4-projects@FreeBSD.ORG Fri Apr 14 22:42:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8705216A407; Fri, 14 Apr 2006 22:42:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D20D16A403 for ; Fri, 14 Apr 2006 22:42:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E52F243D49 for ; Fri, 14 Apr 2006 22:42:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EMg36I078459 for ; Fri, 14 Apr 2006 22:42:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3EMg31p078456 for perforce@freebsd.org; Fri, 14 Apr 2006 22:42:03 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 22:42:03 GMT Message-Id: <200604142242.k3EMg31p078456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 22:42:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=95286 Change 95286 by jb@jb_freebsd2 on 2006/04/14 22:41:58 Compatibility header for more non-POSIX stuff in Solaris. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/time.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 14 23:16:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A78A16A403; Fri, 14 Apr 2006 23:16:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7BF316A409 for ; Fri, 14 Apr 2006 23:16:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C59843D45 for ; Fri, 14 Apr 2006 23:16:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ENGjL0098128 for ; Fri, 14 Apr 2006 23:16:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ENGjX9098125 for perforce@freebsd.org; Fri, 14 Apr 2006 23:16:45 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 23:16:45 GMT Message-Id: <200604142316.k3ENGjX9098125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 23:16:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=95287 Change 95287 by jb@jb_freebsd2 on 2006/04/14 23:16:26 More compatibility cruft. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/bitmap.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/bitmap.h#2 (text+ko) ==== @@ -56,4 +56,59 @@ #define BT_ULMAXMASK 0xffffffff #endif +/* + * bitmap is a ulong_t *, bitindex an index_t + * + * The macros BT_WIM and BT_BIW internal; there is no need + * for users of this package to use them. + */ + +/* + * word in map + */ +#define BT_WIM(bitmap, bitindex) \ + ((bitmap)[(bitindex) >> BT_ULSHIFT]) +/* + * bit in word + */ +#define BT_BIW(bitindex) \ + (1UL << ((bitindex) & BT_ULMASK)) + +#ifdef _LP64 +#define BT_WIM32(bitmap, bitindex) \ + ((bitmap)[(bitindex) >> BT_ULSHIFT32]) + +#define BT_BIW32(bitindex) \ + (1UL << ((bitindex) & BT_ULMASK32)) +#endif + +/* + * These are public macros + * + * BT_BITOUL == n bits to n ulong_t's + */ +#define BT_BITOUL(nbits) \ + (((nbits) + BT_NBIPUL - 1l) / BT_NBIPUL) +#define BT_SIZEOFMAP(nbits) \ + (BT_BITOUL(nbits) * sizeof (ulong_t)) +#define BT_TEST(bitmap, bitindex) \ + ((BT_WIM((bitmap), (bitindex)) & BT_BIW(bitindex)) ? 1 : 0) +#define BT_SET(bitmap, bitindex) \ + { BT_WIM((bitmap), (bitindex)) |= BT_BIW(bitindex); } +#define BT_CLEAR(bitmap, bitindex) \ + { BT_WIM((bitmap), (bitindex)) &= ~BT_BIW(bitindex); } + +#ifdef _LP64 +#define BT_BITOUL32(nbits) \ + (((nbits) + BT_NBIPUL32 - 1l) / BT_NBIPUL32) +#define BT_SIZEOFMAP32(nbits) \ + (BT_BITOUL32(nbits) * sizeof (uint_t)) +#define BT_TEST32(bitmap, bitindex) \ + ((BT_WIM32((bitmap), (bitindex)) & BT_BIW32(bitindex)) ? 1 : 0) +#define BT_SET32(bitmap, bitindex) \ + { BT_WIM32((bitmap), (bitindex)) |= BT_BIW32(bitindex); } +#define BT_CLEAR32(bitmap, bitindex) \ + { BT_WIM32((bitmap), (bitindex)) &= ~BT_BIW32(bitindex); } +#endif /* _LP64 */ + #endif /* _OPENSOLARIS_COMPAT_SYS_BITMAP_H */ From owner-p4-projects@FreeBSD.ORG Fri Apr 14 23:17:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DB6916A405; Fri, 14 Apr 2006 23:17:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EAA7016A400 for ; Fri, 14 Apr 2006 23:17:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2B0F43D45 for ; Fri, 14 Apr 2006 23:17:47 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ENHlkK098885 for ; Fri, 14 Apr 2006 23:17:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ENHl6Z098879 for perforce@freebsd.org; Fri, 14 Apr 2006 23:17:47 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 23:17:47 GMT Message-Id: <200604142317.k3ENHl6Z098879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 23:17:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=95288 Change 95288 by jb@jb_freebsd2 on 2006/04/14 23:17:01 More compatibility cruft. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/compat/fcntl.h#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/compat/stdio.h#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/compat/unistd.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/compat/unistd.h#2 (text+ko) ==== @@ -31,6 +31,8 @@ #include +#define ftruncate64 ftruncate +#define lseek64 lseek #define pread64 pread #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 14 23:18:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 183E216A409; Fri, 14 Apr 2006 23:18:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EADBE16A405 for ; Fri, 14 Apr 2006 23:18:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 642A143D5E for ; Fri, 14 Apr 2006 23:18:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ENIn3Q099661 for ; Fri, 14 Apr 2006 23:18:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ENInw9099655 for perforce@freebsd.org; Fri, 14 Apr 2006 23:18:49 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 23:18:49 GMT Message-Id: <200604142318.k3ENInw9099655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 23:18:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=95289 Change 95289 by jb@jb_freebsd2 on 2006/04/14 23:18:27 Include another compatibility header. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#3 (text) ==== @@ -35,10 +35,11 @@ #endif #include #include +#include #if !defined(sun) +#include #include #endif -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Apr 14 23:22:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B64C16A403; Fri, 14 Apr 2006 23:22:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E69FB16A401 for ; Fri, 14 Apr 2006 23:22:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B133B43D45 for ; Fri, 14 Apr 2006 23:22:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ENMsub003011 for ; Fri, 14 Apr 2006 23:22:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ENMslt003005 for perforce@freebsd.org; Fri, 14 Apr 2006 23:22:54 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 23:22:54 GMT Message-Id: <200604142322.k3ENMslt003005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 23:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=95290 Change 95290 by jb@jb_freebsd2 on 2006/04/14 23:22:22 Still work in progress. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#2 (text+ko) ==== @@ -5,15 +5,45 @@ LIB= dtrace SHLIB_MAJOR= 1 -SRCS= dt_names.c dt_errtags.c \ - dt_grammar.y dt_cg.c dt_error.c dt_list.c dt_strtab.c \ - dt_handle.c dt_map.c dt_pcb.c dt_program.c dt_as.c dt_work.c \ - dt_buf.c dt_inttab.c dt_pragma.c dt_string.c dt_parser.c \ - dt_decl.c dt_ident.c dt_provider.c dt_dis.c dt_open.c \ - dt_xlator.c dt_cc.c dt_options.c dt_printf.c \ - dt_aggregate.c dt_consume.c dt_subr.c \ - dt_regset.c dt_link.c dt_lex.l gmatch.c -# dt_module.c drti.c dt_proc.c dt_pid.c dt_dof.c +SRCS= drti.c \ + dt_aggregate.c \ + dt_as.c \ + dt_buf.c \ + dt_cc.c \ + dt_cg.c \ + dt_consume.c \ + dt_decl.c \ + dt_dis.c \ + dt_dof.c \ + dt_error.c \ + dt_errtags.c \ + dt_grammar.y \ + dt_handle.c \ + dt_ident.c \ + dt_inttab.c \ + dt_lex.l \ + dt_link.c \ + dt_list.c \ + dt_map.c \ + dt_module.c \ + dt_names.c \ + dt_open.c \ + dt_options.c \ + dt_parser.c \ + dt_pcb.c \ + dt_pid.c \ + dt_pragma.c \ + dt_printf.c \ + dt_proc.c \ + dt_program.c \ + dt_provider.c \ + dt_regset.c \ + dt_string.c \ + dt_strtab.c \ + dt_subr.c \ + dt_work.c \ + dt_xlator.c \ + gmatch.c WARNS?= 0 @@ -29,6 +59,10 @@ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common +.if ${MACHINE_ARCH} == "i386" +CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel +.endif + LFLAGS+=-l YFLAGS+=-d From owner-p4-projects@FreeBSD.ORG Fri Apr 14 23:23:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD2D516A402; Fri, 14 Apr 2006 23:23:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A506816A405 for ; Fri, 14 Apr 2006 23:23:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 718C243D45 for ; Fri, 14 Apr 2006 23:23:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ENNu7B003089 for ; Fri, 14 Apr 2006 23:23:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ENNuAc003086 for perforce@freebsd.org; Fri, 14 Apr 2006 23:23:56 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Apr 2006 23:23:56 GMT Message-Id: <200604142323.k3ENNuAc003086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 23:23:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=95291 Change 95291 by jb@jb_freebsd2 on 2006/04/14 23:23:27 Add a missing source file. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libelf/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libelf/Makefile#2 (text+ko) ==== @@ -13,7 +13,7 @@ data.o end.o fill.o flag.o \ getarhdr.o getarsym.o getbase.o getdata.o \ getehdr.o getident.o getphdr.o getscn.o \ - getshdr.o \ + getphnum.o getshdr.o \ getshnum.o getshstrndx.o \ hash.o input.o kind.o \ ndxscn.o newdata.o newehdr.o newphdr.o \ @@ -39,9 +39,7 @@ .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/libelf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/libelf/misc -# This definition is checked in Sun's code to determine if the 64-bit -# types are defined. FreeBSD always has them. -CFLAGS+= -D_INT64_TYPE +CFLAGS+= -D_LONGLONG_TYPE CFLAGS += -I${.OBJDIR} \ -I${.CURDIR}/../../../contrib \ From owner-p4-projects@FreeBSD.ORG Sat Apr 15 00:08:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDD6B16A408; Sat, 15 Apr 2006 00:08:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8218116A402 for ; Sat, 15 Apr 2006 00:08:51 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49B9443D46 for ; Sat, 15 Apr 2006 00:08:51 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F08pFJ027461 for ; Sat, 15 Apr 2006 00:08:51 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F08pBT027458 for perforce@freebsd.org; Sat, 15 Apr 2006 00:08:51 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Apr 2006 00:08:51 GMT Message-Id: <200604150008.k3F08pBT027458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 00:08:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=95293 Change 95293 by marcel@marcel_nfs on 2006/04/15 00:08:07 Remove the puc(4) specific hacks to rman. I'm going to rewrite puc(4) to use its own rman. Affected files ... .. //depot/projects/uart/kern/subr_rman.c#7 edit .. //depot/projects/uart/sys/rman.h#7 edit Differences ... ==== //depot/projects/uart/kern/subr_rman.c#7 (text+ko) ==== @@ -122,31 +122,6 @@ return (r); } -/* - * XXX: puc.c is a big hack. - * XXX: it should be rewritten to act like a bridge and offer - * XXX: its own resource manager. - * XXX: until somebody has time, help it out with these two functions - */ - -struct resource * -rman_secret_puc_alloc_resource(int malloc_flag) -{ - struct resource_i *r; - - r = int_alloc_resource(malloc_flag); - if (r) - return (&r->r_r); - return (NULL); -} - -void -rman_secret_puc_free_resource(struct resource *r) -{ - - free(r->__r_i, M_RMAN); -} - int rman_init(struct rman *rm) { ==== //depot/projects/uart/sys/rman.h#7 (text+ko) ==== @@ -149,14 +149,6 @@ extern struct rman_head rman_head; -/* - * XXX: puc.c is a big hack. - * XXX: it should be rewritten to act like a bridge and offer - * XXX: its own resource manager. - * XXX: until somebody has time, help it out with these two functions - */ -struct resource *rman_secret_puc_alloc_resource(int malloc_flag); -void rman_secret_puc_free_resource(struct resource *r); #endif /* _KERNEL */ #endif /* !_SYS_RMAN_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Apr 15 00:16:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C1A16A401; Sat, 15 Apr 2006 00:16:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEFB316A402 for ; Sat, 15 Apr 2006 00:16:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A6BD43D45 for ; Sat, 15 Apr 2006 00:16:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F0G0mR032456 for ; Sat, 15 Apr 2006 00:16:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F0G0YL032446 for perforce@freebsd.org; Sat, 15 Apr 2006 00:16:00 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 00:16:00 GMT Message-Id: <200604150016.k3F0G0YL032446@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 00:16:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=95294 Change 95294 by jb@jb_freebsd2 on 2006/04/15 00:15:29 More compatibility cruft. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/compat/unistd.h#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#3 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/elf.h#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/compat/unistd.h#3 (text+ko) ==== @@ -31,6 +31,7 @@ #include +#define fork1 fork #define ftruncate64 ftruncate #define lseek64 lseek #define pread64 pread ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#3 (text) ==== @@ -29,6 +29,8 @@ #if defined(sun) #include +#else +#define P2ROUNDUP(x, align) (-(-(x) & -(align))) #endif #include #include ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/elf.h#3 (text+ko) ==== @@ -177,5 +177,17 @@ } Elf64_Cap; #endif +/* + * The r_info field is composed of two 32-bit components: the symbol + * table index and the relocation type. The relocation type for SPARC V9 + * is further decomposed into an 8-bit type identifier and a 24-bit type + * dependent data field. For the existing Elf32 relocation types, + * that data field is zero. + */ +#define ELF64_R_TYPE_DATA(info) (((Elf64_Xword)(info)<<32)>>40) +#define ELF64_R_TYPE_ID(info) (((Elf64_Xword)(info)<<56)>>56) +#define ELF64_R_TYPE_INFO(data, type) \ + (((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type)) + #endif /* _OPENSOLARIS_COMPAT_SYS_ELF_H */ From owner-p4-projects@FreeBSD.ORG Sat Apr 15 01:06:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B27DA16A405; Sat, 15 Apr 2006 01:06:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 760E616A400 for ; Sat, 15 Apr 2006 01:06:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CF9A43D46 for ; Sat, 15 Apr 2006 01:06:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F162EV068238 for ; Sat, 15 Apr 2006 01:06:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F1615m068235 for perforce@freebsd.org; Sat, 15 Apr 2006 01:06:01 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 01:06:01 GMT Message-Id: <200604150106.k3F1615m068235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 01:06:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=95296 Change 95296 by jb@jb_freebsd2 on 2006/04/15 01:05:31 Sun's DTrace implementation is written using their procfs and libproc. Let's not go that way. We may end up with a libproc for DTrace use, but it won't be implemented using procfs. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/libproc.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 01:42:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCABD16A402; Sat, 15 Apr 2006 01:42:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8331A16A400 for ; Sat, 15 Apr 2006 01:42:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5132043D45 for ; Sat, 15 Apr 2006 01:42:47 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F1glmv089034 for ; Sat, 15 Apr 2006 01:42:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F1glwQ089031 for perforce@freebsd.org; Sat, 15 Apr 2006 01:42:47 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 01:42:47 GMT Message-Id: <200604150142.k3F1glwQ089031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 01:42:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=95298 Change 95298 by jb@jb_freebsd2 on 2006/04/15 01:42:13 Add an inline definition for pthread_cond_reltimedwait_np(). Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/compat/thread.h#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/compat/thread.h#3 (text+ko) ==== @@ -54,4 +54,23 @@ #define RW_WRITE_HELD(_a) pthread_rwlock_wrheld_np(_a) #define RW_LOCK_HELD(x) (RW_READ_HELD(x) || RW_WRITE_HELD(x)) +#define timespecadd(vvp, uvp) \ + do { \ + (vvp)->tv_sec += (uvp)->tv_sec; \ + (vvp)->tv_nsec += (uvp)->tv_nsec; \ + if ((vvp)->tv_nsec >= 1000000000) { \ + (vvp)->tv_sec++; \ + (vvp)->tv_nsec -= 1000000000; \ + } \ + } while (0) + +static __inline int pthread_cond_reltimedwait_np(pthread_cond_t *cvp, + pthread_mutex_t *mp, const struct timespec *reltime) +{ + struct timespec ts; + clock_gettime(CLOCK_REALTIME,&ts); + timespecadd(&ts,reltime); + return(pthread_cond_timedwait(cvp, mp, &ts)); +} + #endif From owner-p4-projects@FreeBSD.ORG Sat Apr 15 01:43:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6272916A402; Sat, 15 Apr 2006 01:43:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4186C16A400 for ; Sat, 15 Apr 2006 01:43:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FB7843D45 for ; Sat, 15 Apr 2006 01:43:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F1hmV7089179 for ; Sat, 15 Apr 2006 01:43:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F1hmFs089176 for perforce@freebsd.org; Sat, 15 Apr 2006 01:43:48 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 01:43:48 GMT Message-Id: <200604150143.k3F1hmFs089176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 01:43:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=95299 Change 95299 by jb@jb_freebsd2 on 2006/04/15 01:43:19 This is just a hack to avoid having to address wide-character support right now. There are bigger fish to fry. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libgen/common/gmatch.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libgen/common/gmatch.c#3 (text) ==== @@ -48,6 +48,11 @@ #include "_range.h" #else /* DOODAD */ static int multibyte = 0; +#define WCHAR_CSMASK 0x30000000 +#define valid_range(c1, c2) \ + (((c1) & WCHAR_CSMASK) == ((c2) & WCHAR_CSMASK) && \ + ((c1) > 0xff || !iscntrl((int)c1)) && ((c2) > 0xff || \ + !iscntrl((int)c2))) #endif #define Popwchar(p, c) \ From owner-p4-projects@FreeBSD.ORG Sat Apr 15 01:58:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7889F16A403; Sat, 15 Apr 2006 01:58:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EADDC16A401; Sat, 15 Apr 2006 01:58:17 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87CFF43D45; Sat, 15 Apr 2006 01:58:17 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 8AC8546C42; Fri, 14 Apr 2006 21:58:14 -0400 (EDT) Date: Sat, 15 Apr 2006 02:58:14 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Birrell In-Reply-To: <200604142240.k3EMe0kp076659@repoman.freebsd.org> Message-ID: <20060415025409.K27251@fledge.watson.org> References: <200604142240.k3EMe0kp076659@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 95285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 01:58:18 -0000 On Fri, 14 Apr 2006, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=95285 > > Change 95285 by jb@jb_freebsd2 on 2006/04/14 22:39:13 > > The newest CLOCK_ defines in sys/time.h are supposed to be in time.h > too, otherwise they can't be accessed in an code which happens to > include time.h first. Hmm. Indeed. And it looks like SUSv3 thinks so too. Could you merge this to CVS when you get a chance? Thanks, Robert N M Watson > > Affected files ... > > .. //depot/projects/dtrace/src/include/time.h#2 edit > > Differences ... > > ==== //depot/projects/dtrace/src/include/time.h#2 (text+ko) ==== > > @@ -100,6 +100,14 @@ > #define CLOCK_PROF 2 > #endif > #define CLOCK_MONOTONIC 4 > +#define CLOCK_UPTIME 5 /* FreeBSD-specific. */ > +#define CLOCK_UPTIME_PRECISE 7 /* FreeBSD-specific. */ > +#define CLOCK_UPTIME_FAST 8 /* FreeBSD-specific. */ > +#define CLOCK_REALTIME_PRECISE 9 /* FreeBSD-specific. */ > +#define CLOCK_REALTIME_FAST 10 /* FreeBSD-specific. */ > +#define CLOCK_MONOTONIC_PRECISE 11 /* FreeBSD-specific. */ > +#define CLOCK_MONOTONIC_FAST 12 /* FreeBSD-specific. */ > +#define CLOCK_SECOND 13 /* FreeBSD-specific. */ > #endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */ > > #if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 > From owner-p4-projects@FreeBSD.ORG Sat Apr 15 02:30:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3002A16A405; Sat, 15 Apr 2006 02:30:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8BEB16A402 for ; Sat, 15 Apr 2006 02:30:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 985ED43D45 for ; Sat, 15 Apr 2006 02:30:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F2Ujfp012509 for ; Sat, 15 Apr 2006 02:30:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F2UjTC012503 for perforce@freebsd.org; Sat, 15 Apr 2006 02:30:45 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 02:30:45 GMT Message-Id: <200604150230.k3F2UjTC012503@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 02:30:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=95300 Change 95300 by jb@jb_freebsd2 on 2006/04/15 02:30:23 Create weak references the FreeBSD way. It looks like gcc on FreeBSD silently ignores #pragma weak. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/begin.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/cntl.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/end.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/error.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/fill.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/flag.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getarhdr.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getarsym.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getbase.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getdata.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getehdr.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getident.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getphdr.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getscn.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getshdr.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/hash.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/kind.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/ndxscn.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newdata.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newphdr.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newscn.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/next.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/nextscn.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rand.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawdata.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawfile.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/strptr.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/xlate.m4#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/begin.c#2 (text) ==== @@ -32,8 +32,14 @@ #pragma ident "@(#)begin.c 1.17 05/06/08 SMI" /* SVr4.0 1.13 */ +#if defined(sun) #pragma weak elf_begin = _elf_begin #pragma weak elf_memory = _elf_memory +#else +#include +__weak_reference(_elf_begin,elf_begin); +__weak_reference(_elf_memory,elf_memory); +#endif #include "syn.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/cntl.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)cntl.c 1.10 05/06/08 SMI" /* SVr4.0 1.4 */ +#if defined(sun) #pragma weak elf_cntl = _elf_cntl - +#else +#include +__weak_reference(_elf_cntl,elf_cntl); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/end.c#2 (text) ==== @@ -31,8 +31,12 @@ #pragma ident "@(#)end.c 1.11 05/06/08 SMI" /* SVr4.0 1.11 */ +#if defined(sun) #pragma weak elf_end = _elf_end - +#else +#include +__weak_reference(_elf_end,elf_end); +#endif #include "syn.h" #include ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/error.c#3 (text) ==== @@ -27,8 +27,14 @@ #pragma ident "@(#)error.c 1.20 05/06/08 SMI" /* SVr4.0 1.16 */ +#if defined(sun) #pragma weak elf_errmsg = _elf_errmsg #pragma weak elf_errno = _elf_errno +#else +#include +__weak_reference(_elf_errmsg,elf_errmsg); +__weak_reference(_elf_errno,elf_errno); +#endif #include "syn.h" #if defined(sun) @@ -64,13 +70,18 @@ NOTE(DATA_READABLE_WITHOUT_LOCK(bufonce)) +#if defined(sun) extern char *_dgettext(const char *, const char *); - +#endif const char * _libelf_msg(Msg mid) { +#ifdef DOODAD return (_dgettext(MSG_ORIG(MSG_SUNW_OST_SGS), MSG_ORIG(mid))); +#else +return NULL; +#endif } @@ -110,7 +121,12 @@ if (keyonce == 0) return (0); +#if defined(sun) (void) thr_getspecific(errkey, (void **)(&rc)); +#else + rc = (intptr_t) pthread_getspecific(errkey); +#endif + return ((int)rc); } @@ -154,7 +170,11 @@ (void) mutex_unlock(&buflock); } +#if defined(sun) (void) thr_getspecific(bufkey, (void **)&buffer); +#else + buffer = (char *) pthread_getspecific(bufkey); +#endif if (!buffer) { if ((buffer = malloc(MAXELFERR)) == 0) ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/fill.c#2 (text) ==== @@ -30,7 +30,12 @@ #pragma ident "@(#)fill.c 1.10 05/06/08 SMI" /* SVr4.0 1.2 */ +#if defined(sun) #pragma weak elf_fill = _elf_fill +#else +#include +__weak_reference(_elf_fill,elf_fill); +#endif #include #include "syn.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/flag.c#2 (text) ==== @@ -30,13 +30,22 @@ #pragma ident "@(#)flag.c 1.10 05/06/08 SMI" /* SVr4.0 1.6 */ +#if defined(sun) #pragma weak elf_flagdata = _elf_flagdata #pragma weak elf_flagehdr = _elf_flagehdr #pragma weak elf_flagelf = _elf_flagelf #pragma weak elf_flagphdr = _elf_flagphdr #pragma weak elf_flagscn = _elf_flagscn #pragma weak elf_flagshdr = _elf_flagshdr - +#else +#include +__weak_reference(_elf_flagdata,elf_flagdata); +__weak_reference(_elf_flagehdr,elf_flagehdr); +__weak_reference(_elf_flagelf,elf_flagelf); +__weak_reference(_elf_flagphdr,elf_flagphdr); +__weak_reference(_elf_flagscn,elf_flagscn); +__weak_reference(_elf_flagshdr,elf_flagshdr); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getarhdr.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)getarhdr.c 1.12 05/06/08 SMI" /* SVr4.0 1.7 */ +#if defined(sun) #pragma weak elf_getarhdr = _elf_getarhdr - +#else +#include +__weak_reference(_elf_getarhdr,elf_getarhdr); +#endif #include #include "syn.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getarsym.c#2 (text) ==== @@ -31,8 +31,12 @@ #pragma ident "@(#)getarsym.c 1.14 05/06/08 SMI" /* SVr4.0 1.6 */ +#if defined(sun) #pragma weak elf_getarsym = _elf_getarsym - +#else +#include +__weak_reference(_elf_getarsym,elf_getarsym); +#endif #include "syn.h" #include ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getbase.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)getbase.c 1.9 05/06/08 SMI" /* SVr4.0 1.6 */ +#if defined(sun) #pragma weak elf_getbase = _elf_getbase - +#else +#include +__weak_reference(_elf_getbase,elf_getbase); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getdata.c#2 (text) ==== @@ -31,8 +31,12 @@ #pragma ident "@(#)getdata.c 1.22 06/03/03 SMI" /* SVr4.0 1.16 */ +#if defined(sun) #pragma weak elf_getdata = _elf_getdata - +#else +#include +__weak_reference(_elf_getdata,elf_getdata); +#endif #include "syn.h" #include ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getehdr.c#2 (text) ==== @@ -32,8 +32,12 @@ #pragma ident "@(#)getehdr.c 1.11 05/06/08 SMI" /* SVr4.0 1.8 */ +#if defined(sun) #pragma weak elf32_getehdr = _elf32_getehdr - +#else +#include +__weak_reference(_elf32_getehdr,elf32_getehdr); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getident.c#2 (text) ==== @@ -29,8 +29,12 @@ #pragma ident "@(#)getident.c 1.9 05/06/08 SMI" /* SVr4.0 1.8 */ +#if defined(sun) #pragma weak elf_getident = _elf_getident - +#else +#include +__weak_reference(_elf_getident,elf_getident); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getphdr.c#2 (text) ==== @@ -31,8 +31,12 @@ #pragma ident "@(#)getphdr.c 1.11 05/06/08 SMI" /* SVr4.0 1.10 */ +#if defined(sun) #pragma weak elf32_getphdr = _elf32_getphdr - +#else +#include +__weak_reference(_elf32_getphdr,elf32_getphdr); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getscn.c#2 (text) ==== @@ -29,8 +29,12 @@ #pragma ident "@(#)getscn.c 1.10 05/06/08 SMI" /* SVr4.0 1.10 */ +#if defined(sun) #pragma weak elf_getscn = _elf_getscn - +#else +#include +__weak_reference(_elf_getscn,elf_getscn); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getshdr.c#2 (text) ==== @@ -29,7 +29,12 @@ #pragma ident "@(#)getshdr.c 1.12 05/06/08 SMI" /* SVr4.0 1.4 */ +#if defined(sun) #pragma weak elf32_getshdr = _elf32_getshdr +#else +#include +__weak_reference(_elf32_getshdr,elf32_getshdr); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/hash.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)hash.c 1.10 05/06/08 SMI" /* SVr4.0 1.4 */ +#if defined(sun) #pragma weak elf_hash = _elf_hash - +#else +#include +__weak_reference(_elf_hash,elf_hash); +#endif #include "syn.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/kind.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)kind.c 1.9 05/06/08 SMI" /* SVr4.0 1.4 */ +#if defined(sun) #pragma weak elf_kind = _elf_kind - +#else +#include +__weak_reference(_elf_kind,elf_kind); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/ndxscn.c#2 (text) ==== @@ -31,8 +31,12 @@ #pragma ident "@(#)ndxscn.c 1.9 05/06/08 SMI" /* SVr4.0 1.2 */ +#if defined(sun) #pragma weak elf_ndxscn = _elf_ndxscn - +#else +#include +__weak_reference(_elf_ndxscn,elf_ndxscn); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newdata.c#2 (text) ==== @@ -31,8 +31,12 @@ #pragma ident "@(#)newdata.c 1.12 05/06/08 SMI" /* SVr4.0 1.2 */ +#if defined(sun) #pragma weak elf_newdata = _elf_newdata - +#else +#include +__weak_reference(_elf_newdata,elf_newdata); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newphdr.c#2 (text) ==== @@ -30,9 +30,14 @@ #pragma ident "@(#)newphdr.c 1.17 05/06/08 SMI" +#if defined(sun) #if !defined(_ELF64) #pragma weak elf32_newphdr = _elf32_newphdr #endif +#else +#include +__weak_reference(_elf32_newphdr,elf32_newphdr); +#endif #include "syn.h" #include ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newscn.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)newscn.c 1.12 05/06/08 SMI" /* SVr4.0 1.4 */ +#if defined(sun) #pragma weak elf_newscn = _elf_newscn - +#else +#include +__weak_reference(_elf_newscn,elf_newscn); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/next.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)next.c 1.9 05/06/08 SMI" /* SVr4.0 1.5 */ +#if defined(sun) #pragma weak elf_next = _elf_next - +#else +#include +__weak_reference(_elf_next,elf_next); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/nextscn.c#2 (text) ==== @@ -31,7 +31,12 @@ #pragma ident "@(#)nextscn.c 1.9 05/06/08 SMI" /* SVr4.0 1.2 */ +#if defined(sun) #pragma weak elf_nextscn = _elf_nextscn +#else +#include +__weak_reference(_elf_nextscn,elf_nextscn); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rand.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)rand.c 1.10 05/06/08 SMI" /* SVr4.0 1.2 */ +#if defined(sun) #pragma weak elf_rand = _elf_rand - +#else +#include +__weak_reference(_elf_rand,elf_rand); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawdata.c#2 (text) ==== @@ -31,8 +31,12 @@ #pragma ident "@(#)rawdata.c 1.12 05/06/08 SMI" /* SVr4.0 1.3 */ +#if defined(sun) #pragma weak elf_rawdata = _elf_rawdata - +#else +#include +__weak_reference(_elf_rawdata,elf_rawdata); +#endif #include "syn.h" #include ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawfile.c#2 (text) ==== @@ -31,8 +31,12 @@ #pragma ident "@(#)rawfile.c 1.9 05/06/08 SMI" /* SVr4.0 1.4 */ +#if defined(sun) #pragma weak elf_rawfile = _elf_rawfile - +#else +#include +__weak_reference(_elf_rawfile,elf_rawfile); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/strptr.c#2 (text) ==== @@ -30,8 +30,12 @@ #pragma ident "@(#)strptr.c 1.11 05/06/08 SMI" /* SVr4.0 1.6 */ +#if defined(sun) #pragma weak elf_strptr = _elf_strptr - +#else +#include +__weak_reference(_elf_strptr,elf_strptr); +#endif #include "syn.h" #include "libelf.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/xlate.m4#2 (text) ==== @@ -26,10 +26,18 @@ #pragma ident "@(#)xlate.m4 1.27 06/03/07 SMI" +#if defined(sun) #pragma weak elf32_fsize = _elf32_fsize #pragma weak elf_version = _elf_version #pragma weak elf32_xlatetof = _elf32_xlatetof #pragma weak elf32_xlatetom = _elf32_xlatetom +#else +#include +__weak_reference(_elf32_fsize,elf32_fsize); +__weak_reference(_elf_version,elf_version); +__weak_reference(_elf32_xlatetof,elf32_xlatetof); +__weak_reference(_elf32_xlatetom,elf32_xlatetom); +#endif #include "syn.h" #include From owner-p4-projects@FreeBSD.ORG Sat Apr 15 02:32:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17BAC16A402; Sat, 15 Apr 2006 02:32:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3C0A16A400 for ; Sat, 15 Apr 2006 02:32:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D3F443D45 for ; Sat, 15 Apr 2006 02:32:48 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F2Wm6P014319 for ; Sat, 15 Apr 2006 02:32:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F2WmIc014313 for perforce@freebsd.org; Sat, 15 Apr 2006 02:32:48 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 02:32:48 GMT Message-Id: <200604150232.k3F2WmIc014313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 02:32:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=95301 Change 95301 by jb@jb_freebsd2 on 2006/04/15 02:32:31 Still work in progress. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 02:40:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41C2816A43A; Sat, 15 Apr 2006 02:40:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1633716A418 for ; Sat, 15 Apr 2006 02:40:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6B8243D46 for ; Sat, 15 Apr 2006 02:40:58 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F2ewYs020589 for ; Sat, 15 Apr 2006 02:40:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F2ewcQ020583 for perforce@freebsd.org; Sat, 15 Apr 2006 02:40:58 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 02:40:58 GMT Message-Id: <200604150240.k3F2ewcQ020583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 02:40:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=95302 Change 95302 by jb@jb_freebsd2 on 2006/04/15 02:40:48 More weak references. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newehdr.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newehdr.c#2 (text) ==== @@ -30,9 +30,14 @@ #pragma ident "@(#)newehdr.c 1.17 05/06/08 SMI" +#if defined(sun) #if !defined(_ELF64) #pragma weak elf32_newehdr = _elf32_newehdr #endif +#else +#include +__weak_reference(_elf32_newehdr,elf32_newehdr); +#endif #include "syn.h" #include ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#3 (text) ==== @@ -30,9 +30,14 @@ #pragma ident "@(#)update.c 1.26 06/03/24 SMI" +#if defined(sun) #if !defined(_ELF64) #pragma weak elf_update = _elf_update #endif +#else +#include +__weak_reference(_elf_update,elf_update); +#endif #include "syn.h" #include From owner-p4-projects@FreeBSD.ORG Sat Apr 15 03:22:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E64CD16A413; Sat, 15 Apr 2006 03:22:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A859F16A415 for ; Sat, 15 Apr 2006 03:22:51 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57B0B43D45 for ; Sat, 15 Apr 2006 03:22:51 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F3MpgM044530 for ; Sat, 15 Apr 2006 03:22:51 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F3Mpcv044521 for perforce@freebsd.org; Sat, 15 Apr 2006 03:22:51 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Apr 2006 03:22:51 GMT Message-Id: <200604150322.k3F3Mpcv044521@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 03:22:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=95306 Change 95306 by marcel@marcel_nfs on 2006/04/15 03:22:49 Rewrite of puc(4): o Card configuration information is queried through puc_query(). This function calls the card specific query function when one has been defined. o Manage our bus space with rman. Not functional yet, but compiles again. Affected files ... .. //depot/projects/uart/conf/files#58 edit .. //depot/projects/uart/dev/puc/puc.c#21 edit .. //depot/projects/uart/dev/puc/puc_bus.h#2 edit .. //depot/projects/uart/dev/puc/puc_cfg.c#1 add .. //depot/projects/uart/dev/puc/puc_cfg.h#1 add .. //depot/projects/uart/dev/puc/puc_pci.c#11 edit .. //depot/projects/uart/dev/puc/pucdata.c#22 edit .. //depot/projects/uart/dev/puc/pucvar.h#18 edit Differences ... ==== //depot/projects/uart/conf/files#58 (text+ko) ==== @@ -806,6 +806,7 @@ dev/pst/pst-pci.c optional pst pci dev/pst/pst-raid.c optional pst dev/puc/puc.c optional puc +dev/puc/puc_cfg.c optional puc dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci dev/puc/pucdata.c optional puc pci ==== //depot/projects/uart/dev/puc/puc.c#21 (text+ko) ==== @@ -1,49 +1,16 @@ -/* $NetBSD: puc.c,v 1.7 2000/07/29 17:43:38 jlam Exp $ */ - /*- - * Copyright (c) 2002 JF Hay. All rights reserved. - * Copyright (c) 2000 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 Marcel Moolenaar + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/*- - * Copyright (c) 1996, 1998, 1999 - * Christopher G. Demetriou. 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christopher G. Demetriou - * for the NetBSD Project. - * 4. 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -60,29 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.46 2006/02/22 17:19:10 jhb Exp $"); -/* - * PCI "universal" communication card device driver, glues com, lpt, - * and similar ports to PCI via bridge chip often much larger than - * the devices being glued. - * - * Author: Christopher G. Demetriou, May 14, 1998 (derived from NetBSD - * sys/dev/pci/pciide.c, revision 1.6). - * - * These devices could be (and some times are) described as - * communications/{serial,parallel}, etc. devices with known - * programming interfaces, but those programming interfaces (in - * particular the BAR assignments for devices, etc.) in fact are not - * particularly well defined. - * - * After I/we have seen more of these devices, it may be possible - * to generalize some of these bits. In particular, devices which - * describe themselves as communications/serial/16[45]50, and - * communications/parallel/??? might be attached via direct - * 'com' and 'lpt' attachments to pci. - */ - -#include "opt_puc.h" - #include #include #include @@ -97,390 +41,234 @@ #include #include -#define PUC_ENTRAILS 1 +#include +#include #include -struct puc_device { - struct resource_list resources; - u_int serialfreq; -}; +devclass_t puc_devclass; +char puc_driver_name[] = "puc"; -static void puc_intr(void *arg); +MALLOC_DEFINE(M_PUC, "PUC", "PUC driver"); -static int puc_find_free_unit(char *); -#ifdef PUC_DEBUG -static void puc_print_resource_list(struct resource_list *); -#endif +static struct puc_bar * +puc_get_bar(struct puc_softc *sc, int rid) +{ + struct puc_bar *bar; + struct rman *rm; + u_long end, start; + int error, i; -devclass_t puc_devclass; + /* Find the BAR entry with the given RID. */ + i = 0; + while (i < PUC_PCI_BARS && sc->sc_bar[i].b_rid != rid) + i++; + if (i < PUC_PCI_BARS) + return (&sc->sc_bar[i]); -static int -puc_port_bar_index(struct puc_softc *sc, int bar) -{ - int i; + /* Not found. If we're looking for an unused entry, return NULL. */ + if (rid == -1) + return (NULL); - for (i = 0; i < PUC_MAX_BAR; i += 1) { - if (!sc->sc_bar_mappings[i].used) - break; - if (sc->sc_bar_mappings[i].bar == bar) - return (i); + /* Get an unused entry for us to fill. */ + bar = puc_get_bar(sc, -1); + if (bar == NULL) + return (NULL); + bar->b_rid = rid; + bar->b_type = SYS_RES_IOPORT; + bar->b_res = bus_alloc_resource_any(sc->sc_dev, bar->b_type, + &bar->b_rid, RF_ACTIVE); + if (bar->b_res == NULL) { + bar->b_rid = rid; + bar->b_type = SYS_RES_MEMORY; + bar->b_res = bus_alloc_resource_any(sc->sc_dev, bar->b_type, + &bar->b_rid, RF_ACTIVE); + if (bar->b_res == NULL) { + bar->b_rid = -1; + return (NULL); + } } - if (i == PUC_MAX_BAR) { - printf("%s: out of bars!\n", __func__); - return (-1); + + /* Update our managed space. */ + rm = (bar->b_type == SYS_RES_IOPORT) ? &sc->sc_ioport : &sc->sc_iomem; + start = rman_get_start(bar->b_res); + end = rman_get_end(bar->b_res); + error = rman_manage_region(rm, start, end); + if (error) { + bus_release_resource(sc->sc_dev, bar->b_type, bar->b_rid, + bar->b_res); + bar->b_res = NULL; + bar->b_rid = -1; + bar = NULL; } - sc->sc_bar_mappings[i].bar = bar; - sc->sc_bar_mappings[i].used = 1; - return (i); + + return (bar); } -static int -puc_probe_ilr(struct puc_softc *sc, struct resource *res) +static void +puc_intr(void *arg) { - u_char t1, t2; - int i; - - switch (sc->sc_desc.ilr_type) { - case PUC_ILR_TYPE_DIGI: - sc->ilr_st = rman_get_bustag(res); - sc->ilr_sh = rman_get_bushandle(res); - for (i = 0; i < 2 && sc->sc_desc.ilr_offset[i] != 0; i++) { - t1 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc.ilr_offset[i]); - t1 = ~t1; - bus_space_write_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc.ilr_offset[i], t1); - t2 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc.ilr_offset[i]); - if (t2 == t1) - return (0); - } - return (1); - - default: - break; - } - return (0); } int -puc_attach(device_t dev, const struct puc_device_description *desc) +puc_attach(device_t dev) { - char *typestr; - int bidx, childunit, i, error, ressz, rid, type; + struct puc_bar *bar; struct puc_softc *sc; - struct puc_device *pdev; - struct resource *res; - struct resource_list_entry *rle; - bus_space_handle_t bh; + struct rman *rm; + intptr_t res; + u_long start; + int error, i, port; - if (desc == NULL) - return (ENXIO); + sc = device_get_softc(dev); - sc = (struct puc_softc *)device_get_softc(dev); - bzero(sc, sizeof(*sc)); - sc->sc_desc = *desc; + for (i = 0; i < PUC_PCI_BARS; i++) + sc->sc_bar[i].b_rid = -1; -#ifdef PUC_DEBUG - bootverbose = 1; + sc->sc_ioport.rm_type = RMAN_ARRAY; + sc->sc_ioport.rm_descr = "I/O port space"; + error = rman_init(&sc->sc_ioport); + if (error) + return (error); + sc->sc_iomem.rm_type = RMAN_ARRAY; + sc->sc_iomem.rm_descr = "Memory mapped I/O space"; + error = rman_init(&sc->sc_iomem); + if (error) { + rman_fini(&sc->sc_ioport); + return (error); + } - printf("puc: name: %s\n", sc->sc_desc.name); -#endif + error = puc_query(sc->sc_cfg, PUC_QUERY_NPORTS, 0, &res); + KASSERT(error == 0, ("%s %d", __func__, __LINE__)); + sc->sc_nports = (int)res; + sc->sc_port = malloc(sc->sc_nports * sizeof(struct puc_port), + M_PUC, M_WAITOK|M_ZERO); - rid = 0; - res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE | RF_SHAREABLE); - if (!res) - return (ENXIO); - - sc->irqres = res; - sc->irqrid = rid; - error = bus_setup_intr(dev, res, INTR_TYPE_TTY | INTR_FAST, - puc_intr, sc, &sc->intr_cookie); - if (error) { - error = bus_setup_intr(dev, res, INTR_TYPE_TTY | INTR_MPSAFE, - puc_intr, sc, &sc->intr_cookie); + for (port = 0; port < sc->sc_nports; port++) { + sc->sc_port[port].p_nr = port + 1; + error = puc_query(sc->sc_cfg, PUC_QUERY_TYPE, port, &res); + if (error) + goto fail; + sc->sc_port[port].p_type = res; + error = puc_query(sc->sc_cfg, PUC_QUERY_RID, port, &res); if (error) - return (error); - } else - sc->fastintr = INTR_FAST; - - rid = 0; - for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { - if (i > 0 && rid == sc->sc_desc.ports[i].bar) - sc->barmuxed = 1; - rid = sc->sc_desc.ports[i].bar; - bidx = puc_port_bar_index(sc, rid); - - if (bidx < 0 || sc->sc_bar_mappings[bidx].res != NULL) - continue; - - type = SYS_RES_IOPORT; - res = bus_alloc_resource_any(dev, type, &rid, RF_ACTIVE); - if (res == NULL) { - type = SYS_RES_MEMORY; - res = bus_alloc_resource_any(dev, type, &rid, - RF_ACTIVE); + goto fail; + bar = puc_get_bar(sc, res); + if (bar == NULL) { + error = ENXIO; + goto fail; } - if (res == NULL) { - device_printf(dev, "could not get resource\n"); - continue; - } - sc->sc_bar_mappings[bidx].type = type; - sc->sc_bar_mappings[bidx].res = res; + sc->sc_port[port].p_bar = bar; + error = puc_query(sc->sc_cfg, PUC_QUERY_OFS, port, &res); + if (error) + goto fail; + start = rman_get_start(bar->b_res) + res; + error = puc_query(sc->sc_cfg, PUC_QUERY_LEN, port, &res); + if (error) + goto fail; - if (sc->sc_desc.ilr_type != PUC_ILR_TYPE_NONE) { - sc->ilr_enabled = puc_probe_ilr(sc, res); - if (sc->ilr_enabled) - device_printf(dev, "ILR enabled\n"); - else - device_printf(dev, "ILR disabled\n"); - } -#ifdef PUC_DEBUG - printf("%s rid %d bst %lx, start %lx, end %lx\n", - (type == SYS_RES_MEMORY) ? "memory" : "port", rid, - (u_long)rman_get_bustag(res), (u_long)rman_get_start(res), - (u_long)rman_get_end(res)); -#endif + rm = (bar->b_type == SYS_RES_IOPORT) + ? &sc->sc_ioport: &sc->sc_iomem; + sc->sc_port[port].p_res = rman_reserve_resource(rm, start, + start + res - 1, res, 0, sc->sc_dev); } - if (desc->init != NULL) { - i = desc->init(sc); - if (i != 0) - return (i); - } + sc->sc_irid = 0; + sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, + RF_ACTIVE|RF_SHAREABLE); + if (sc->sc_ires != NULL) { + error = bus_setup_intr(dev, sc->sc_ires, + INTR_TYPE_TTY | INTR_FAST, puc_intr, sc, &sc->sc_icookie); + if (error) + error = bus_setup_intr(dev, sc->sc_ires, + INTR_TYPE_TTY | INTR_MPSAFE, puc_intr, sc, + &sc->sc_icookie); + else + sc->sc_fastintr = 1; - for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { - rid = sc->sc_desc.ports[i].bar; - bidx = puc_port_bar_index(sc, rid); - if (bidx < 0 || sc->sc_bar_mappings[bidx].res == NULL) - continue; - - switch (sc->sc_desc.ports[i].type) { - case PUC_PORT_TYPE_COM: - typestr = "uart"; - ressz = 8; - break; - case PUC_PORT_TYPE_LPT: - typestr = "ppc"; - ressz = 8; - break; - default: - continue; + if (error) { + device_printf(dev, "could not activate interrupt\n"); + bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, + sc->sc_ires); + sc->sc_ires = NULL; } - - pdev = malloc(sizeof(struct puc_device), M_DEVBUF, - M_NOWAIT | M_ZERO); - if (!pdev) - continue; - resource_list_init(&pdev->resources); - - /* First fake up an IRQ resource. */ - resource_list_add(&pdev->resources, SYS_RES_IRQ, 0, - rman_get_start(sc->irqres), rman_get_end(sc->irqres), - rman_get_end(sc->irqres) - rman_get_start(sc->irqres) + 1); - rle = resource_list_find(&pdev->resources, SYS_RES_IRQ, 0); - rle->res = sc->irqres; - - /* Now fake an IOPORT or MEMORY resource */ - res = sc->sc_bar_mappings[bidx].res; - type = sc->sc_bar_mappings[bidx].type; - resource_list_add(&pdev->resources, type, 0, - rman_get_start(res) + sc->sc_desc.ports[i].offset, - rman_get_start(res) + sc->sc_desc.ports[i].offset - + ressz - 1, ressz); - rle = resource_list_find(&pdev->resources, type, 0); - - if (sc->barmuxed == 0) { - rle->res = sc->sc_bar_mappings[bidx].res; - } else { - rle->res = rman_secret_puc_alloc_resource(M_WAITOK); - if (rle->res == NULL) { - free(pdev, M_DEVBUF); - return (ENOMEM); - } - - rman_set_start(rle->res, rman_get_start(res) + - sc->sc_desc.ports[i].offset); - rman_set_end(rle->res, rman_get_start(rle->res) + - ressz - 1); - rman_set_bustag(rle->res, rman_get_bustag(res)); - bus_space_subregion(rman_get_bustag(rle->res), - rman_get_bushandle(res), - sc->sc_desc.ports[i].offset, ressz, - &bh); - rman_set_bushandle(rle->res, bh); - } - - pdev->serialfreq = sc->sc_desc.serialfreq; - - childunit = puc_find_free_unit(typestr); - sc->sc_ports[i].dev = device_add_child(dev, typestr, - childunit); - if (sc->sc_ports[i].dev == NULL) { - if (sc->barmuxed) { - bus_space_unmap(rman_get_bustag(rle->res), - rman_get_bushandle(rle->res), ressz); - rman_secret_puc_free_resource(rle->res); - free(pdev, M_DEVBUF); - } - continue; - } - device_set_ivars(sc->sc_ports[i].dev, pdev); - device_set_desc(sc->sc_ports[i].dev, sc->sc_desc.name); -#ifdef PUC_DEBUG - printf("puc: type %s(%d), bar %x, offset %x\n", typestr, - sc->sc_desc.ports[i].type, - sc->sc_desc.ports[i].bar, - sc->sc_desc.ports[i].offset); - puc_print_resource_list(&pdev->resources); -#endif - device_set_flags(sc->sc_ports[i].dev, - sc->sc_desc.ports[i].flags); - if (device_probe_and_attach(sc->sc_ports[i].dev) != 0) { - if (sc->barmuxed) { - bus_space_unmap(rman_get_bustag(rle->res), - rman_get_bushandle(rle->res), ressz); - rman_secret_puc_free_resource(rle->res); - free(pdev, M_DEVBUF); - } - } + } + if (sc->sc_ires == NULL) { + /* XXX no interrupt resource. Force polled mode. */ + sc->sc_polled = 1; } -#ifdef PUC_DEBUG - bootverbose = 0; -#endif return (0); -} -static u_int32_t -puc_ilr_read(struct puc_softc *sc) -{ - u_int32_t mask; - int i; - - mask = 0; - switch (sc->sc_desc.ilr_type) { - case PUC_ILR_TYPE_DIGI: - for (i = 1; i >= 0 && sc->sc_desc.ilr_offset[i] != 0; i--) { - mask = (mask << 8) | (bus_space_read_1(sc->ilr_st, - sc->ilr_sh, sc->sc_desc.ilr_offset[i]) & 0xff); - } - break; - - default: - mask = 0xffffffff; - break; +fail: + for (port = 0; port < sc->sc_nports; port++) { + if (sc->sc_port[port].p_res != NULL) + rman_release_resource(sc->sc_port[port].p_res); + } + for (i = 0; i < PUC_PCI_BARS; i++) { + if (sc->sc_bar[i].b_res != NULL) + bus_release_resource(sc->sc_dev, sc->sc_bar[i].b_type, + sc->sc_bar[i].b_rid, sc->sc_bar[i].b_res); } - return (mask); + rman_fini(&sc->sc_iomem); + rman_fini(&sc->sc_ioport); + free(sc->sc_port, M_PUC); + return (error); } -/* - * This is an interrupt handler. For boards that can't tell us which - * device generated the interrupt it just calls all the registered - * handlers sequencially, but for boards that can tell us which - * device(s) generated the interrupt it calls only handlers for devices - * that actually generated the interrupt. - */ -static void -puc_intr(void *arg) +int +puc_probe(device_t dev, const struct puc_cfg *cfg) { - int i; - u_int32_t ilr_mask; struct puc_softc *sc; + intptr_t res; + int error; - sc = (struct puc_softc *)arg; - ilr_mask = sc->ilr_enabled ? puc_ilr_read(sc) : 0xffffffff; - for (i = 0; i < PUC_MAX_PORTS; i++) - if (sc->sc_ports[i].ihand != NULL && - ((ilr_mask >> i) & 0x00000001)) - (sc->sc_ports[i].ihand)(sc->sc_ports[i].ihandarg); -} + sc = device_get_softc(dev); + sc->sc_dev = dev; + sc->sc_cfg = cfg; -static int -puc_find_free_unit(char *name) -{ - devclass_t dc; - int start; - int unit; + /* We don't attach to single-port serial cards. */ + if (cfg->ports == PUC_PORT_1S) + return (EDOOFUS); + error = puc_query(cfg, PUC_QUERY_NPORTS, 0, &res); + if (error) + return (error); - unit = 0; - start = 0; - while (resource_int_value(name, unit, "port", &start) == 0 && - start > 0) - unit++; - dc = devclass_find(name); - if (dc == NULL) - return (-1); - while (devclass_get_device(dc, unit)) - unit++; -#ifdef PUC_DEBUG - printf("puc: Using %s%d\n", name, unit); -#endif - return (unit); + if (cfg->name != NULL) + device_set_desc(dev, cfg->name); + return (BUS_PROBE_DEFAULT); } -#ifdef PUC_DEBUG -static void -puc_print_resource_list(struct resource_list *rl) -{ -#if 0 - struct resource_list_entry *rle; - - printf("print_resource_list: rl %p\n", rl); - SLIST_FOREACH(rle, rl, link) - printf(" type %x, rid %x start %lx end %lx count %lx\n", - rle->type, rle->rid, rle->start, rle->end, rle->count); - printf("print_resource_list: end.\n"); -#endif -} -#endif - struct resource * puc_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - struct puc_device *pdev; - struct resource *retval; - struct resource_list *rl; - struct resource_list_entry *rle; - device_t my_child; + struct puc_port *p; - /* - * in the case of a child of child we need to find our immediate child - */ - for (my_child = child; device_get_parent(my_child) != dev; - my_child = device_get_parent(my_child)); + while (child != NULL && device_get_parent(child) != dev) + child = device_get_parent(child); + if (child == NULL) + return (NULL); - pdev = device_get_ivars(my_child); - rl = &pdev->resources; + /* We only support default allocations. */ + if (*rid != 0 || start != 0UL || end != ~0UL) + return (NULL); -#ifdef PUC_DEBUG - printf("puc_alloc_resource: pdev %p, looking for t %x, r %x\n", - pdev, type, *rid); - puc_print_resource_list(rl); -#endif - retval = NULL; - rle = resource_list_find(rl, type, *rid); - if (rle) { -#ifdef PUC_DEBUG - printf("found rle, %lx, %lx, %lx\n", rle->start, rle->end, - rle->count); -#endif - retval = rle->res; - } -#ifdef PUC_DEBUG - else - printf("oops rle is gone\n"); -#endif - - return (retval); + p = device_get_ivars(child); + return (NULL); } int puc_release_resource(device_t dev, device_t child, int type, int rid, struct resource *res) { + struct puc_port *p; + + while (child != NULL && device_get_parent(child) != dev) + child = device_get_parent(child); + if (child == NULL) + return (EINVAL); + + p = device_get_ivars(child); return (0); } @@ -488,89 +276,65 @@ puc_get_resource(device_t dev, device_t child, int type, int rid, u_long *startp, u_long *countp) { - struct puc_device *pdev; - struct resource_list *rl; - struct resource_list_entry *rle; + struct puc_port *p; - pdev = device_get_ivars(child); - rl = &pdev->resources; + while (child != NULL && device_get_parent(child) != dev) + child = device_get_parent(child); + if (child == NULL) + return (EINVAL); -#ifdef PUC_DEBUG - printf("puc_get_resource: pdev %p, looking for t %x, r %x\n", pdev, - type, rid); - puc_print_resource_list(rl); -#endif - rle = resource_list_find(rl, type, rid); - if (rle) { -#ifdef PUC_DEBUG - printf("found rle %p,", rle); -#endif - if (startp != NULL) - *startp = rle->start; - if (countp != NULL) - *countp = rle->count; -#ifdef PUC_DEBUG - printf(" %lx, %lx\n", rle->start, rle->count); -#endif - return (0); - } else - printf("oops rle is gone\n"); + p = device_get_ivars(child); return (ENXIO); } int puc_setup_intr(device_t dev, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + void (*ihand)(void *), void *arg, void **cookiep) { - int i; - struct puc_softc *sc; + struct puc_port *p; + + while (child != NULL && device_get_parent(child) != dev) + child = device_get_parent(child); + if (child == NULL) + return (EINVAL); - sc = (struct puc_softc *)device_get_softc(dev); - if ((flags & INTR_FAST) != sc->fastintr) - return (ENXIO); - for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { - if (sc->sc_ports[i].dev == child) { - if (sc->sc_ports[i].ihand != 0) - return (ENXIO); - sc->sc_ports[i].ihand = ihand; - sc->sc_ports[i].ihandarg = arg; - *cookiep = arg; - return (0); - } - } + p = device_get_ivars(child); return (ENXIO); } int puc_teardown_intr(device_t dev, device_t child, struct resource *r, - void *cookie) + void *cookie) { - int i; - struct puc_softc *sc; + struct puc_port *p; + + while (child != NULL && device_get_parent(child) != dev) + child = device_get_parent(child); + if (child == NULL) + return (EINVAL); - sc = (struct puc_softc *)device_get_softc(dev); - for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { - if (sc->sc_ports[i].dev == child) { - sc->sc_ports[i].ihand = NULL; - sc->sc_ports[i].ihandarg = NULL; - return (0); - } - } + p = device_get_ivars(child); return (ENXIO); } int puc_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) { - struct puc_device *pdev; + struct puc_port *p; + + while (child != NULL && device_get_parent(child) != dev) + child = device_get_parent(child); + if (child == NULL) + return (EINVAL); - pdev = device_get_ivars(child); - if (pdev == NULL) - return (ENOENT); + p = device_get_ivars(child); switch(index) { - case PUC_IVAR_FREQ: - *result = pdev->serialfreq; + case PUC_IVAR_CLOCK: + *result = p->p_rclk; + break; + case PUC_IVAR_TYPE: + *result = p->p_type; break; default: return (ENOENT); ==== //depot/projects/uart/dev/puc/puc_bus.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ #define PUC_IVAR_TYPE 1 /* Port types. */ -#define PUC_TYPE_SERIAL 0 -#define PUC_TYPE_PARALLEL 1 +#define PUC_TYPE_SERIAL 1 +#define PUC_TYPE_PARALLEL 2 #endif /* _DEV_PUC_BUS_H_ */ ==== //depot/projects/uart/dev/puc/puc_pci.c#11 (text+ko) ==== @@ -60,8 +60,6 @@ #include __FBSDID("$FreeBSD: src/sys/dev/puc/puc_pci.c,v 1.14 2005/03/05 18:10:49 imp Exp $"); -#include "opt_puc.h" - #include #include #include @@ -77,15 +75,13 @@ #include #include -#define PUC_ENTRAILS 1 +#include #include -extern const struct puc_device_description puc_devices[]; +extern const struct puc_cfg puc_devices[]; -int puc_config_win877(struct puc_softc *); - -static const struct puc_device_description * -puc_pci_match(device_t dev, const struct puc_device_description *desc) +static const struct puc_cfg * +puc_pci_match(device_t dev, const struct puc_cfg *desc) { uint16_t device, subdev, subven, vendor; @@ -110,7 +106,7 @@ static int puc_pci_probe(device_t dev) { - const struct puc_device_description *desc; + const struct puc_cfg *desc; if ((pci_read_config(dev, PCIR_HDRTYPE, 1) & PCIM_HDRTYPE) != 0) return (ENXIO); @@ -118,21 +114,13 @@ desc = puc_pci_match(dev, puc_devices); if (desc == NULL) return (ENXIO); - device_set_desc(dev, desc->name); - return (BUS_PROBE_DEFAULT); + return (puc_probe(dev, desc)); } -static int -puc_pci_attach(device_t dev) -{ - - return (puc_attach(dev, puc_pci_match(dev, puc_devices))); -} - static device_method_t puc_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, puc_pci_probe), - DEVMETHOD(device_attach, puc_pci_attach), + DEVMETHOD(device_attach, puc_attach), DEVMETHOD(bus_alloc_resource, puc_alloc_resource), DEVMETHOD(bus_release_resource, puc_release_resource), @@ -146,136 +134,10 @@ }; static driver_t puc_pci_driver = { - "puc", + puc_driver_name, puc_pci_methods, sizeof(struct puc_softc), }; DRIVER_MODULE(puc, pci, puc_pci_driver, puc_devclass, 0, 0); DRIVER_MODULE(puc, cardbus, puc_pci_driver, puc_devclass, 0, 0); - - -#define rdspio(indx) (bus_space_write_1(bst, bsh, efir, indx), \ - bus_space_read_1(bst, bsh, efdr)) -#define wrspio(indx,data) (bus_space_write_1(bst, bsh, efir, indx), \ - bus_space_write_1(bst, bsh, efdr, data)) - -#ifdef PUC_DEBUG -static void -puc_print_win877(bus_space_tag_t bst, bus_space_handle_t bsh, u_int efir, - u_int efdr) -{ - u_char cr00, cr01, cr04, cr09, cr0d, cr14, cr15, cr16, cr17; - u_char cr18, cr19, cr24, cr25, cr28, cr2c, cr31, cr32; - - cr00 = rdspio(0x00); - cr01 = rdspio(0x01); - cr04 = rdspio(0x04); - cr09 = rdspio(0x09); - cr0d = rdspio(0x0d); - cr14 = rdspio(0x14); - cr15 = rdspio(0x15); - cr16 = rdspio(0x16); - cr17 = rdspio(0x17); - cr18 = rdspio(0x18); - cr19 = rdspio(0x19); - cr24 = rdspio(0x24); - cr25 = rdspio(0x25); - cr28 = rdspio(0x28); - cr2c = rdspio(0x2c); - cr31 = rdspio(0x31); - cr32 = rdspio(0x32); - printf("877T: cr00 %x, cr01 %x, cr04 %x, cr09 %x, cr0d %x, cr14 %x, " - "cr15 %x, cr16 %x, cr17 %x, cr18 %x, cr19 %x, cr24 %x, cr25 %x, " - "cr28 %x, cr2c %x, cr31 %x, cr32 %x\n", cr00, cr01, cr04, cr09, - cr0d, cr14, cr15, cr16, cr17, - cr18, cr19, cr24, cr25, cr28, cr2c, cr31, cr32); -} -#endif - -int -puc_config_win877(struct puc_softc *sc) -{ - u_char val; - u_int efir, efdr; - bus_space_tag_t bst; - bus_space_handle_t bsh; - struct resource *res; - - res = sc->sc_bar_mappings[0].res; - - bst = rman_get_bustag(res); - bsh = rman_get_bushandle(res); - - /* configure the first W83877TF */ - bus_space_write_1(bst, bsh, 0x250, 0x89); - efir = 0x251; - efdr = 0x252; - val = rdspio(0x09) & 0x0f; - if (val != 0x0c) { - printf("conf_win877: Oops not a W83877TF\n"); - return (ENXIO); - } - -#ifdef PUC_DEBUG - printf("before: "); - puc_print_win877(bst, bsh, efir, efdr); -#endif - - val = rdspio(0x16); - val |= 0x04; - wrspio(0x16, val); - val &= ~0x04; - wrspio(0x16, val); - - wrspio(0x24, 0x2e8 >> 2); - wrspio(0x25, 0x2f8 >> 2); - wrspio(0x17, 0x03); - wrspio(0x28, 0x43); - -#ifdef PUC_DEBUG - printf("after: "); - puc_print_win877(bst, bsh, efir, efdr); -#endif - - bus_space_write_1(bst, bsh, 0x250, 0xaa); - - /* configure the second W83877TF */ - bus_space_write_1(bst, bsh, 0x3f0, 0x87); - bus_space_write_1(bst, bsh, 0x3f0, 0x87); - efir = 0x3f0; - efdr = 0x3f1; - val = rdspio(0x09) & 0x0f; - if (val != 0x0c) { - printf("conf_win877: Oops not a W83877TF\n"); - return(ENXIO); - } - -#ifdef PUC_DEBUG - printf("before: "); - puc_print_win877(bst, bsh, efir, efdr); -#endif - - val = rdspio(0x16); - val |= 0x04; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 15 04:59:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE0D816A406; Sat, 15 Apr 2006 04:59:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E84C16A402 for ; Sat, 15 Apr 2006 04:59:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 394B843D48 for ; Sat, 15 Apr 2006 04:59:51 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F4xpBf004812 for ; Sat, 15 Apr 2006 04:59:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F4xocA004806 for perforce@freebsd.org; Sat, 15 Apr 2006 04:59:50 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 04:59:50 GMT Message-Id: <200604150459.k3F4xocA004806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 04:59:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=95311 Change 95311 by jb@jb_freebsd2 on 2006/04/15 04:59:44 Now we can get through a buildworld, we need these so that an installworld will work. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile.inc#1 add .. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile.inc#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 05:24:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AA2C16A404; Sat, 15 Apr 2006 05:24:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2561916A401 for ; Sat, 15 Apr 2006 05:24:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC15143D45 for ; Sat, 15 Apr 2006 05:24:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F5OMQK019314 for ; Sat, 15 Apr 2006 05:24:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F5OMJl019309 for perforce@freebsd.org; Sat, 15 Apr 2006 05:24:22 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 05:24:22 GMT Message-Id: <200604150524.k3F5OMJl019309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 05:24:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=95313 Change 95313 by jb@jb_freebsd2 on 2006/04/15 05:23:58 #ifdef a lot of code out so that libdtrace builds and dtrace links. At this point, a 'make buildworld && make installworld' will do the right thing. sgsmsg gets installed in /usr/bin. It's a build tool. dtrace (the program) gets installed in /usr/sbin and the libdtrace, libelf, libctf and libavl libraries get installed in /usr/lib. So far, that's all that affects an installed FreeBSD system. Next up there are a few extra build tools which will be required to add the 'C Type Format' symbols to executables. Then it's back to fleshing out the dtrace problem to fill in the bits of code DOODADed out. At the point where a dtrace_open() tries to open the dtrace device, obviously that's the point where kernel functionality is added. 8-) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#1 add .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#2 (text) ==== @@ -55,7 +55,7 @@ * DTRACE_DOF_INIT_DEVNAME set the path to the helper node */ -static const char *devname = "/dev/dtrace/helper"; +static const char *devnamep = "/dev/dtrace/helper"; static const char *olddevname = "/devices/pseudo/dtrace@0:helper"; static const char *modname; /* Name of this load object */ @@ -89,6 +89,7 @@ static void dtrace_dof_init(void) { +#ifdef DOODAD dof_hdr_t *dof = &__SUNW_dof; #ifdef _LP64 Elf64_Ehdr *elf; @@ -141,10 +142,10 @@ } if ((p = getenv("DTRACE_DOF_INIT_DEVNAME")) != NULL) - devname = p; + devnamep = p; - if ((fd = open64(devname, O_RDWR)) < 0) { - dprintf(1, "failed to open helper device %s", devname); + if ((fd = open64(devnamep, O_RDWR)) < 0) { + dprintf(1, "failed to open helper device %s", devnamep); /* * If the device path wasn't explicitly set, try again with @@ -153,10 +154,10 @@ if (p != NULL) return; - devname = olddevname; + devnamep = olddevname; - if ((fd = open64(devname, O_RDWR)) < 0) { - dprintf(1, "failed to open helper device %s", devname); + if ((fd = open64(devnamep, O_RDWR)) < 0) { + dprintf(1, "failed to open helper device %s", devnamep); return; } } @@ -167,16 +168,18 @@ dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); (void) close(fd); +#endif } #pragma fini(dtrace_dof_fini) static void dtrace_dof_fini(void) { +#ifdef DOODAD int fd; - if ((fd = open64(devname, O_RDWR)) < 0) { - dprintf(1, "failed to open helper device %s", devname); + if ((fd = open64(devnamep, O_RDWR)) < 0) { + dprintf(1, "failed to open helper device %s", devnamep); return; } @@ -186,4 +189,5 @@ dprintf(1, "DTrace ioctl removed DOF (%d)\n", gen); (void) close(fd); +#endif } ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#3 (text) ==== @@ -233,6 +233,7 @@ static void dt_aggregate_usym(dtrace_hdl_t *dtp, uint64_t *data) { +#ifdef DOODAD uint64_t pid = data[0]; uint64_t *pc = &data[1]; struct ps_prochandle *P; @@ -251,6 +252,7 @@ dt_proc_unlock(dtp, P); dt_proc_release(dtp, P); +#endif } static void ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#3 (text) ==== @@ -29,6 +29,8 @@ #include #if defined(sun) #include +#else +#define P2ROUNDUP(x, align) (-(-(x) & -(align))) #endif #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#3 (text) ==== @@ -568,6 +568,7 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr, uint64_t arg) { +#ifdef DOODAD /* LINTED - alignment */ uint64_t *pc = (uint64_t *)addr; uint32_t depth = DTRACE_USTACK_NFRAMES(arg); @@ -699,11 +700,15 @@ } return (err); +#else +return 0; +#endif } static int dt_print_usym(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr, dtrace_actkind_t act) { +#ifdef DOODAD /* LINTED - alignment */ uint64_t pid = ((uint64_t *)addr)[0]; /* LINTED - alignment */ @@ -735,11 +740,15 @@ } while ((len = dtrace_uaddr2str(dtp, pid, pc, s, n)) >= n); return (dt_printf(dtp, fp, format, s)); +#else +return 0; +#endif } int dt_print_umod(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr) { +#ifdef DOODAD /* LINTED - alignment */ uint64_t pid = ((uint64_t *)addr)[0]; /* LINTED - alignment */ @@ -778,6 +787,9 @@ } return (err); +#else +return 0; +#endif } static int ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#2 (text) ==== @@ -27,10 +27,14 @@ #pragma ident "@(#)dt_dof.c 1.11 06/03/30 SMI" #include +#if defined(sun) #include +#endif #include +#if defined(sun) #include +#endif #include #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#3 (text) ==== @@ -32,6 +32,10 @@ #if defined(sun) #include #else +#include +#include +#include +#include #include #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#2 (text) ==== @@ -42,12 +42,19 @@ * We need to undefine lex's input and unput macros so that references to these * call the functions provided at the end of this source file. */ +#if defined(sun) #undef input #undef unput +#else +#undef yyinput +#define yyinput input +#endif static int id_or_type(const char *); static int input(void); +#if defined(sun) static void unput(int); +#endif /* * We first define a set of labeled states for use in the D lexer and then a @@ -689,7 +696,9 @@ yypcb = pcb; yylineno = 1; yypragma = NULL; +#if defined(sun) yysptr = yysbuf; +#endif } /* @@ -786,13 +795,16 @@ } static int -input(void) +dtinput(void) { int c; +#if defined(sun) if (yysptr > yysbuf) c = *--yysptr; - else if (yypcb->pcb_fileptr != NULL) + else +#endif + if (yypcb->pcb_fileptr != NULL) c = fgetc(yypcb->pcb_fileptr); else if (yypcb->pcb_strptr < yypcb->pcb_string + yypcb->pcb_strlen) c = *yypcb->pcb_strptr++; @@ -817,6 +829,7 @@ return (0); /* EOF */ } +#if defined(sun) static void unput(int c) { @@ -826,3 +839,4 @@ *yysptr++ = c; yytchar = c; } +#endif ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 (text) ==== @@ -32,6 +32,8 @@ #include #if defined(sun) #include +#else +#define P2ROUNDUP(x, align) (-(-(x) & -(align))) #endif #include @@ -47,6 +49,8 @@ #include #if defined(sun) #include +#else +#include #endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#3 (text) ==== @@ -30,16 +30,19 @@ #if !defined(sun) #include #endif -#ifdef DOODAD +#if defined(sun) #include #include #include #include #include #include +#endif #include +#if defined(sun) #include +#endif #include #include #include @@ -47,7 +50,6 @@ #include #include #include -#endif #include #include @@ -72,6 +74,7 @@ static uint_t dt_module_syminit32(dt_module_t *dmp) { +#ifdef DOODAD const Elf32_Sym *sym = dmp->dm_symtab.cts_data; const char *base = dmp->dm_strtab.cts_data; size_t ss_size = dmp->dm_strtab.cts_size; @@ -96,11 +99,15 @@ } return (asrsv); +#else +return 0; +#endif } static uint_t dt_module_syminit64(dt_module_t *dmp) { +#ifdef DOODAD const Elf64_Sym *sym = dmp->dm_symtab.cts_data; const char *base = dmp->dm_strtab.cts_data; size_t ss_size = dmp->dm_strtab.cts_size; @@ -125,6 +132,9 @@ } return (asrsv); +#else +return 0; +#endif } /* @@ -668,6 +678,7 @@ void dt_module_unload(dtrace_hdl_t *dtp, dt_module_t *dmp) { +#ifdef DOODAD ctf_close(dmp->dm_ctfp); dmp->dm_ctfp = NULL; @@ -712,6 +723,7 @@ dmp->dm_elf = NULL; dmp->dm_flags &= ~DT_DM_LOADED; +#endif } void @@ -791,6 +803,7 @@ static void dt_module_update(dtrace_hdl_t *dtp, const char *name) { +#ifdef DOODAD char fname[MAXPATHLEN]; struct stat64 st; int fd, err, bits; @@ -882,6 +895,7 @@ dt_dprintf("opened %d-bit module %s (%s) [%d]\n", bits, dmp->dm_name, dmp->dm_file, dmp->dm_modid); +#endif } /* @@ -891,6 +905,7 @@ void dtrace_update(dtrace_hdl_t *dtp) { +#ifdef DOODAD dt_module_t *dmp; DIR *dirp; @@ -950,6 +965,7 @@ dt_list_delete(&dtp->dt_modlist, dtp->dt_exec); dt_list_prepend(&dtp->dt_modlist, dtp->dt_exec); } +#endif } static dt_module_t * ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#2 (text) ==== @@ -32,7 +32,9 @@ #include #include #include +#if defined(sun) #include +#endif #include #include @@ -41,6 +43,7 @@ #include #include +#ifdef DOODAD typedef struct dt_pid_probe { dtrace_hdl_t *dpp_dtp; dt_pcb_t *dpp_pcb; @@ -58,11 +61,13 @@ GElf_Sym dpp_last; uint_t dpp_last_taken; } dt_pid_probe_t; +#endif /* * Compose the lmid and object name into the canonical representation. We * omit the lmid for the default link map for convenience. */ +#ifdef DOODAD static void dt_pid_objname(char *buf, size_t len, Lmid_t lmid, const char *obj) { @@ -71,6 +76,7 @@ else (void) snprintf(buf, len, "LM%lx`%s", lmid, obj); } +#endif static int dt_pid_error(dtrace_hdl_t *dtp, dt_pcb_t *pcb, dt_proc_t *dpr, @@ -99,6 +105,7 @@ return (1); } +#ifdef DOODAD static int dt_pid_per_sym(dt_pid_probe_t *pp, const GElf_Sym *symp, const char *func) { @@ -206,7 +213,9 @@ return (0); } +#endif +#ifdef DOODAD static int dt_pid_sym_filt(void *arg, const GElf_Sym *symp, const char *func) { @@ -241,7 +250,9 @@ return (0); } +#endif +#ifdef DOODAD static int dt_pid_per_mod(void *arg, const prmap_t *pmp, const char *obj) { @@ -363,7 +374,9 @@ return (0); } +#endif +#ifdef DOODAD static int dt_pid_mod_filt(void *arg, const prmap_t *pmp, const char *obj) { @@ -387,7 +400,9 @@ return (0); } +#endif +#ifdef DOODAD static const prmap_t * dt_pid_fix_mod(dtrace_probedesc_t *pdp, struct ps_prochandle *P) { @@ -431,12 +446,14 @@ return (pmp); } +#endif static int dt_pid_create_pid_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp, dt_pcb_t *pcb, dt_proc_t *dpr) { +#ifdef DOODAD dt_pid_probe_t pp; int ret = 0; @@ -519,8 +536,12 @@ dt_proc_bpenable(dpr); return (ret); +#else +return 0; +#endif } +#ifdef DOODAD static int dt_pid_usdt_mapping(void *data, const prmap_t *pmp, const char *oname) { @@ -580,11 +601,13 @@ return (0); } +#endif static int dt_pid_create_usdt_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp, dt_pcb_t *pcb, dt_proc_t *dpr) { +#ifdef DOODAD struct ps_prochandle *P = dpr->dpr_proc; int ret = 0; @@ -604,6 +627,9 @@ (void) dt_pid_fix_mod(pdp, P); return (ret); +#else +return 0; +#endif } static pid_t @@ -639,6 +665,7 @@ int dt_pid_create_probes(dtrace_probedesc_t *pdp, dtrace_hdl_t *dtp, dt_pcb_t *pcb) { +#ifdef DOODAD char provname[DTRACE_PROVNAMELEN]; struct ps_prochandle *P; dt_proc_t *dpr; @@ -703,6 +730,9 @@ } return (err ? -1 : 0); +#else +return 0; +#endif } int ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#3 (text) ==== @@ -30,10 +30,10 @@ #pragma ident "@(#)dt_pid.h 1.7 06/02/08 SMI" +#if defined(sun) #include -#if defined(sun) +#endif #include -#endif #include #ifdef __cplusplus @@ -47,7 +47,6 @@ dt_pcb_t *pcb); extern int dt_pid_create_probes_module(dtrace_hdl_t *, dt_proc_t *); -#ifdef DOODAD extern int dt_pid_create_entry_probe(struct ps_prochandle *, dtrace_hdl_t *, fasttrap_probe_spec_t *, const GElf_Sym *); @@ -59,7 +58,6 @@ extern int dt_pid_create_glob_offset_probes(struct ps_prochandle *, dtrace_hdl_t *, fasttrap_probe_spec_t *, const GElf_Sym *, const char *); -#endif #ifdef __cplusplus } ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 (text) ==== @@ -29,7 +29,10 @@ #if defined(sun) #include +#else +#define ABS(a) ((a) < 0 ? -(a) : (a)) #endif +#include #include #include #if defined(sun) ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 (text) ==== @@ -80,7 +80,9 @@ */ #include +#if defined(sun) #include +#endif #include #include #include @@ -93,6 +95,7 @@ #define IS_SYS_EXEC(w) (w == SYS_exec || w == SYS_execve) #define IS_SYS_FORK(w) (w == SYS_vfork || w == SYS_fork1 || w == SYS_forkall) +#ifdef DOODAD static dt_bkpt_t * dt_proc_bpcreate(dt_proc_t *dpr, uintptr_t addr, dt_bkpt_f *func, void *data) { @@ -161,10 +164,12 @@ dbp->dbp_func(dtp, dpr, dbp->dbp_data); (void) Pxecbkpt(dpr->dpr_proc, dbp->dbp_instr); } +#endif void dt_proc_bpenable(dt_proc_t *dpr) { +#ifdef DOODAD dt_bkpt_t *dbp; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); @@ -177,11 +182,13 @@ } dt_dprintf("breakpoints enabled\n"); +#endif } void dt_proc_bpdisable(dt_proc_t *dpr) { +#ifdef DOODAD dt_bkpt_t *dbp; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); @@ -194,8 +201,10 @@ } dt_dprintf("breakpoints disabled\n"); +#endif } +#ifdef DOODAD static void dt_proc_notify(dtrace_hdl_t *dtp, dt_proc_hash_t *dph, dt_proc_t *dpr, const char *msg) @@ -659,10 +668,12 @@ (void) dt_set_errno(dtp, EDT_COMPILER); return (NULL); } +#endif dt_proc_t * dt_proc_lookup(dtrace_hdl_t *dtp, struct ps_prochandle *P, int remove) { +#ifdef DOODAD dt_proc_hash_t *dph = dtp->dt_procs; pid_t pid = Pstatus(P)->pr_pid; dt_proc_t *dpr, **dpp = &dph->dph_hash[pid & (dph->dph_hashlen - 1)]; @@ -681,11 +692,15 @@ *dpp = dpr->dpr_hash; /* remove from pid hash chain */ return (dpr); +#else +return NULL; +#endif } static void dt_proc_destroy(dtrace_hdl_t *dtp, struct ps_prochandle *P) { +#ifdef DOODAD dt_proc_t *dpr = dt_proc_lookup(dtp, P, B_FALSE); dt_proc_hash_t *dph = dtp->dt_procs; dt_proc_notify_t *npr, **npp; @@ -773,8 +788,10 @@ dt_list_delete(&dph->dph_lrulist, dpr); Prelease(dpr->dpr_proc, rflag); dt_free(dtp, dpr); +#endif } +#ifdef DOODAD static int dt_proc_create_thread(dtrace_hdl_t *dtp, dt_proc_t *dpr, uint_t stop) { @@ -850,10 +867,12 @@ return (err); } +#endif struct ps_prochandle * dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv) { +#ifdef DOODAD dt_proc_hash_t *dph = dtp->dt_procs; dt_proc_t *dpr; int err; @@ -886,11 +905,15 @@ dpr->dpr_refs++; return (dpr->dpr_proc); +#else +return NULL; +#endif } struct ps_prochandle * dt_proc_grab(dtrace_hdl_t *dtp, pid_t pid, int flags, int nomonitor) { +#ifdef DOODAD dt_proc_hash_t *dph = dtp->dt_procs; uint_t h = pid & (dph->dph_hashlen - 1); dt_proc_t *dpr, *opr; @@ -980,11 +1003,15 @@ dpr->dpr_refs++; return (dpr->dpr_proc); +#else +return NULL; +#endif } void dt_proc_release(dtrace_hdl_t *dtp, struct ps_prochandle *P) { +#ifdef DOODAD dt_proc_t *dpr = dt_proc_lookup(dtp, P, B_FALSE); dt_proc_hash_t *dph = dtp->dt_procs; @@ -994,6 +1021,7 @@ if (--dpr->dpr_refs == 0 && (!dpr->dpr_cacheable || dph->dph_lrucnt > dph->dph_lrulim)) dt_proc_destroy(dtp, P); +#endif } void @@ -1057,6 +1085,7 @@ struct ps_prochandle * dtrace_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv) { +#ifdef DOODAD dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target"); struct ps_prochandle *P = dt_proc_create(dtp, file, argv); @@ -1064,6 +1093,9 @@ idp->di_id = Pstatus(P)->pr_pid; /* $target = created pid */ return (P); +#else +return NULL; +#endif } struct ps_prochandle * ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 (text) ==== @@ -30,7 +30,9 @@ #pragma ident "@(#)dt_proc.h 1.7 06/02/08 SMI" +#if defined(sun) #include +#endif #include #include #include @@ -45,7 +47,9 @@ dtrace_hdl_t *dpr_hdl; /* back pointer to libdtrace handle */ struct ps_prochandle *dpr_proc; /* proc handle for libproc calls */ char dpr_errmsg[BUFSIZ]; /* error message */ +#if defined(sun) rd_agent_t *dpr_rtld; /* rtld handle for librtld_db calls */ +#endif pthread_mutex_t dpr_lock; /* lock for manipulating dpr_hdl */ pthread_cond_t dpr_cv; /* cond for dpr_stop/quit/done */ pid_t dpr_pid; /* pid of process */ ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#3 (text) ==== @@ -815,22 +815,34 @@ int dt_rw_read_held(pthread_rwlock_t *lock) { +#if defined(sun) extern int _rw_read_held(struct _rwlock *); return (_rw_read_held((struct _rwlock *)lock)); +#else + return (pthread_rwlock_rdheld_np(lock)); +#endif } int dt_rw_write_held(pthread_rwlock_t *lock) { +#if defined(sun) extern int _rw_write_held(struct _rwlock *); return (_rw_write_held((struct _rwlock *)lock)); +#else + return (pthread_rwlock_wrheld_np(lock)); +#endif } int dt_mutex_held(pthread_mutex_t *lock) { +#if defined(sun) extern int _mutex_held(struct _lwp_mutex *); return (_mutex_held((struct _lwp_mutex *)lock)); +#else + return (pthread_mutex_held_np(lock)); +#endif } static int @@ -902,6 +914,7 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_t pid, uint64_t addr, char *str, int nbytes) { +#ifdef DOODAD char name[PATH_MAX], objname[PATH_MAX], c[PATH_MAX * 2]; struct ps_prochandle *P = NULL; GElf_Sym sym; @@ -939,4 +952,7 @@ dt_proc_release(dtp, P); return (dt_string2str(c, str, nbytes)); +#else +return 0; +#endif } ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#3 (text) ==== @@ -32,9 +32,6 @@ #include #include #include -#if !defined(sun) -#include -#endif static const struct { int dtslt_option; From owner-p4-projects@FreeBSD.ORG Sat Apr 15 07:48:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C030416A402; Sat, 15 Apr 2006 07:48:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86BBC16A401 for ; Sat, 15 Apr 2006 07:48:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FB0E43D45 for ; Sat, 15 Apr 2006 07:48:23 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F7mMqx098580 for ; Sat, 15 Apr 2006 07:48:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F7mMik098577 for perforce@freebsd.org; Sat, 15 Apr 2006 07:48:22 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 07:48:22 GMT Message-Id: <200604150748.k3F7mMik098577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 07:48:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=95320 Change 95320 by jb@jb_freebsd2 on 2006/04/15 07:47:54 Integrate latest -current. Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#2 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/dtrace/src/bin/sh/show.c#2 integrate .. //depot/projects/dtrace/src/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/dtrace/src/etc/network.subr#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/nsswitch#2 integrate .. //depot/projects/dtrace/src/etc/rc.subr#3 integrate .. //depot/projects/dtrace/src/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/dtrace/src/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/dtrace/src/games/random/random.c#2 integrate .. //depot/projects/dtrace/src/games/random/randomize_fd.c#2 integrate .. //depot/projects/dtrace/src/include/time.h#3 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/dtrace/src/lib/libc/sys/write.2#2 integrate .. //depot/projects/dtrace/src/lib/libc_r/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libgpib/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libpcap/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libpthread/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_cond.c#2 integrate .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex.c#3 integrate .. //depot/projects/dtrace/src/lib/libthr/Makefile#2 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate .. //depot/projects/dtrace/src/sbin/ccdconfig/ccdconfig.8#2 integrate .. //depot/projects/dtrace/src/sbin/ccdconfig/ccdconfig.c#2 integrate .. //depot/projects/dtrace/src/sbin/devd/devd.cc#2 integrate .. //depot/projects/dtrace/src/sbin/ggate/Makefile#2 integrate .. //depot/projects/dtrace/src/sbin/ipf/ipf/Makefile#2 integrate .. //depot/projects/dtrace/src/sbin/pfctl/Makefile#2 integrate .. //depot/projects/dtrace/src/share/man/man4/ccd.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/polling.4#2 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/dtrace/src/share/man/man7/hier.7#2 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/dtrace/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/lib.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/lib.h#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/xmodem.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0/xmodem.h#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/inc/AT91RM9200.h#1 branch .. //depot/projects/dtrace/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/dtrace/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/dtrace/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/dtrace/src/sys/net/if_arc.h#2 integrate .. //depot/projects/dtrace/src/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_BIND_MTREE#2 integrate .. //depot/projects/dtrace/src/usr.bin/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes#2 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies#2 integrate .. //depot/projects/dtrace/src/usr.bin/login/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/Packet32.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/ypserv/Makefile.yp#2 integrate .. //depot/projects/dtrace/www/en/news/news.xml#3 integrate .. //depot/projects/dtrace/www/en/news/press.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/Makefile#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-jan-2006-mar-2006.xml#1 branch .. //depot/projects/dtrace/www/en/news/status/status.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#3 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/todo.sgml#2 integrate .. //depot/projects/dtrace/www/share/sgml/includes.release.sgml#2 integrate .. //depot/projects/dtrace/www/share/sgml/includes.release.xsl#2 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.nsayer; (1999 - 2006) + + + + &a.jennifer; (2002 - 2006) + + + &a.jedgar; (1999 - 2006) @@ -128,7 +136,7 @@ - &a.semenu; (1998 - 2003) + &a.semenu; (1998 - 2003) @@ -136,7 +144,7 @@ - &a.dbaker; (1999 - 2003) + &a.dbaker; (1999 - 2003) @@ -382,7 +390,7 @@ - &a.reg; (2000 - 2002) + &a.reg; (2000 - 2002) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -258,14 +258,13 @@ -1 }; -struct s_echo { +typedef struct s_echo { char msg[BUFFERSIZE]; int len; } t_echo; /* vars */ static dev_t sdev; -static int len; static int count; static t_echo *echomsg; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ PORTREVISION incremented, to force recompilation with the new library version. + If the port installs shared libraries with long version numbers, + e.g. libfoo.so.0.2.9, the ports infrastructure + will try to rename the files. Define + NO_FILTER_SHLIBS to disable this + functionality. + ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.10 2005/09/14 19:34:43 blackend Exp $ - Original revision: 1.111 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml,v 1.11 2006/04/13 18:23:09 blackend Exp $ + Original revision: 1.130 --> @@ -63,29 +63,23 @@ En bref, la compatibilité permet aux utilisateurs de &os; d'exécuter environ 90% des applications Linux sans aucune modification. Cela inclus des applications - comme StarOffice, - la version Linux de Netscape, - Adobe Acrobat, - RealPlayer - 5 et 7, VMWare, + comme &staroffice;, + la version Linux de &netscape;, + &adobe; &acrobat;, + RealPlayer, + VMware, &oracle;, - WordPerfect, Doom, + WordPerfect, Doom, Quake, et plus. On rapporte également que dans certaines situations, les binaires Linux sont plus performants sous &os; que sous Linux. - - Linux - système de fichiers - /proc - Il existe cependant certaines caractéristiques spécifiques à Linux qui ne sont pas supportées sous &os;. Les binaires Linux ne - fonctionneront pas sous &os; s'ils utilisent - le système de fichiers /proc de - Linux (qui est différent de celui de &os;), ou des appels - i386 spécifiques, comme activation du mode virtuel + fonctionneront pas sous &os; s'ils utilisent massivement + des appels + &i386; spécifiques, comme activation du mode virtuel 8086. Après la lecture de ce chapitre, vous connaîtrez: @@ -133,8 +127,10 @@ linux (Kernel LoaDable object—objet chargeable par le noyau, ce que l'on nomme couramment un module). Vous pouvez charger ce module - en tapant simplement linux à - l'invite. + en tapant ce qui suit sous l'utilisateur + root: + + &prompt.root; kldload linux Si vous désirez que la compatibilité Linux soit toujours activée, alors vous devrez ajouter la ligne @@ -158,7 +154,7 @@ Si pour quelques raisons vous ne voulez ou pouvez charger le KLD, alors vous pouvez lier statiquement la compatibilité binaire Linux dans votre noyau en ajoutant options - LINUX à votre fichier de configuration du noyau. + COMPAT_LINUX à votre fichier de configuration du noyau. Puis installez votre noyau comme décrit dans la . @@ -417,18 +413,11 @@ - Murray - Stokely - Mis à jour pour &mathematica; 4.X par + Boris + Hollas + Mis à jour pour &mathematica; 5.X par - - - Bojan - Bistrovic - Fusionné avec un travail de - - Installer &mathematica; @@ -438,46 +427,25 @@ Ce document décrit l'installation de la version Linux - de &mathematica; 4.X sur un + de &mathematica; 5.X sur un système &os;. La version Linux de &mathematica; - fonctionne parfaitement sous &os;, cependant les binaires - fournis par Wolfram doivent être marqués - afin que &os; sache qu'il faut utiliser l'ABI Linux pour les - exécuter. - - La version Linux de &mathematica; ou la version &mathematica; for Students peut être commandée directement auprès de Wolfram à l'adresse . - Marquer les binaires Linux + Utiliser l'installeur &mathematica; - Les binaires Linux se trouvent dans le répertoire - Unix du CDROM - &mathematica; distribué par - Wolfram. Vous devez copier le contenu de ce répertoire - sur votre disque local de façon à marquer les binaires - Linux à l'aide de &man.brandelf.1; avant de lancer - l'installation: - - &prompt.root; mount /cdrom -&prompt.root; cp -rp /cdrom/Unix/ /localdir/ -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/Kernel/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/FrontEnd/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/Installation/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/Graphics/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/Converters/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/LicenseManager/Binaries/Linux/mathlm -&prompt.root; cd /localdir/Installers/Linux/ -&prompt.root; ./MathInstaller - - Alternativement, vous pouvez simplement fixer + En premier lieu vous devez indiquer à &os; + que les binaires Linux de + &mathematica; utilisent l'ABI + Linux. La méthode la plus simple pour y parvenir est le marquage par défaut des binaires ELF non marqués - comme étant des binaires Linux avec la commande: + comme étant des binaires Linux, ce marquage se faisant + avec la commande: &prompt.root; sysctl kern.fallback_elf_brand=3 @@ -485,43 +453,87 @@ marqués sont des binaires Linux, et donc vous devriez être en mesure d'exécuter le programme d'installation directement depuis le CDROM. + + Copiez ensuite sur votre disque dur le fichier + MathInstaller: + + &prompt.root; mount /cdrom +&prompt.root; cp /cdrom/Unix/Installers/Linux/MathInstaller /localdir/ + + et dans ce fichier, remplacez /bin/sh + sur la première ligne par + /compat/linux/bin/sh. Cela permet de + garantir que l'installeur est exécuté par la + version Linux de &man.sh.1;. Ensuite, remplacez toutes les + occurences de Linux) par + FreeBSD) à l'aide d'un + éditeur de texte ou la procédure proposée + dans la section suivante. Cela indique à l'installeur + &mathematica;, qui fait appel + à la commande uname -s pour + déterminer le système d'exploitation, de traiter + &os; comme un système d'exploitation de type Linux. + Lancer maintenant la commande MathInstaller + procèdera à l'installation de + &mathematica;. + + + + Modifier les exécutables &mathematica; + + Les procédures que + &mathematica; a créé + lors de l'installation doivent être modifiées + avant que vous ne puissiez les utiliser. Si vous avez choisi + /usr/local/bin comme + répertoires pour les exécutables + &mathematica;, vous trouverez alors + dans ce répertoire des liens symboliques vers les + fichiers nommés math, + mathematica, + Mathematica, et + MathKernel. Dans chacun d'entre eux, + remplacez Linux) par + FreeBSD) avec un éditeur de texte ou + la procédure suivante: + + #!/bin/sh +cd /usr/local/bin +for i in math mathematica Mathematica MathKernel + do sed 's/Linux)/FreeBSD)/g' $i > $i.tmp + sed 's/\/bin\/sh/\/compat\/linux\/bin\/sh/g' $i.tmp > $i + rm $i.tmp + chmod a+x $i +done Obtenir votre mot de passe pour &mathematica; - Avant de pouvoir utiliser - &mathematica;, vous devrez obtenir - un mot de passe de Wolfram qui correspond à - l'“identifiant” de votre machine. - Ethernet adresse MAC - Une fois que vous avez installé les - bibliothèques pour la compatibilité Linux - et décompacté &mathematica; - vous pouvez obtenir l'“identifiant” de votre - machine en exécutant le programme mathinfo - dans le répertoire d'installation. Cet identifiant - machine est basé uniquement sur l'adresse MAC de votre - première carte Ethernet. - - &prompt.root; cd /localdir/Files/SystemFiles/Installation/Binaries/Linux -&prompt.root; mathinfo -disco.example.com 7115-70839-20412 + Quand vous lancez &mathematica; + pour la première fois, un mot de passe vous sera + demandé. Si vous n'avez pas encore + récupéré votre mot de passe auprès + de Wolfram, lancez le programme mathinfo + présent dans le répertoire d'installation afin + d'obtenir l'identifiant de votre machine. Cet + identifiant de machine est basé uniquement sur + l'adresse MAC de votre première carte Ethernet, vous ne + pouvez donc pas utiliser votre copie de + &mathematica; sur une machine + différente. Quand vous vous enregistrez auprès de Wolfram, par courrier électronique, téléphone, ou fax, vous leur communiquerez l'“identifiant” de la machine et ils vous donneront en réponse le mot de passe correspondant qui a la forme de plusieurs groupes - de nombres. Vous pouvez ensuite entrer cette information - quand vous essayez d'exécuter - &mathematica; pour la première - fois comme vous le feriez sous une autre plateforme. + de nombres. @@ -583,10 +595,16 @@ &prompt.root; xset fp rehash Si vous utilisez le serveur - &xfree86;, vous pouvez charger + &xorg;, vous pouvez charger ces répertoires de polices automatiquement en les ajoutant à votre fichier - XF86Config. + xorg.conf. + + + Sous les serveurs &xfree86;, + le fichier de configuration se nomme + XF86Config. + polices de caractères @@ -717,14 +735,14 @@ case "$1" in start) - lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2 + lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2 echo -n " lmgrd" ;; stop) - lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2 + lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2 ;; *) - echo "Usage: `basename $0` {start|stop}" 1>&2 + echo "Usage: `basename $0` {start|stop}" 1>&2 exit 64 ;; esac @@ -1188,7 +1206,7 @@ vous devez fixer les variables d'environnement suivantes: - + @@ -1255,8 +1273,8 @@ En raison d'une particularité de l'émulateur Linux, vous devez créer un répertoire appelé .oracle dans /var/tmp - avant de lancer le programme d'installation. Donnez-y un - accès en écriture pour tout le monde ou faites + avant de lancer le programme d'installation. + Faites en sorte que l'utilisateur oracle en soit le propriétaire. Vous devriez être en mesure d'installer &oracle; sans problème. @@ -1445,7 +1463,7 @@ &sap.r3; 4.6B, &oracle; 8.0.5 - + @@ -1506,7 +1524,7 @@ &sap.r3; 4.6C SR2, &oracle; 8.1.7 - + @@ -1576,7 +1594,7 @@ &sap.r3; 4.6B, &oracle; 8.0.5 - + @@ -1629,7 +1647,7 @@ &sap.r3; 4.6C, &oracle; 8.1.7 - + @@ -1703,7 +1721,7 @@ pour une utilisation en production, un choix plus pointu du matériel est nécessaire: - + @@ -1791,13 +1809,13 @@ de périphériques ont changé, comme les installations ont été effectuées sur du matériel différent - (/dev/da et - /dev/amr respectivement, aussi si + (/dev/da et + /dev/amr respectivement, aussi si l'on utilise un contrôleur AMI MegaRAID, on verra - /dev/amr0s1a à la place de - /dev/da0s1a): + /dev/amr0s1a à la place de + /dev/da0s1a): - + @@ -1809,49 +1827,49 @@ - /dev/da0s1a + /dev/da0s1a 1.016.303 1 / - /dev/da0s1b + /dev/da0s1b 6 swap - /dev/da0s1e + /dev/da0s1e 2.032.623 2 /var - /dev/da0s1f + /dev/da0s1f 8.205.339 8 /usr - /dev/da1s1e + /dev/da1s1e 45.734.361 45 /compat/linux/oracle - /dev/da1s1f + /dev/da1s1f 2.032.623 2 /compat/linux/sapmnt - /dev/da1s1g + /dev/da1s1g 2.032.623 2 /compat/linux/usr/sap @@ -1987,7 +2005,7 @@ Pour une simple installation, il est suffisant de créer les systèmes de fichiers suivants: - + @@ -2065,7 +2083,7 @@ ce sont seulement les valeurs que nous avons utilisés dans notre installation): - + @@ -2106,7 +2124,7 @@ Nous avons également besoin des utilisateurs suivants: - + @@ -2486,7 +2504,7 @@ questions (les valeurs par défaut sont entre crochets, suivies par les entrées clavier): - + @@ -2691,7 +2709,7 @@ questions (les valeurs par défaut sont entre crochets, suivies par les entrées clavier): - + @@ -2878,7 +2896,7 @@ &prompt.root; export TERM=xterm &prompt.root; export ORACLE_TERM=xterm &prompt.root; export ORACLE_HOME=/oracle/IDS -&prompt.root; cd /ORACLE_HOME/orainst_sap +&prompt.root; cd $ORACLE_HOME/orainst_sap &prompt.root; ./orainst Confirmez tous les écrans en appuyant sur @@ -2968,7 +2986,7 @@ par défauts connus (utilisez-en des différents si la sécurité est importante): - + @@ -3110,7 +3128,7 @@ ddic et sap*, faire, au moins, ce qui suit: - + @@ -3227,7 +3245,7 @@ l'installation (exemples pour IDES 46B, 1 Go de mémoire): - + @@ -3266,7 +3284,7 @@ Note &sap; 0013026: - + @@ -3284,7 +3302,7 @@ Note &sap; 0157246: - + @@ -3598,7 +3616,7 @@ total 4 drwxr-xr-x 3 idsadm sapsys 512 May 5 11:20 D00 drwxr-x--x 5 idsadm sapsys 512 May 5 11:35 IDS -lrwxr-xr-x 1 root sapsys 7 May 5 11:35 SYS -> IDS/SYS +lrwxr-xr-x 1 root sapsys 7 May 5 11:35 SYS -> IDS/SYS drwxrwxr-x 2 idsadm sapsys 512 May 5 13:00 tmp drwxrwxr-x 11 idsadm sapsys 512 May 4 14:20 trans ==== //depot/projects/dtrace/doc/nl_NL.ISO8859-1/share/sgml/freebsd.dsl#2 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -189,7 +189,7 @@ (renderas (inherited-attribute-string (normalize "renderas") sect)) (hlevel ;; the apparent section level; (if renderas ;; if not real section level, - (string->number ;; then get the apparent level + (string->number ;; then get the apparent level (substring renderas 4 5)) ;; from "renderas", (SECTLEVEL))) ;; else use the real level (hs (HSIZE (- 4 hlevel)))) ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/book.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.49 - $FreeBSD: doc/zh_CN.GB2312/books/arch-handbook/book.sgml,v 1.1 2006/03/15 19:54:47 delphij Exp $ + Original Revision: 1.50 + $FreeBSD: doc/zh_CN.GB2312/books/arch-handbook/book.sgml,v 1.2 2006/04/13 10:29:00 delphij Exp $ --> + - - + ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#2 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Chinese Documentation Project Original revision: 1.380 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.4 2006/03/15 19:38:53 delphij Exp $ + $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.5 2006/04/13 10:43:58 delphij Exp $ --> @@ -12,9 +12,9 @@ ¸ÅÊö - ±¾Õ½«½éÉÜÐí¶àÓë¸ß¼¶ÍøÂçÓйصĻ°Ìâ¡£ + ±¾Õ½«¾ÍһϵÁÐÓëÍøÂçÓйصĸ߼¶»°Ìâ½øÐÐÌÖÂÛ¡£ - ¶ÁÍêÕâÒ»Õ£¬Äú½«Á˽⣺ + ¶ÁÍêÕâÕ£¬Äú½«Á˽⣺ @@ -22,19 +22,19 @@ - ÈçºÎ°²×° IEEE 802.11 ºÍ &bluetooth;(À¶ÑÀ)É豸¡£ + ÈçºÎÅäÖà IEEE 802.11 ºÍ À¶ÑÀ(&bluetooth;) É豸¡£ - ÔõÑùÓà FreeBSD ×ö"ÇŽÓ(bridge)"¡£ + ÈçºÎÓà FreeBSD ×öÍøÇÅ¡£ - ÈçºÎΪÎÞÅÌ»úÉèÖÃÍøÂçÆô¶¯¡£ + ÈçºÎΪÎÞÅÌ»úÉÏÅäÖÃÍøÂçÆô¶¯¡£ - ÈçºÎÉèÖÃÍøÂçµØַת»»(NAT)¡£ + ÈçºÎÅäÖÃÍøÂçµØַת»» (NAT)¡£ @@ -42,7 +42,7 @@ - ÈçºÎÔÚ FreeBSD Ö÷»úÉÏÉèÖà IPv6¡£ + ÈçºÎÔÚÔËÐÐ FreeBSD µÄ¼ÆËã»úÉÏÅäÖà IPv6¡£ @@ -50,7 +50,7 @@ - ÔÚ¶ÁÕâÕÂ֮ǰ£¬ÄúÓ¦¸Ã£º + ÔÚ¶ÁÕâÕÂ֮ǰ£¬ ÄúÓ¦£º @@ -58,7 +58,7 @@ - ÖªµÀÏà¹ØµÄ»ù±¾ÍøÂçÊõÓï¡£ + ÊìϤ»ù±¾µÄÍøÂçÊõÓï¡£ @@ -102,19 +102,18 @@ ·ÓÉ Íø¹Ø ×ÓÍø - ΪÁËÈÃһ̨Ö÷»úÔÚÍøÄÜÕÒµ½Áíһ̨Ö÷»ú£¬ - ¾Í±ØÐëÒªÓÐÒ»ÖÖ»úÖÆÀ´ÃèÊöÈçºÎ´Óһ̨Ö÷»úÁ¬ÖÁÁíһ̨ÉÏ¡£ ÕâÒ»¹ý³Ì¾ÍÊÇ + ÒªÈÃÍøÂçÉϵÄÁ½Ì¨¼ÆËã»úÄܹ»Ï໥ͨѶ£¬ + ¾Í±ØÐëÓÐÒ»ÖÖÄܹ»ÃèÊöÈçºÎ´Óһ̨¼ÆËã»úµ½Áíһ̨¼ÆËã»úµÄ»úÖÆ£¬ ÕâÒ»»úÖƳÆ×÷ ·ÓÉÑ¡Ôñ(routing)¡£ - ·ÓÉ ÊÇÒ»¶ÔÔ¤Ïȶ¨ÒåµÄµØÖ·£º + ·ÓÉÏî ÊÇÒ»¶ÔÔ¤Ïȶ¨ÒåµÄµØÖ·£º Ä¿µÄµØ(destination) ºÍ Íø¹Ø(gateway)¡£ - Õâ¶ÔµØַ˵Ã÷ÁË£¬ ÏëÒªµ½´ï Ä¿µÄµØ(destination)£¬ - ¾ÍÐèҪͨ¹ý Íø¹Ø(gateway) ½øÐÐͨÐÅ¡£ - Ä¿µÄµØÖ·ÓÐÈýÖÖÀàÐÍ£º µ¥¸öÖ÷»ú£¬ - ×ÓÍø(subnets) ºÍ ĬÈÏ(default)¡£ - Èç¹ûûÓÐÓ¦ÓÃÆäËü·ÓÉ£¬ ¾Í»áʹÓà ĬÈÏ·ÓÉ¡£ - ¹ØÓÚĬÈÏ·Óɽ«ÔÚºóÃæ½øÐиü¶àµÄÌÖÂÛ¡£ Íø¹ØÒ²ÓÐÈýÖÖÀàÐÍ£º - µ¥¸öÖ÷»ú£¬ ½Ó¿Ú (Ò²½ÐÁ¬½Ó(links)) - ºÍÒÔÌ«ÍøÓ²¼þµØÖ·(MAC addresses)¡£ + Õâ¸öµØÖ·¶ÔËù±í´ïµÄÒâÒåÊÇ£¬ ͨ¹ý Íø¹Ø + Äܹ»Íê³ÉÓë Ä¿µÄµØ µÄͨÐÅ¡£ + ÓÐÈýÖÖÀàÐ͵ÄÄ¿µÄµØÖ·£º µ¥¸öÖ÷»ú¡¢ ×ÓÍø¡¢ ÒÔ¼° ĬÈÏ¡£ + Èç¹ûûÓпÉÓõÄÆäËü·ÓÉ£¬ ¾Í»áʹÓà ĬÈÏ·ÓÉ£¬ + ÓйØĬÈÏ·ÓɵÄÄÚÈÝ£¬ ½«ÔÚÉÔºóµÄÕ½ÚÖнøÐÐÌÖÂÛ¡£ Íø¹ØÒ²ÓÐÈýÖÖÀàÐÍ£º + µ¥¸öÖ÷»ú£¬ ÍøÂç½Ó¿Ú (Ò²½Ð Á´Â· (links)) + ºÍÒÔÌ«ÍøÓ²¼þµØÖ· (MAC µØÖ·)¡£ @@ -139,16 +138,16 @@ 224 link#1 UC 0 0 ĬÈÏ·ÓÉ - Í·Á½ÐÐÖ¸¶¨Ä¬ÈÏ·ÓÉ (ÎÒÃÇ»áÔÚ ÏÂÒ»½Ú ˵Ã÷) - ºÍ ±¾»ú(localhost) ·ÓÉ¡£ + Í·Á½Ðиø³öÁ˵±Ç°ÅäÖÃÖеÄĬÈÏ·ÓÉ (½«ÔÚ ÏÂÒ»½Ú ÖнøÐнéÉÜ) + ºÍ localhost (±¾»ú) ·ÓÉ¡£ »Ø»·É豸 - ÕâÕÅ·ÓɱíÀïÖ¸¶¨ÓÃÓÚ localhost µÄ½Ó¿Ú + ÕâÀïµÄ·ÓɱíÖиø³öµÄÓÃÓÚ localhost µÄ½Ó¿Ú (Netif ÁÐ) ÊÇ lo0£¬ Ò²¾ÍÊÇ´ó¼ÒÊìÖªµÄ »Ø»·É豸¡£ - ËüʹµÃËùÓÐÒÔ´ËΪ Ä¿µÄµØ µÄͨÐÅÁôÔÚ±¾»ú£¬ - ¶ø²»ÊÇͨ¹ý LAN ·¢³ö£¬ ÒòΪËü»áÔÚ¿ªÊ¼µÄµØ·½¾Í½áÊø²¢·µ»Ø¡£ + Ëü±íʾËùÓÐÒÔ´ËΪ Ä¿µÄµØ µÄͨÐŶ¼ÁôÔÚ±¾»ú£¬ + ¶ø²»Í¨¹ý LAN ·¢³ö£¬ ÒòΪÕâЩÁ÷Á¿×îÖÕ»á»Øµ½Æðµã¡£ ÒÔÌ«Íø MAC µØÖ· @@ -3328,7 +3327,7 @@ IPv6 IPv6 (Ò²±»³Æ×÷ IPng ÏÂÒ»´ú IP) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 15 15:17:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6063316A403; Sat, 15 Apr 2006 15:17:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 389E416A401 for ; Sat, 15 Apr 2006 15:17:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAA1043D46 for ; Sat, 15 Apr 2006 15:17:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FFHtKD067443 for ; Sat, 15 Apr 2006 15:17:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FFHtKP067437 for perforce@freebsd.org; Sat, 15 Apr 2006 15:17:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 15 Apr 2006 15:17:55 GMT Message-Id: <200604151517.k3FFHtKP067437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 95329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 15:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=95329 Change 95329 by rwatson@rwatson_fledge on 2006/04/15 15:17:42 UKUUG LISA paper on Audit. Affected files ... .. //depot/projects/trustedbsd/www/20060303-ukuug2006lisa-audit.pdf#1 add .. //depot/projects/trustedbsd/www/docs.bib#4 edit Differences ... ==== //depot/projects/trustedbsd/www/docs.bib#4 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/docs.bib#3 $ + $P4: //depot/projects/trustedbsd/www/docs.bib#4 $ @@ -329,4 +329,41 @@ Biba integrity policy based on the framework. + + The FreeBSD Audit System + + + Robert N. M. Watson + University of Cambridge, TrustedBSD Project + + + + Wayne Salamon + TrustedBSD Project + + + + UKUUG LISA Conference + Durham UK + March, 2006 + + + + + + + This paper describes the Common Criteria security event + auditing implementation added to the FreeBSD operating system by the + TrustedBSD Project. Audit is a critical element in operating system + security evaluation and operation, but both the standards-based and + operational requirements are complex. This paper describes the + requirements, FreeBSD kernel implementation, extensible file format + adopted from OpenSolaris BSM, mechanisms used for processing and + maintaining the audit trail, and the OpenBSM audit library and tool + set. Of importance is not just the content of audit records, but + also the reliability guarantees associated with the queuing and + delivery mechanisms. + + + From owner-p4-projects@FreeBSD.ORG Sat Apr 15 15:18:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 122BF16A405; Sat, 15 Apr 2006 15:18:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE7D516A400 for ; Sat, 15 Apr 2006 15:18:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9746F43D45 for ; Sat, 15 Apr 2006 15:18:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FFIvAN068184 for ; Sat, 15 Apr 2006 15:18:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FFIvGB068176 for perforce@freebsd.org; Sat, 15 Apr 2006 15:18:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 15 Apr 2006 15:18:57 GMT Message-Id: <200604151518.k3FFIvGB068176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 95330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 15:18:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=95330 Change 95330 by rwatson@rwatson_fledge on 2006/04/15 15:18:37 Install the audit paper. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#5 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#5 $ STYLESHEET= page.xsl @@ -62,6 +62,7 @@ DATA+= sebsd-july2003.pdf DATA+= 20000809-trustedbsd-announcement.txt DATA+= robots.txt +DATA+= 20060303-ukuug2006lisa-audit.pdf GLOBAL_XML= sidebar.xml From owner-p4-projects@FreeBSD.ORG Sat Apr 15 17:52:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 754B916A409; Sat, 15 Apr 2006 17:52:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0583B16A406 for ; Sat, 15 Apr 2006 17:52:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D2AD43D4C for ; Sat, 15 Apr 2006 17:52:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FHqPIb061348 for ; Sat, 15 Apr 2006 17:52:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FHqNeM061322 for perforce@freebsd.org; Sat, 15 Apr 2006 17:52:23 GMT (envelope-from imp@freebsd.org) Date: Sat, 15 Apr 2006 17:52:23 GMT Message-Id: <200604151752.k3FHqNeM061322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 17:52:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=95341 Change 95341 by imp@imp_harmony on 2006/04/15 17:52:07 IFC @95339 Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/arm/src/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/arm/src/sys/arm/include/atomic.h#6 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/inc/AT91RM9200.h#3 integrate .. //depot/projects/arm/src/sys/conf/files#25 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cmbat.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_dock.c#1 branch .. //depot/projects/arm/src/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#11 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_state.c#7 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.c#5 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/arm/src/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/arm/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/arm/src/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/arm/src/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/xe/if_xe.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#12 integrate .. //depot/projects/arm/src/sys/kern/kern_event.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/arm/src/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi_dock/Makefile#1 branch .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#6 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.544 2006/04/12 04:22:50 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $"); /* * Manages physical address maps. @@ -106,6 +106,7 @@ */ #include "opt_msgbuf.h" +#include "opt_pmap.h" #include #include ==== //depot/projects/arm/src/sys/arm/include/asmacros.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.4 2005/04/07 22:03:04 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.5 2006/04/13 14:25:28 cognet Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -159,12 +159,12 @@ #define DO_AST \ ldr r0, [sp] /* Get the SPSR from stack */ ;\ mrs r4, cpsr /* save CPSR */ ;\ - orr r1, r4, #(I32_bit) ;\ + orr r1, r4, #(I32_bit|F32_bit) ;\ msr cpsr_c, r1 /* Disable interrupts */ ;\ and r0, r0, #(PSR_MODE) /* Returning to USR mode? */ ;\ teq r0, #(PSR_USR32_MODE) ;\ bne 2f /* Nope, get out now */ ;\ - bic r4, r4, #(I32_bit) ;\ + bic r4, r4, #(I32_bit|F32_bit) ;\ 1: ldr r5, .Lcurthread ;\ ldr r5, [r5] ;\ ldr r1, [r5, #(TD_FLAGS)] ;\ @@ -174,7 +174,7 @@ msr cpsr_c, r4 /* Restore interrupts */ ;\ mov r0, sp ;\ bl _C_LABEL(ast) /* ast(frame) */ ;\ - orr r0, r4, #(I32_bit) ;\ + orr r0, r4, #(I32_bit|F32_bit) ;\ msr cpsr_c, r0 ;\ b 1b ;\ 2: ==== //depot/projects/arm/src/sys/arm/include/atomic.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.17 2006/02/06 18:29:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.18 2006/04/13 14:25:28 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -61,7 +61,7 @@ "orr %1, %0, %2;" \ "msr cpsr_all, %1;" \ : "=r" (cpsr_save), "=r" (tmp) \ - : "I" (I32_bit) \ + : "I" (I32_bit | F32_bit) \ : "cc" ); \ (expr); \ __asm __volatile( \ ==== //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.6 2006/01/23 14:03:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.7 2006/04/13 15:07:59 cognet Exp $"); #include #include @@ -381,7 +381,8 @@ if (rv == NULL) return (NULL); if (type != SYS_RES_IRQ) { - bh += (rman_get_start(rv)); + if (type == SYS_RES_MEMORY) + bh += (rman_get_start(rv)); rman_set_bustag(rv, bt); rman_set_bushandle(rv, bh); if (flags & RF_ACTIVE) { ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.1 2006/04/12 21:22:44 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.2 2006/04/13 17:44:05 imp Exp $ PROG=boot0 SRCS=arm_init.s at91rm9200_lowlevel.c lib.c main.c xmodem.c @@ -6,6 +6,7 @@ LDFLAGS=-e 0 -T linker.cfg CFLAGS=-O2 -mcpu=arm9 -ffreestanding -I${.CURDIR}/../inc CFLAGS+=-DBOOT0_KB9202 +#CFLAGS+=-DBOOT0_TSC OBJS+= ${SRCS:N*.h:R:S/$/.o/g} CLEANFILES=${OBJS} ${PROG} ${PROG}.out ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c#5 (text) ==== @@ -24,7 +24,7 @@ * This software is derived from software provide by Kwikbyte who specifically * disclaimed copyright on the code. * - * $FreeBSD: src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c,v 1.1 2006/04/12 21:22:44 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c,v 1.2 2006/04/13 17:39:34 imp Exp $ */ #include "AT91RM9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#3 (text) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.1 2006/04/12 21:22:44 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.2 2006/04/13 17:31:02 imp Exp $ */ #include "AT91RM9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/inc/AT91RM9200.h#3 (text) ==== @@ -7,7 +7,7 @@ // fitness for any particular purpose, or against the infringements of // intellectual property rights of others. // ---------------------------------------------------------------------------- -// $FreeBSD: src/sys/boot/arm/at91/inc/AT91RM9200.h,v 1.1 2006/04/12 21:23:36 imp Exp $ +// $FreeBSD: src/sys/boot/arm/at91/inc/AT91RM9200.h,v 1.3 2006/04/15 02:51:53 imp Exp $ // // File Name : AT91RM9200.h // Object : AT91RM9200 definitions @@ -39,7 +39,7 @@ // ---------------------------------------------------------------------------- #ifndef AT91RM9200_H -#define AT91RM9200_H +#define AT91RM9200_H typedef volatile unsigned int AT91_REG;// Hardware register definition @@ -321,50 +321,50 @@ } AT91S_MC, *AT91PS_MC; // -------- MC_RCR : (MC Offset: 0x0) MC Remap Control Register -------- -#define AT91C_MC_RCB (0x1u << 0) // (MC) Remap Command Bit +#define AT91C_MC_RCB (0x1u << 0) // (MC) Remap Command Bit // -------- MC_ASR : (MC Offset: 0x4) MC Abort Status Register -------- -#define AT91C_MC_UNDADD (0x1u << 0) // (MC) Undefined Addess Abort Status -#define AT91C_MC_MISADD (0x1u << 1) // (MC) Misaligned Addess Abort Status -#define AT91C_MC_MPU (0x1u << 2) // (MC) Memory protection Unit Abort Status -#define AT91C_MC_ABTSZ (0x3u << 8) // (MC) Abort Size Status -#define AT91C_MC_ABTSZ_BYTE (0x0u << 8) // (MC) Byte -#define AT91C_MC_ABTSZ_HWORD (0x1u << 8) // (MC) Half-word -#define AT91C_MC_ABTSZ_WORD (0x2u << 8) // (MC) Word -#define AT91C_MC_ABTTYP (0x3u << 10) // (MC) Abort Type Status -#define AT91C_MC_ABTTYP_DATAR (0x0u << 10) // (MC) Data Read -#define AT91C_MC_ABTTYP_DATAW (0x1u << 10) // (MC) Data Write -#define AT91C_MC_ABTTYP_FETCH (0x2u << 10) // (MC) Code Fetch -#define AT91C_MC_MST0 (0x1u << 16) // (MC) Master 0 Abort Source -#define AT91C_MC_MST1 (0x1u << 17) // (MC) Master 1 Abort Source -#define AT91C_MC_SVMST0 (0x1u << 24) // (MC) Saved Master 0 Abort Source -#define AT91C_MC_SVMST1 (0x1u << 25) // (MC) Saved Master 1 Abort Source +#define AT91C_MC_UNDADD (0x1u << 0) // (MC) Undefined Addess Abort Status +#define AT91C_MC_MISADD (0x1u << 1) // (MC) Misaligned Addess Abort Status +#define AT91C_MC_MPU (0x1u << 2) // (MC) Memory protection Unit Abort Status +#define AT91C_MC_ABTSZ (0x3u << 8) // (MC) Abort Size Status +#define AT91C_MC_ABTSZ_BYTE (0x0u << 8) // (MC) Byte +#define AT91C_MC_ABTSZ_HWORD (0x1u << 8) // (MC) Half-word +#define AT91C_MC_ABTSZ_WORD (0x2u << 8) // (MC) Word +#define AT91C_MC_ABTTYP (0x3u << 10) // (MC) Abort Type Status +#define AT91C_MC_ABTTYP_DATAR (0x0u << 10) // (MC) Data Read +#define AT91C_MC_ABTTYP_DATAW (0x1u << 10) // (MC) Data Write +#define AT91C_MC_ABTTYP_FETCH (0x2u << 10) // (MC) Code Fetch +#define AT91C_MC_MST0 (0x1u << 16) // (MC) Master 0 Abort Source +#define AT91C_MC_MST1 (0x1u << 17) // (MC) Master 1 Abort Source +#define AT91C_MC_SVMST0 (0x1u << 24) // (MC) Saved Master 0 Abort Source +#define AT91C_MC_SVMST1 (0x1u << 25) // (MC) Saved Master 1 Abort Source // -------- MC_PUIA : (MC Offset: 0x10) MC Protection Unit Area -------- -#define AT91C_MC_PROT (0x3u << 0) // (MC) Protection -#define AT91C_MC_PROT_PNAUNA 0x0u // (MC) Privilege: No Access, User: No Access -#define AT91C_MC_PROT_PRWUNA 0x1u // (MC) Privilege: Read/Write, User: No Access -#define AT91C_MC_PROT_PRWURO 0x2u // (MC) Privilege: Read/Write, User: Read Only -#define AT91C_MC_PROT_PRWURW 0x3u // (MC) Privilege: Read/Write, User: Read/Write -#define AT91C_MC_SIZE (0xFu << 4) // (MC) Internal Area Size -#define AT91C_MC_SIZE_1KB (0x0u << 4) // (MC) Area size 1KByte -#define AT91C_MC_SIZE_2KB (0x1u << 4) // (MC) Area size 2KByte -#define AT91C_MC_SIZE_4KB (0x2u << 4) // (MC) Area size 4KByte -#define AT91C_MC_SIZE_8KB (0x3u << 4) // (MC) Area size 8KByte -#define AT91C_MC_SIZE_16KB (0x4u << 4) // (MC) Area size 16KByte -#define AT91C_MC_SIZE_32KB (0x5u << 4) // (MC) Area size 32KByte -#define AT91C_MC_SIZE_64KB (0x6u << 4) // (MC) Area size 64KByte -#define AT91C_MC_SIZE_128KB (0x7u << 4) // (MC) Area size 128KByte -#define AT91C_MC_SIZE_256KB (0x8u << 4) // (MC) Area size 256KByte -#define AT91C_MC_SIZE_512KB (0x9u << 4) // (MC) Area size 512KByte -#define AT91C_MC_SIZE_1MB (0xAu << 4) // (MC) Area size 1MByte -#define AT91C_MC_SIZE_2MB (0xBu << 4) // (MC) Area size 2MByte -#define AT91C_MC_SIZE_4MB (0xCu << 4) // (MC) Area size 4MByte -#define AT91C_MC_SIZE_8MB (0xDu << 4) // (MC) Area size 8MByte -#define AT91C_MC_SIZE_16MB (0xEu << 4) // (MC) Area size 16MByte -#define AT91C_MC_SIZE_64MB (0xFu << 4) // (MC) Area size 64MByte -#define AT91C_MC_BA (0x3FFFFu << 10) // (MC) Internal Area Base Address +#define AT91C_MC_PROT (0x3u << 0) // (MC) Protection +#define AT91C_MC_PROT_PNAUNA 0x0u // (MC) Privilege: No Access, User: No Access +#define AT91C_MC_PROT_PRWUNA 0x1u // (MC) Privilege: Read/Write, User: No Access +#define AT91C_MC_PROT_PRWURO 0x2u // (MC) Privilege: Read/Write, User: Read Only +#define AT91C_MC_PROT_PRWURW 0x3u // (MC) Privilege: Read/Write, User: Read/Write +#define AT91C_MC_SIZE (0xFu << 4) // (MC) Internal Area Size +#define AT91C_MC_SIZE_1KB (0x0u << 4) // (MC) Area size 1KByte +#define AT91C_MC_SIZE_2KB (0x1u << 4) // (MC) Area size 2KByte +#define AT91C_MC_SIZE_4KB (0x2u << 4) // (MC) Area size 4KByte +#define AT91C_MC_SIZE_8KB (0x3u << 4) // (MC) Area size 8KByte +#define AT91C_MC_SIZE_16KB (0x4u << 4) // (MC) Area size 16KByte +#define AT91C_MC_SIZE_32KB (0x5u << 4) // (MC) Area size 32KByte +#define AT91C_MC_SIZE_64KB (0x6u << 4) // (MC) Area size 64KByte +#define AT91C_MC_SIZE_128KB (0x7u << 4) // (MC) Area size 128KByte +#define AT91C_MC_SIZE_256KB (0x8u << 4) // (MC) Area size 256KByte +#define AT91C_MC_SIZE_512KB (0x9u << 4) // (MC) Area size 512KByte +#define AT91C_MC_SIZE_1MB (0xAu << 4) // (MC) Area size 1MByte +#define AT91C_MC_SIZE_2MB (0xBu << 4) // (MC) Area size 2MByte +#define AT91C_MC_SIZE_4MB (0xCu << 4) // (MC) Area size 4MByte +#define AT91C_MC_SIZE_8MB (0xDu << 4) // (MC) Area size 8MByte +#define AT91C_MC_SIZE_16MB (0xEu << 4) // (MC) Area size 16MByte +#define AT91C_MC_SIZE_64MB (0xFu << 4) // (MC) Area size 64MByte +#define AT91C_MC_BA (0x3FFFFu << 10) // (MC) Internal Area Base Address // -------- MC_PUP : (MC Offset: 0x50) MC Protection Unit Peripheral -------- // -------- MC_PUER : (MC Offset: 0x54) MC Protection Unit Area -------- -#define AT91C_MC_PUEB (0x1u << 0) // (MC) Protection Unit enable Bit +#define AT91C_MC_PUEB (0x1u << 0) // (MC) Protection Unit enable Bit // ***************************************************************************** // SOFTWARE API DEFINITION FOR Real-time Clock Alarm and Parallel Load Interface @@ -385,52 +385,52 @@ } AT91S_RTC, *AT91PS_RTC; // -------- RTC_CR : (RTC Offset: 0x0) RTC Control Register -------- -#define AT91C_RTC_UPDTIM (0x1u << 0) // (RTC) Update Request Time Register -#define AT91C_RTC_UPDCAL (0x1u << 1) // (RTC) Update Request Calendar Register -#define AT91C_RTC_TIMEVSEL (0x3u << 8) // (RTC) Time Event Selection -#define AT91C_RTC_TIMEVSEL_MINUTE (0x0u << 8) // (RTC) Minute change. -#define AT91C_RTC_TIMEVSEL_HOUR (0x1u << 8) // (RTC) Hour change. -#define AT91C_RTC_TIMEVSEL_DAY24 (0x2u << 8) // (RTC) Every day at midnight. -#define AT91C_RTC_TIMEVSEL_DAY12 (0x3u << 8) // (RTC) Every day at noon. -#define AT91C_RTC_CALEVSEL (0x3u << 16) // (RTC) Calendar Event Selection -#define AT91C_RTC_CALEVSEL_WEEK (0x0u << 16) // (RTC) Week change (every Monday at time 00:00:00). -#define AT91C_RTC_CALEVSEL_MONTH (0x1u << 16) // (RTC) Month change (every 01 of each month at time 00:00:00). -#define AT91C_RTC_CALEVSEL_YEAR (0x2u << 16) // (RTC) Year change (every January 1 at time 00:00:00). +#define AT91C_RTC_UPDTIM (0x1u << 0) // (RTC) Update Request Time Register +#define AT91C_RTC_UPDCAL (0x1u << 1) // (RTC) Update Request Calendar Register +#define AT91C_RTC_TIMEVSEL (0x3u << 8) // (RTC) Time Event Selection +#define AT91C_RTC_TIMEVSEL_MINUTE (0x0u << 8) // (RTC) Minute change. +#define AT91C_RTC_TIMEVSEL_HOUR (0x1u << 8) // (RTC) Hour change. +#define AT91C_RTC_TIMEVSEL_DAY24 (0x2u << 8) // (RTC) Every day at midnight. +#define AT91C_RTC_TIMEVSEL_DAY12 (0x3u << 8) // (RTC) Every day at noon. +#define AT91C_RTC_CALEVSEL (0x3u << 16) // (RTC) Calendar Event Selection +#define AT91C_RTC_CALEVSEL_WEEK (0x0u << 16) // (RTC) Week change (every Monday at time 00:00:00). +#define AT91C_RTC_CALEVSEL_MONTH (0x1u << 16) // (RTC) Month change (every 01 of each month at time 00:00:00). +#define AT91C_RTC_CALEVSEL_YEAR (0x2u << 16) // (RTC) Year change (every January 1 at time 00:00:00). // -------- RTC_MR : (RTC Offset: 0x4) RTC Mode Register -------- -#define AT91C_RTC_HRMOD (0x1u << 0) // (RTC) 12-24 hour Mode +#define AT91C_RTC_HRMOD (0x1u << 0) // (RTC) 12-24 hour Mode // -------- RTC_TIMR : (RTC Offset: 0x8) RTC Time Register -------- -#define AT91C_RTC_SEC (0x7Fu << 0) // (RTC) Current Second -#define AT91C_RTC_MIN (0x7Fu << 8) // (RTC) Current Minute -#define AT91C_RTC_HOUR (0x1Fu << 16) // (RTC) Current Hour -#define AT91C_RTC_AMPM (0x1u << 22) // (RTC) Ante Meridiem, Post Meridiem Indicator +#define AT91C_RTC_SEC (0x7Fu << 0) // (RTC) Current Second +#define AT91C_RTC_MIN (0x7Fu << 8) // (RTC) Current Minute +#define AT91C_RTC_HOUR (0x1Fu << 16) // (RTC) Current Hour +#define AT91C_RTC_AMPM (0x1u << 22) // (RTC) Ante Meridiem, Post Meridiem Indicator // -------- RTC_CALR : (RTC Offset: 0xc) RTC Calendar Register -------- -#define AT91C_RTC_CENT (0x3Fu << 0) // (RTC) Current Century -#define AT91C_RTC_YEAR (0xFFu << 8) // (RTC) Current Year -#define AT91C_RTC_MONTH (0x1Fu << 16) // (RTC) Current Month -#define AT91C_RTC_DAY (0x7u << 21) // (RTC) Current Day -#define AT91C_RTC_DATE (0x3Fu << 24) // (RTC) Current Date +#define AT91C_RTC_CENT (0x3Fu << 0) // (RTC) Current Century +#define AT91C_RTC_YEAR (0xFFu << 8) // (RTC) Current Year +#define AT91C_RTC_MONTH (0x1Fu << 16) // (RTC) Current Month +#define AT91C_RTC_DAY (0x7u << 21) // (RTC) Current Day +#define AT91C_RTC_DATE (0x3Fu << 24) // (RTC) Current Date // -------- RTC_TIMALR : (RTC Offset: 0x10) RTC Time Alarm Register -------- -#define AT91C_RTC_SECEN (0x1u << 7) // (RTC) Second Alarm Enable -#define AT91C_RTC_MINEN (0x1u << 15) // (RTC) Minute Alarm -#define AT91C_RTC_HOUREN (0x1u << 23) // (RTC) Current Hour +#define AT91C_RTC_SECEN (0x1u << 7) // (RTC) Second Alarm Enable +#define AT91C_RTC_MINEN (0x1u << 15) // (RTC) Minute Alarm +#define AT91C_RTC_HOUREN (0x1u << 23) // (RTC) Current Hour // -------- RTC_CALALR : (RTC Offset: 0x14) RTC Calendar Alarm Register -------- -#define AT91C_RTC_MONTHEN (0x1u << 23) // (RTC) Month Alarm Enable -#define AT91C_RTC_DATEEN (0x1u << 31) // (RTC) Date Alarm Enable +#define AT91C_RTC_MONTHEN (0x1u << 23) // (RTC) Month Alarm Enable +#define AT91C_RTC_DATEEN (0x1u << 31) // (RTC) Date Alarm Enable // -------- RTC_SR : (RTC Offset: 0x18) RTC Status Register -------- -#define AT91C_RTC_ACKUPD (0x1u << 0) // (RTC) Acknowledge for Update -#define AT91C_RTC_ALARM (0x1u << 1) // (RTC) Alarm Flag -#define AT91C_RTC_SECEV (0x1u << 2) // (RTC) Second Event -#define AT91C_RTC_TIMEV (0x1u << 3) // (RTC) Time Event -#define AT91C_RTC_CALEV (0x1u << 4) // (RTC) Calendar event +#define AT91C_RTC_ACKUPD (0x1u << 0) // (RTC) Acknowledge for Update +#define AT91C_RTC_ALARM (0x1u << 1) // (RTC) Alarm Flag +#define AT91C_RTC_SECEV (0x1u << 2) // (RTC) Second Event +#define AT91C_RTC_TIMEV (0x1u << 3) // (RTC) Time Event +#define AT91C_RTC_CALEV (0x1u << 4) // (RTC) Calendar event // -------- RTC_SCCR : (RTC Offset: 0x1c) RTC Status Clear Command Register -------- // -------- RTC_IER : (RTC Offset: 0x20) RTC Interrupt Enable Register -------- // -------- RTC_IDR : (RTC Offset: 0x24) RTC Interrupt Disable Register -------- // -------- RTC_IMR : (RTC Offset: 0x28) RTC Interrupt Mask Register -------- // -------- RTC_VER : (RTC Offset: 0x2c) RTC Valid Entry Register -------- -#define AT91C_RTC_NVTIM (0x1u << 0) // (RTC) Non valid Time -#define AT91C_RTC_NVCAL (0x1u << 1) // (RTC) Non valid Calendar -#define AT91C_RTC_NVTIMALR (0x1u << 2) // (RTC) Non valid time Alarm -#define AT91C_RTC_NVCALALR (0x1u << 3) // (RTC) Nonvalid Calendar Alarm +#define AT91C_RTC_NVTIM (0x1u << 0) // (RTC) Non valid Time +#define AT91C_RTC_NVCAL (0x1u << 1) // (RTC) Non valid Calendar +#define AT91C_RTC_NVTIMALR (0x1u << 2) // (RTC) Non valid time Alarm +#define AT91C_RTC_NVCALALR (0x1u << 3) // (RTC) Nonvalid Calendar Alarm // ***************************************************************************** // SOFTWARE API DEFINITION FOR System Timer Interface @@ -449,27 +449,27 @@ } AT91S_ST, *AT91PS_ST; // -------- ST_CR : (ST Offset: 0x0) System Timer Control Register -------- -#define AT91C_ST_WDRST (0x1u << 0) // (ST) Watchdog Timer Restart +#define AT91C_ST_WDRST (0x1u << 0) // (ST) Watchdog Timer Restart // -------- ST_PIMR : (ST Offset: 0x4) System Timer Period Interval Mode Register -------- -#define AT91C_ST_PIV (0xFFFFu << 0) // (ST) Watchdog Timer Restart +#define AT91C_ST_PIV (0xFFFFu << 0) // (ST) Watchdog Timer Restart // -------- ST_WDMR : (ST Offset: 0x8) System Timer Watchdog Mode Register -------- -#define AT91C_ST_WDV (0xFFFFu << 0) // (ST) Watchdog Timer Restart -#define AT91C_ST_RSTEN (0x1u << 16) // (ST) Reset Enable -#define AT91C_ST_EXTEN (0x1u << 17) // (ST) External Signal Assertion Enable +#define AT91C_ST_WDV (0xFFFFu << 0) // (ST) Watchdog Timer Restart +#define AT91C_ST_RSTEN (0x1u << 16) // (ST) Reset Enable +#define AT91C_ST_EXTEN (0x1u << 17) // (ST) External Signal Assertion Enable // -------- ST_RTMR : (ST Offset: 0xc) System Timer Real-time Mode Register -------- -#define AT91C_ST_RTPRES (0xFFFFu << 0) // (ST) Real-time Timer Prescaler Value +#define AT91C_ST_RTPRES (0xFFFFu << 0) // (ST) Real-time Timer Prescaler Value // -------- ST_SR : (ST Offset: 0x10) System Timer Status Register -------- -#define AT91C_ST_PITS (0x1u << 0) // (ST) Period Interval Timer Interrupt -#define AT91C_ST_WDOVF (0x1u << 1) // (ST) Watchdog Overflow -#define AT91C_ST_RTTINC (0x1u << 2) // (ST) Real-time Timer Increment -#define AT91C_ST_ALMS (0x1u << 3) // (ST) Alarm Status +#define AT91C_ST_PITS (0x1u << 0) // (ST) Period Interval Timer Interrupt +#define AT91C_ST_WDOVF (0x1u << 1) // (ST) Watchdog Overflow +#define AT91C_ST_RTTINC (0x1u << 2) // (ST) Real-time Timer Increment +#define AT91C_ST_ALMS (0x1u << 3) // (ST) Alarm Status // -------- ST_IER : (ST Offset: 0x14) System Timer Interrupt Enable Register -------- // -------- ST_IDR : (ST Offset: 0x18) System Timer Interrupt Disable Register -------- // -------- ST_IMR : (ST Offset: 0x1c) System Timer Interrupt Mask Register -------- // -------- ST_RTAR : (ST Offset: 0x20) System Timer Real-time Alarm Register -------- -#define AT91C_ST_ALMV (0xFFFFFu << 0) // (ST) Alarm Value Value +#define AT91C_ST_ALMV (0xFFFFFu << 0) // (ST) Alarm Value Value // -------- ST_CRTR : (ST Offset: 0x24) System Timer Current Real-time Register -------- -#define AT91C_ST_CRTV (0xFFFFFu << 0) // (ST) Current Real-time Value +#define AT91C_ST_CRTV (0xFFFFFu << 0) // (ST) Current Real-time Value // ***************************************************************************** // SOFTWARE API DEFINITION FOR Power Management Controler @@ -493,53 +493,53 @@ } AT91S_PMC, *AT91PS_PMC; // -------- PMC_SCER : (PMC Offset: 0x0) System Clock Enable Register -------- -#define AT91C_PMC_PCK (0x1u << 0) // (PMC) Processor Clock -#define AT91C_PMC_UDP (0x1u << 1) // (PMC) USB Device Port Clock -#define AT91C_PMC_MCKUDP (0x1u << 2) // (PMC) USB Device Port Master Clock Automatic Disable on Suspend -#define AT91C_PMC_UHP (0x1u << 4) // (PMC) USB Host Port Clock -#define AT91C_PMC_PCK0 (0x1u << 8) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK1 (0x1u << 9) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK2 (0x1u << 10) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK3 (0x1u << 11) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK4 (0x1u << 12) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK5 (0x1u << 13) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK6 (0x1u << 14) // (PMC) Programmable Clock Output -#define AT91C_PMC_PCK7 (0x1u << 15) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK (0x1u << 0) // (PMC) Processor Clock +#define AT91C_PMC_UDP (0x1u << 1) // (PMC) USB Device Port Clock +#define AT91C_PMC_MCKUDP (0x1u << 2) // (PMC) USB Device Port Master Clock Automatic Disable on Suspend +#define AT91C_PMC_UHP (0x1u << 4) // (PMC) USB Host Port Clock +#define AT91C_PMC_PCK0 (0x1u << 8) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK1 (0x1u << 9) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK2 (0x1u << 10) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK3 (0x1u << 11) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK4 (0x1u << 12) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK5 (0x1u << 13) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK6 (0x1u << 14) // (PMC) Programmable Clock Output +#define AT91C_PMC_PCK7 (0x1u << 15) // (PMC) Programmable Clock Output // -------- PMC_SCDR : (PMC Offset: 0x4) System Clock Disable Register -------- // -------- PMC_SCSR : (PMC Offset: 0x8) System Clock Status Register -------- // -------- PMC_MCKR : (PMC Offset: 0x30) Master Clock Register -------- -#define AT91C_PMC_CSS (0x3u << 0) // (PMC) Programmable Clock Selection -#define AT91C_PMC_CSS_SLOW_CLK 0x0u // (PMC) Slow Clock is selected -#define AT91C_PMC_CSS_MAIN_CLK 0x1u // (PMC) Main Clock is selected -#define AT91C_PMC_CSS_PLLA_CLK 0x2u // (PMC) Clock from PLL A is selected -#define AT91C_PMC_CSS_PLLB_CLK 0x3u // (PMC) Clock from PLL B is selected -#define AT91C_PMC_PRES (0x7u << 2) // (PMC) Programmable Clock Prescaler -#define AT91C_PMC_PRES_CLK (0x0u << 2) // (PMC) Selected clock -#define AT91C_PMC_PRES_CLK_2 (0x1u << 2) // (PMC) Selected clock divided by 2 -#define AT91C_PMC_PRES_CLK_4 (0x2u << 2) // (PMC) Selected clock divided by 4 -#define AT91C_PMC_PRES_CLK_8 (0x3u << 2) // (PMC) Selected clock divided by 8 -#define AT91C_PMC_PRES_CLK_16 (0x4u << 2) // (PMC) Selected clock divided by 16 -#define AT91C_PMC_PRES_CLK_32 (0x5u << 2) // (PMC) Selected clock divided by 32 -#define AT91C_PMC_PRES_CLK_64 (0x6u << 2) // (PMC) Selected clock divided by 64 -#define AT91C_PMC_MDIV (0x3u << 8) // (PMC) Master Clock Division -#define AT91C_PMC_MDIV_1 (0x0u << 8) // (PMC) The master clock and the processor clock are the same -#define AT91C_PMC_MDIV_2 (0x1u << 8) // (PMC) The processor clock is twice as fast as the master clock -#define AT91C_PMC_MDIV_3 (0x2u << 8) // (PMC) The processor clock is three times faster than the master clock -#define AT91C_PMC_MDIV_4 (0x3u << 8) // (PMC) The processor clock is four times faster than the master clock +#define AT91C_PMC_CSS (0x3u << 0) // (PMC) Programmable Clock Selection +#define AT91C_PMC_CSS_SLOW_CLK 0x0u // (PMC) Slow Clock is selected +#define AT91C_PMC_CSS_MAIN_CLK 0x1u // (PMC) Main Clock is selected +#define AT91C_PMC_CSS_PLLA_CLK 0x2u // (PMC) Clock from PLL A is selected +#define AT91C_PMC_CSS_PLLB_CLK 0x3u // (PMC) Clock from PLL B is selected +#define AT91C_PMC_PRES (0x7u << 2) // (PMC) Programmable Clock Prescaler +#define AT91C_PMC_PRES_CLK (0x0u << 2) // (PMC) Selected clock +#define AT91C_PMC_PRES_CLK_2 (0x1u << 2) // (PMC) Selected clock divided by 2 +#define AT91C_PMC_PRES_CLK_4 (0x2u << 2) // (PMC) Selected clock divided by 4 +#define AT91C_PMC_PRES_CLK_8 (0x3u << 2) // (PMC) Selected clock divided by 8 +#define AT91C_PMC_PRES_CLK_16 (0x4u << 2) // (PMC) Selected clock divided by 16 +#define AT91C_PMC_PRES_CLK_32 (0x5u << 2) // (PMC) Selected clock divided by 32 +#define AT91C_PMC_PRES_CLK_64 (0x6u << 2) // (PMC) Selected clock divided by 64 +#define AT91C_PMC_MDIV (0x3u << 8) // (PMC) Master Clock Division +#define AT91C_PMC_MDIV_1 (0x0u << 8) // (PMC) The master clock and the processor clock are the same +#define AT91C_PMC_MDIV_2 (0x1u << 8) // (PMC) The processor clock is twice as fast as the master clock +#define AT91C_PMC_MDIV_3 (0x2u << 8) // (PMC) The processor clock is three times faster than the master clock +#define AT91C_PMC_MDIV_4 (0x3u << 8) // (PMC) The processor clock is four times faster than the master clock // -------- PMC_PCKR : (PMC Offset: 0x40) Programmable Clock Register -------- // -------- PMC_IER : (PMC Offset: 0x60) PMC Interrupt Enable Register -------- -#define AT91C_PMC_MOSCS (0x1u << 0) // (PMC) MOSC Status/Enable/Disable/Mask -#define AT91C_PMC_LOCKA (0x1u << 1) // (PMC) PLL A Status/Enable/Disable/Mask -#define AT91C_PMC_LOCKB (0x1u << 2) // (PMC) PLL B Status/Enable/Disable/Mask -#define AT91C_PMC_MCKRDY (0x1u << 3) // (PMC) MCK_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK0RDY (0x1u << 8) // (PMC) PCK0_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK1RDY (0x1u << 9) // (PMC) PCK1_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK2RDY (0x1u << 10) // (PMC) PCK2_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK3RDY (0x1u << 11) // (PMC) PCK3_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK4RDY (0x1u << 12) // (PMC) PCK4_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK5RDY (0x1u << 13) // (PMC) PCK5_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK6RDY (0x1u << 14) // (PMC) PCK6_RDY Status/Enable/Disable/Mask -#define AT91C_PMC_PCK7RDY (0x1u << 15) // (PMC) PCK7_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_MOSCS (0x1u << 0) // (PMC) MOSC Status/Enable/Disable/Mask +#define AT91C_PMC_LOCKA (0x1u << 1) // (PMC) PLL A Status/Enable/Disable/Mask +#define AT91C_PMC_LOCKB (0x1u << 2) // (PMC) PLL B Status/Enable/Disable/Mask +#define AT91C_PMC_MCKRDY (0x1u << 3) // (PMC) MCK_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK0RDY (0x1u << 8) // (PMC) PCK0_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK1RDY (0x1u << 9) // (PMC) PCK1_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK2RDY (0x1u << 10) // (PMC) PCK2_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK3RDY (0x1u << 11) // (PMC) PCK3_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK4RDY (0x1u << 12) // (PMC) PCK4_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK5RDY (0x1u << 13) // (PMC) PCK5_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK6RDY (0x1u << 14) // (PMC) PCK6_RDY Status/Enable/Disable/Mask +#define AT91C_PMC_PCK7RDY (0x1u << 15) // (PMC) PCK7_RDY Status/Enable/Disable/Mask // -------- PMC_IDR : (PMC Offset: 0x64) PMC Interrupt Disable Register -------- // -------- PMC_SR : (PMC Offset: 0x68) PMC Status Register -------- // -------- PMC_IMR : (PMC Offset: 0x6c) PMC Interrupt Mask Register -------- @@ -555,37 +555,37 @@ } AT91S_CKGR, *AT91PS_CKGR; // -------- CKGR_MOR : (CKGR Offset: 0x0) Main Oscillator Register -------- -#define AT91C_CKGR_MOSCEN (0x1u << 0) // (CKGR) Main Oscillator Enable -#define AT91C_CKGR_OSCTEST (0x1u << 1) // (CKGR) Oscillator Test -#define AT91C_CKGR_OSCOUNT (0xFFu << 8) // (CKGR) Main Oscillator Start-up Time +#define AT91C_CKGR_MOSCEN (0x1u << 0) // (CKGR) Main Oscillator Enable +#define AT91C_CKGR_OSCTEST (0x1u << 1) // (CKGR) Oscillator Test +#define AT91C_CKGR_OSCOUNT (0xFFu << 8) // (CKGR) Main Oscillator Start-up Time // -------- CKGR_MCFR : (CKGR Offset: 0x4) Main Clock Frequency Register -------- -#define AT91C_CKGR_MAINF (0xFFFFu << 0) // (CKGR) Main Clock Frequency -#define AT91C_CKGR_MAINRDY (0x1u << 16) // (CKGR) Main Clock Ready +#define AT91C_CKGR_MAINF (0xFFFFu << 0) // (CKGR) Main Clock Frequency +#define AT91C_CKGR_MAINRDY (0x1u << 16) // (CKGR) Main Clock Ready // -------- CKGR_PLLAR : (CKGR Offset: 0x8) PLL A Register -------- -#define AT91C_CKGR_DIVA (0xFFu << 0) // (CKGR) Divider Selected -#define AT91C_CKGR_DIVA_0 0x0u // (CKGR) Divider output is 0 -#define AT91C_CKGR_DIVA_BYPASS 0x1u // (CKGR) Divider is bypassed -#define AT91C_CKGR_PLLACOUNT (0x3Fu << 8) // (CKGR) PLL A Counter -#define AT91C_CKGR_OUTA (0x3u << 14) // (CKGR) PLL A Output Frequency Range -#define AT91C_CKGR_OUTA_0 (0x0u << 14) // (CKGR) Please refer to the PLLA datasheet -#define AT91C_CKGR_OUTA_1 (0x1u << 14) // (CKGR) Please refer to the PLLA datasheet -#define AT91C_CKGR_OUTA_2 (0x2u << 14) // (CKGR) Please refer to the PLLA datasheet -#define AT91C_CKGR_OUTA_3 (0x3u << 14) // (CKGR) Please refer to the PLLA datasheet -#define AT91C_CKGR_MULA (0x7FFu << 16) // (CKGR) PLL A Multiplier -#define AT91C_CKGR_SRCA (0x1u << 29) // (CKGR) PLL A Source +#define AT91C_CKGR_DIVA (0xFFu << 0) // (CKGR) Divider Selected +#define AT91C_CKGR_DIVA_0 0x0u // (CKGR) Divider output is 0 +#define AT91C_CKGR_DIVA_BYPASS 0x1u // (CKGR) Divider is bypassed +#define AT91C_CKGR_PLLACOUNT (0x3Fu << 8) // (CKGR) PLL A Counter +#define AT91C_CKGR_OUTA (0x3u << 14) // (CKGR) PLL A Output Frequency Range +#define AT91C_CKGR_OUTA_0 (0x0u << 14) // (CKGR) Please refer to the PLLA datasheet +#define AT91C_CKGR_OUTA_1 (0x1u << 14) // (CKGR) Please refer to the PLLA datasheet +#define AT91C_CKGR_OUTA_2 (0x2u << 14) // (CKGR) Please refer to the PLLA datasheet +#define AT91C_CKGR_OUTA_3 (0x3u << 14) // (CKGR) Please refer to the PLLA datasheet +#define AT91C_CKGR_MULA (0x7FFu << 16) // (CKGR) PLL A Multiplier +#define AT91C_CKGR_SRCA (0x1u << 29) // (CKGR) PLL A Source // -------- CKGR_PLLBR : (CKGR Offset: 0xc) PLL B Register -------- -#define AT91C_CKGR_DIVB (0xFFu << 0) // (CKGR) Divider Selected -#define AT91C_CKGR_DIVB_0 0x0u // (CKGR) Divider output is 0 -#define AT91C_CKGR_DIVB_BYPASS 0x1u // (CKGR) Divider is bypassed -#define AT91C_CKGR_PLLBCOUNT (0x3Fu << 8) // (CKGR) PLL B Counter -#define AT91C_CKGR_OUTB (0x3u << 14) // (CKGR) PLL B Output Frequency Range -#define AT91C_CKGR_OUTB_0 (0x0u << 14) // (CKGR) Please refer to the PLLB datasheet -#define AT91C_CKGR_OUTB_1 (0x1u << 14) // (CKGR) Please refer to the PLLB datasheet -#define AT91C_CKGR_OUTB_2 (0x2u << 14) // (CKGR) Please refer to the PLLB datasheet -#define AT91C_CKGR_OUTB_3 (0x3u << 14) // (CKGR) Please refer to the PLLB datasheet -#define AT91C_CKGR_MULB (0x7FFu << 16) // (CKGR) PLL B Multiplier -#define AT91C_CKGR_USB_96M (0x1u << 28) // (CKGR) Divider for USB Ports -#define AT91C_CKGR_USB_PLL (0x1u << 29) // (CKGR) PLL Use +#define AT91C_CKGR_DIVB (0xFFu << 0) // (CKGR) Divider Selected +#define AT91C_CKGR_DIVB_0 0x0u // (CKGR) Divider output is 0 +#define AT91C_CKGR_DIVB_BYPASS 0x1u // (CKGR) Divider is bypassed +#define AT91C_CKGR_PLLBCOUNT (0x3Fu << 8) // (CKGR) PLL B Counter +#define AT91C_CKGR_OUTB (0x3u << 14) // (CKGR) PLL B Output Frequency Range +#define AT91C_CKGR_OUTB_0 (0x0u << 14) // (CKGR) Please refer to the PLLB datasheet +#define AT91C_CKGR_OUTB_1 (0x1u << 14) // (CKGR) Please refer to the PLLB datasheet +#define AT91C_CKGR_OUTB_2 (0x2u << 14) // (CKGR) Please refer to the PLLB datasheet +#define AT91C_CKGR_OUTB_3 (0x3u << 14) // (CKGR) Please refer to the PLLB datasheet +#define AT91C_CKGR_MULB (0x7FFu << 16) // (CKGR) PLL B Multiplier +#define AT91C_CKGR_USB_96M (0x1u << 28) // (CKGR) Divider for USB Ports +#define AT91C_CKGR_USB_PLL (0x1u << 29) // (CKGR) PLL Use // ***************************************************************************** // SOFTWARE API DEFINITION FOR Parallel Input Output Controler @@ -660,43 +660,43 @@ } AT91S_DBGU, *AT91PS_DBGU; // -------- DBGU_CR : (DBGU Offset: 0x0) Debug Unit Control Register -------- -#define AT91C_US_RSTRX (0x1u << 2) // (DBGU) Reset Receiver -#define AT91C_US_RSTTX (0x1u << 3) // (DBGU) Reset Transmitter -#define AT91C_US_RXEN (0x1u << 4) // (DBGU) Receiver Enable -#define AT91C_US_RXDIS (0x1u << 5) // (DBGU) Receiver Disable -#define AT91C_US_TXEN (0x1u << 6) // (DBGU) Transmitter Enable -#define AT91C_US_TXDIS (0x1u << 7) // (DBGU) Transmitter Disable +#define AT91C_US_RSTRX (0x1u << 2) // (DBGU) Reset Receiver +#define AT91C_US_RSTTX (0x1u << 3) // (DBGU) Reset Transmitter +#define AT91C_US_RXEN (0x1u << 4) // (DBGU) Receiver Enable +#define AT91C_US_RXDIS (0x1u << 5) // (DBGU) Receiver Disable +#define AT91C_US_TXEN (0x1u << 6) // (DBGU) Transmitter Enable +#define AT91C_US_TXDIS (0x1u << 7) // (DBGU) Transmitter Disable // -------- DBGU_MR : (DBGU Offset: 0x4) Debug Unit Mode Register -------- -#define AT91C_US_PAR (0x7u << 9) // (DBGU) Parity type -#define AT91C_US_PAR_EVEN (0x0u << 9) // (DBGU) Even Parity -#define AT91C_US_PAR_ODD (0x1u << 9) // (DBGU) Odd Parity -#define AT91C_US_PAR_SPACE (0x2u << 9) // (DBGU) Parity forced to 0 (Space) -#define AT91C_US_PAR_MARK (0x3u << 9) // (DBGU) Parity forced to 1 (Mark) -#define AT91C_US_PAR_NONE (0x4u << 9) // (DBGU) No Parity -#define AT91C_US_PAR_MULTI_DROP (0x6u << 9) // (DBGU) Multi-drop mode -#define AT91C_US_CHMODE (0x3u << 14) // (DBGU) Channel Mode -#define AT91C_US_CHMODE_NORMAL (0x0u << 14) // (DBGU) Normal Mode: The USART channel operates as an RX/TX USART. -#define AT91C_US_CHMODE_AUTO (0x1u << 14) // (DBGU) Automatic Echo: Receiver Data Input is connected to the TXD pin. -#define AT91C_US_CHMODE_LOCAL (0x2u << 14) // (DBGU) Local Loopback: Transmitter Output Signal is connected to Receiver Input Signal. -#define AT91C_US_CHMODE_REMOTE (0x3u << 14) // (DBGU) Remote Loopback: RXD pin is internally connected to TXD pin. +#define AT91C_US_PAR (0x7u << 9) // (DBGU) Parity type +#define AT91C_US_PAR_EVEN (0x0u << 9) // (DBGU) Even Parity +#define AT91C_US_PAR_ODD (0x1u << 9) // (DBGU) Odd Parity +#define AT91C_US_PAR_SPACE (0x2u << 9) // (DBGU) Parity forced to 0 (Space) +#define AT91C_US_PAR_MARK (0x3u << 9) // (DBGU) Parity forced to 1 (Mark) +#define AT91C_US_PAR_NONE (0x4u << 9) // (DBGU) No Parity +#define AT91C_US_PAR_MULTI_DROP (0x6u << 9) // (DBGU) Multi-drop mode +#define AT91C_US_CHMODE (0x3u << 14) // (DBGU) Channel Mode +#define AT91C_US_CHMODE_NORMAL (0x0u << 14) // (DBGU) Normal Mode: The USART channel operates as an RX/TX USART. +#define AT91C_US_CHMODE_AUTO (0x1u << 14) // (DBGU) Automatic Echo: Receiver Data Input is connected to the TXD pin. +#define AT91C_US_CHMODE_LOCAL (0x2u << 14) // (DBGU) Local Loopback: Transmitter Output Signal is connected to Receiver Input Signal. +#define AT91C_US_CHMODE_REMOTE (0x3u << 14) // (DBGU) Remote Loopback: RXD pin is internally connected to TXD pin. // -------- DBGU_IER : (DBGU Offset: 0x8) Debug Unit Interrupt Enable Register -------- -#define AT91C_US_RXRDY (0x1u << 0) // (DBGU) RXRDY Interrupt -#define AT91C_US_TXRDY (0x1u << 1) // (DBGU) TXRDY Interrupt -#define AT91C_US_ENDRX (0x1u << 3) // (DBGU) End of Receive Transfer Interrupt -#define AT91C_US_ENDTX (0x1u << 4) // (DBGU) End of Transmit Interrupt -#define AT91C_US_OVRE (0x1u << 5) // (DBGU) Overrun Interrupt -#define AT91C_US_FRAME (0x1u << 6) // (DBGU) Framing Error Interrupt -#define AT91C_US_PARE (0x1u << 7) // (DBGU) Parity Error Interrupt -#define AT91C_US_TXEMPTY (0x1u << 9) // (DBGU) TXEMPTY Interrupt -#define AT91C_US_TXBUFE (0x1u << 11) // (DBGU) TXBUFE Interrupt -#define AT91C_US_RXBUFF (0x1u << 12) // (DBGU) RXBUFF Interrupt -#define AT91C_US_COMM_TX (0x1u << 30) // (DBGU) COMM_TX Interrupt -#define AT91C_US_COMM_RX (0x1u << 31) // (DBGU) COMM_RX Interrupt +#define AT91C_US_RXRDY (0x1u << 0) // (DBGU) RXRDY Interrupt +#define AT91C_US_TXRDY (0x1u << 1) // (DBGU) TXRDY Interrupt +#define AT91C_US_ENDRX (0x1u << 3) // (DBGU) End of Receive Transfer Interrupt +#define AT91C_US_ENDTX (0x1u << 4) // (DBGU) End of Transmit Interrupt +#define AT91C_US_OVRE (0x1u << 5) // (DBGU) Overrun Interrupt +#define AT91C_US_FRAME (0x1u << 6) // (DBGU) Framing Error Interrupt +#define AT91C_US_PARE (0x1u << 7) // (DBGU) Parity Error Interrupt +#define AT91C_US_TXEMPTY (0x1u << 9) // (DBGU) TXEMPTY Interrupt +#define AT91C_US_TXBUFE (0x1u << 11) // (DBGU) TXBUFE Interrupt +#define AT91C_US_RXBUFF (0x1u << 12) // (DBGU) RXBUFF Interrupt +#define AT91C_US_COMM_TX (0x1u << 30) // (DBGU) COMM_TX Interrupt +#define AT91C_US_COMM_RX (0x1u << 31) // (DBGU) COMM_RX Interrupt // -------- DBGU_IDR : (DBGU Offset: 0xc) Debug Unit Interrupt Disable Register -------- // -------- DBGU_IMR : (DBGU Offset: 0x10) Debug Unit Interrupt Mask Register -------- // -------- DBGU_CSR : (DBGU Offset: 0x14) Debug Unit Channel Status Register -------- // -------- DBGU_FNTR : (DBGU Offset: 0x48) Debug Unit FORCE_NTRST Register -------- -#define AT91C_US_FORCE_NTRST (0x1u << 0) // (DBGU) Force NTRST in JTAG +#define AT91C_US_FORCE_NTRST (0x1u << 0) // (DBGU) Force NTRST in JTAG // ***************************************************************************** // SOFTWARE API DEFINITION FOR Peripheral Data Controller @@ -715,10 +715,10 @@ } AT91S_PDC, *AT91PS_PDC; // -------- PDC_PTCR : (PDC Offset: 0x20) PDC Transfer Control Register -------- -#define AT91C_PDC_RXTEN (0x1u << 0) // (PDC) Receiver Transfer Enable -#define AT91C_PDC_RXTDIS (0x1u << 1) // (PDC) Receiver Transfer Disable -#define AT91C_PDC_TXTEN (0x1u << 8) // (PDC) Transmitter Transfer Enable -#define AT91C_PDC_TXTDIS (0x1u << 9) // (PDC) Transmitter Transfer Disable +#define AT91C_PDC_RXTEN (0x1u << 0) // (PDC) Receiver Transfer Enable +#define AT91C_PDC_RXTDIS (0x1u << 1) // (PDC) Receiver Transfer Disable +#define AT91C_PDC_TXTEN (0x1u << 8) // (PDC) Transmitter Transfer Enable +#define AT91C_PDC_TXTDIS (0x1u << 9) // (PDC) Transmitter Transfer Disable // -------- PDC_PTSR : (PDC Offset: 0x24) PDC Transfer Status Register -------- // ***************************************************************************** @@ -748,20 +748,20 @@ } AT91S_AIC, *AT91PS_AIC; // -------- AIC_SMR : (AIC Offset: 0x0) Control Register -------- -#define AT91C_AIC_PRIOR (0x7u << 0) // (AIC) Priority Level -#define AT91C_AIC_PRIOR_LOWEST 0x0u // (AIC) Lowest priority level -#define AT91C_AIC_PRIOR_HIGHEST 0x7u // (AIC) Highest priority level -#define AT91C_AIC_SRCTYPE (0x3u << 5) // (AIC) Interrupt Source Type -#define AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE (0x0u << 5) // (AIC) Internal Sources Code Label Level Sensitive -#define AT91C_AIC_SRCTYPE_INT_EDGE_TRIGGERED (0x1u << 5) // (AIC) Internal Sources Code Label Edge triggered -#define AT91C_AIC_SRCTYPE_EXT_HIGH_LEVEL (0x2u << 5) // (AIC) External Sources Code Label High-level Sensitive -#define AT91C_AIC_SRCTYPE_EXT_POSITIVE_EDGE (0x3u << 5) // (AIC) External Sources Code Label Positive Edge triggered +#define AT91C_AIC_PRIOR (0x7u << 0) // (AIC) Priority Level +#define AT91C_AIC_PRIOR_LOWEST 0x0u // (AIC) Lowest priority level +#define AT91C_AIC_PRIOR_HIGHEST 0x7u // (AIC) Highest priority level +#define AT91C_AIC_SRCTYPE (0x3u << 5) // (AIC) Interrupt Source Type +#define AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE (0x0u << 5) // (AIC) Internal Sources Code Label Level Sensitive +#define AT91C_AIC_SRCTYPE_INT_EDGE_TRIGGERED (0x1u << 5) // (AIC) Internal Sources Code Label Edge triggered +#define AT91C_AIC_SRCTYPE_EXT_HIGH_LEVEL (0x2u << 5) // (AIC) External Sources Code Label High-level Sensitive +#define AT91C_AIC_SRCTYPE_EXT_POSITIVE_EDGE (0x3u << 5) // (AIC) External Sources Code Label Positive Edge triggered // -------- AIC_CISR : (AIC Offset: 0x114) AIC Core Interrupt Status Register -------- -#define AT91C_AIC_NFIQ (0x1u << 0) // (AIC) NFIQ Status -#define AT91C_AIC_NIRQ (0x1u << 1) // (AIC) NIRQ Status +#define AT91C_AIC_NFIQ (0x1u << 0) // (AIC) NFIQ Status +#define AT91C_AIC_NIRQ (0x1u << 1) // (AIC) NIRQ Status // -------- AIC_DCR : (AIC Offset: 0x138) AIC Debug Control Register (Protect) -------- -#define AT91C_AIC_DCR_PROT (0x1u << 0) // (AIC) Protection Mode -#define AT91C_AIC_DCR_GMSK (0x1u << 1) // (AIC) General Mask +#define AT91C_AIC_DCR_PROT (0x1u << 0) // (AIC) Protection Mode +#define AT91C_AIC_DCR_GMSK (0x1u << 1) // (AIC) General Mask // ***************************************************************************** // SOFTWARE API DEFINITION FOR Serial Parallel Interface @@ -791,55 +791,55 @@ } AT91S_SPI, *AT91PS_SPI; // -------- SPI_CR : (SPI Offset: 0x0) SPI Control Register -------- -#define AT91C_SPI_SPIEN (0x1u << 0) // (SPI) SPI Enable -#define AT91C_SPI_SPIDIS (0x1u << 1) // (SPI) SPI Disable -#define AT91C_SPI_SWRST (0x1u << 7) // (SPI) SPI Software reset +#define AT91C_SPI_SPIEN (0x1u << 0) // (SPI) SPI Enable +#define AT91C_SPI_SPIDIS (0x1u << 1) // (SPI) SPI Disable +#define AT91C_SPI_SWRST (0x1u << 7) // (SPI) SPI Software reset // -------- SPI_MR : (SPI Offset: 0x4) SPI Mode Register -------- -#define AT91C_SPI_MSTR (0x1u << 0) // (SPI) Master/Slave Mode -#define AT91C_SPI_PS (0x1u << 1) // (SPI) Peripheral Select -#define AT91C_SPI_PS_FIXED (0x0u << 1) // (SPI) Fixed Peripheral Select -#define AT91C_SPI_PS_VARIABLE (0x1u << 1) // (SPI) Variable Peripheral Select -#define AT91C_SPI_PCSDEC (0x1u << 2) // (SPI) Chip Select Decode -#define AT91C_SPI_DIV32 (0x1u << 3) // (SPI) Clock Selection -#define AT91C_SPI_MODFDIS (0x1u << 4) // (SPI) Mode Fault Detection -#define AT91C_SPI_LLB (0x1u << 7) // (SPI) Clock Selection -#define AT91C_SPI_PCS (0xFu << 16) // (SPI) Peripheral Chip Select -#define AT91C_SPI_DLYBCS (0xFFu << 24) // (SPI) Delay Between Chip Selects +#define AT91C_SPI_MSTR (0x1u << 0) // (SPI) Master/Slave Mode +#define AT91C_SPI_PS (0x1u << 1) // (SPI) Peripheral Select +#define AT91C_SPI_PS_FIXED (0x0u << 1) // (SPI) Fixed Peripheral Select +#define AT91C_SPI_PS_VARIABLE (0x1u << 1) // (SPI) Variable Peripheral Select +#define AT91C_SPI_PCSDEC (0x1u << 2) // (SPI) Chip Select Decode +#define AT91C_SPI_DIV32 (0x1u << 3) // (SPI) Clock Selection +#define AT91C_SPI_MODFDIS (0x1u << 4) // (SPI) Mode Fault Detection +#define AT91C_SPI_LLB (0x1u << 7) // (SPI) Clock Selection +#define AT91C_SPI_PCS (0xFu << 16) // (SPI) Peripheral Chip Select +#define AT91C_SPI_DLYBCS (0xFFu << 24) // (SPI) Delay Between Chip Selects // -------- SPI_RDR : (SPI Offset: 0x8) Receive Data Register -------- -#define AT91C_SPI_RD (0xFFFFu << 0) // (SPI) Receive Data -#define AT91C_SPI_RPCS (0xFu << 16) // (SPI) Peripheral Chip Select Status +#define AT91C_SPI_RD (0xFFFFu << 0) // (SPI) Receive Data +#define AT91C_SPI_RPCS (0xFu << 16) // (SPI) Peripheral Chip Select Status // -------- SPI_TDR : (SPI Offset: 0xc) Transmit Data Register -------- -#define AT91C_SPI_TD (0xFFFFu << 0) // (SPI) Transmit Data -#define AT91C_SPI_TPCS (0xFu << 16) // (SPI) Peripheral Chip Select Status +#define AT91C_SPI_TD (0xFFFFu << 0) // (SPI) Transmit Data +#define AT91C_SPI_TPCS (0xFu << 16) // (SPI) Peripheral Chip Select Status // -------- SPI_SR : (SPI Offset: 0x10) Status Register -------- -#define AT91C_SPI_RDRF (0x1u << 0) // (SPI) Receive Data Register Full -#define AT91C_SPI_TDRE (0x1u << 1) // (SPI) Transmit Data Register Empty -#define AT91C_SPI_MODF (0x1u << 2) // (SPI) Mode Fault Error -#define AT91C_SPI_OVRES (0x1u << 3) // (SPI) Overrun Error Status -#define AT91C_SPI_SPENDRX (0x1u << 4) // (SPI) End of Receiver Transfer -#define AT91C_SPI_SPENDTX (0x1u << 5) // (SPI) End of Receiver Transfer -#define AT91C_SPI_RXBUFF (0x1u << 6) // (SPI) RXBUFF Interrupt -#define AT91C_SPI_TXBUFE (0x1u << 7) // (SPI) TXBUFE Interrupt -#define AT91C_SPI_SPIENS (0x1u << 16) // (SPI) Enable Status +#define AT91C_SPI_RDRF (0x1u << 0) // (SPI) Receive Data Register Full +#define AT91C_SPI_TDRE (0x1u << 1) // (SPI) Transmit Data Register Empty +#define AT91C_SPI_MODF (0x1u << 2) // (SPI) Mode Fault Error +#define AT91C_SPI_OVRES (0x1u << 3) // (SPI) Overrun Error Status +#define AT91C_SPI_SPENDRX (0x1u << 4) // (SPI) End of Receiver Transfer +#define AT91C_SPI_SPENDTX (0x1u << 5) // (SPI) End of Receiver Transfer +#define AT91C_SPI_RXBUFF (0x1u << 6) // (SPI) RXBUFF Interrupt +#define AT91C_SPI_TXBUFE (0x1u << 7) // (SPI) TXBUFE Interrupt +#define AT91C_SPI_SPIENS (0x1u << 16) // (SPI) Enable Status // -------- SPI_IER : (SPI Offset: 0x14) Interrupt Enable Register -------- // -------- SPI_IDR : (SPI Offset: 0x18) Interrupt Disable Register -------- // -------- SPI_IMR : (SPI Offset: 0x1c) Interrupt Mask Register -------- // -------- SPI_CSR : (SPI Offset: 0x30) Chip Select Register -------- -#define AT91C_SPI_CPOL (0x1u << 0) // (SPI) Clock Polarity -#define AT91C_SPI_NCPHA (0x1u << 1) // (SPI) Clock Phase -#define AT91C_SPI_BITS (0xFu << 4) // (SPI) Bits Per Transfer -#define AT91C_SPI_BITS_8 (0x0u << 4) // (SPI) 8 Bits Per transfer -#define AT91C_SPI_BITS_9 (0x1u << 4) // (SPI) 9 Bits Per transfer -#define AT91C_SPI_BITS_10 (0x2u << 4) // (SPI) 10 Bits Per transfer -#define AT91C_SPI_BITS_11 (0x3u << 4) // (SPI) 11 Bits Per transfer -#define AT91C_SPI_BITS_12 (0x4u << 4) // (SPI) 12 Bits Per transfer -#define AT91C_SPI_BITS_13 (0x5u << 4) // (SPI) 13 Bits Per transfer -#define AT91C_SPI_BITS_14 (0x6u << 4) // (SPI) 14 Bits Per transfer -#define AT91C_SPI_BITS_15 (0x7u << 4) // (SPI) 15 Bits Per transfer -#define AT91C_SPI_BITS_16 (0x8u << 4) // (SPI) 16 Bits Per transfer -#define AT91C_SPI_SCBR (0xFFu << 8) // (SPI) Serial Clock Baud Rate -#define AT91C_SPI_DLYBS (0xFFu << 16) // (SPI) Serial Clock Baud Rate -#define AT91C_SPI_DLYBCT (0xFFu << 24) // (SPI) Delay Between Consecutive Transfers +#define AT91C_SPI_CPOL (0x1u << 0) // (SPI) Clock Polarity +#define AT91C_SPI_NCPHA (0x1u << 1) // (SPI) Clock Phase +#define AT91C_SPI_BITS (0xFu << 4) // (SPI) Bits Per Transfer +#define AT91C_SPI_BITS_8 (0x0u << 4) // (SPI) 8 Bits Per transfer +#define AT91C_SPI_BITS_9 (0x1u << 4) // (SPI) 9 Bits Per transfer +#define AT91C_SPI_BITS_10 (0x2u << 4) // (SPI) 10 Bits Per transfer +#define AT91C_SPI_BITS_11 (0x3u << 4) // (SPI) 11 Bits Per transfer +#define AT91C_SPI_BITS_12 (0x4u << 4) // (SPI) 12 Bits Per transfer +#define AT91C_SPI_BITS_13 (0x5u << 4) // (SPI) 13 Bits Per transfer +#define AT91C_SPI_BITS_14 (0x6u << 4) // (SPI) 14 Bits Per transfer +#define AT91C_SPI_BITS_15 (0x7u << 4) // (SPI) 15 Bits Per transfer +#define AT91C_SPI_BITS_16 (0x8u << 4) // (SPI) 16 Bits Per transfer +#define AT91C_SPI_SCBR (0xFFu << 8) // (SPI) Serial Clock Baud Rate +#define AT91C_SPI_DLYBS (0xFFu << 16) // (SPI) Serial Clock Baud Rate +#define AT91C_SPI_DLYBCT (0xFFu << 24) // (SPI) Delay Between Consecutive Transfers // ***************************************************************************** // SOFTWARE API DEFINITION FOR Synchronous Serial Controller Interface @@ -877,72 +877,72 @@ } AT91S_SSC, *AT91PS_SSC; // -------- SSC_CR : (SSC Offset: 0x0) SSC Control Register -------- -#define AT91C_SSC_RXEN (0x1u << 0) // (SSC) Receive Enable -#define AT91C_SSC_RXDIS (0x1u << 1) // (SSC) Receive Disable -#define AT91C_SSC_TXEN (0x1u << 8) // (SSC) Transmit Enable -#define AT91C_SSC_TXDIS (0x1u << 9) // (SSC) Transmit Disable -#define AT91C_SSC_SWRST (0x1u << 15) // (SSC) Software Reset +#define AT91C_SSC_RXEN (0x1u << 0) // (SSC) Receive Enable +#define AT91C_SSC_RXDIS (0x1u << 1) // (SSC) Receive Disable +#define AT91C_SSC_TXEN (0x1u << 8) // (SSC) Transmit Enable +#define AT91C_SSC_TXDIS (0x1u << 9) // (SSC) Transmit Disable +#define AT91C_SSC_SWRST (0x1u << 15) // (SSC) Software Reset // -------- SSC_RCMR : (SSC Offset: 0x10) SSC Receive Clock Mode Register -------- -#define AT91C_SSC_CKS (0x3u << 0) // (SSC) Receive/Transmit Clock Selection -#define AT91C_SSC_CKS_DIV 0x0u // (SSC) Divided Clock -#define AT91C_SSC_CKS_TK 0x1u // (SSC) TK Clock signal -#define AT91C_SSC_CKS_RK 0x2u // (SSC) RK pin -#define AT91C_SSC_CKO (0x7u << 2) // (SSC) Receive/Transmit Clock Output Mode Selection -#define AT91C_SSC_CKO_NONE (0x0u << 2) // (SSC) Receive/Transmit Clock Output Mode: None RK pin: Input-only -#define AT91C_SSC_CKO_CONTINOUS (0x1u << 2) // (SSC) Continuous Receive/Transmit Clock RK pin: Output -#define AT91C_SSC_CKO_DATA_TX (0x2u << 2) // (SSC) Receive/Transmit Clock only during data transfers RK pin: Output -#define AT91C_SSC_CKI (0x1u << 5) // (SSC) Receive/Transmit Clock Inversion -#define AT91C_SSC_CKG (0x3u << 6) // (SSC) Receive/Transmit Clock Gating Selection -#define AT91C_SSC_CKG_NONE (0x0u << 6) // (SSC) Receive/Transmit Clock Gating: None, continuous clock -#define AT91C_SSC_CKG_LOW (0x1u << 6) // (SSC) Receive/Transmit Clock enabled only if RF Low -#define AT91C_SSC_CKG_HIGH (0x2u << 6) // (SSC) Receive/Transmit Clock enabled only if RF High -#define AT91C_SSC_START (0xFu << 8) // (SSC) Receive/Transmit Start Selection -#define AT91C_SSC_START_CONTINOUS (0x0u << 8) // (SSC) Continuous, as soon as the receiver is enabled, and immediately after the end of transfer of the previous data. -#define AT91C_SSC_START_TX (0x1u << 8) // (SSC) Transmit/Receive start -#define AT91C_SSC_START_LOW_RF (0x2u << 8) // (SSC) Detection of a low level on RF input -#define AT91C_SSC_START_HIGH_RF (0x3u << 8) // (SSC) Detection of a high level on RF input -#define AT91C_SSC_START_FALL_RF (0x4u << 8) // (SSC) Detection of a falling edge on RF input -#define AT91C_SSC_START_RISE_RF (0x5u << 8) // (SSC) Detection of a rising edge on RF input -#define AT91C_SSC_START_LEVEL_RF (0x6u << 8) // (SSC) Detection of any level change on RF input -#define AT91C_SSC_START_EDGE_RF (0x7u << 8) // (SSC) Detection of any edge on RF input -#define AT91C_SSC_START_0 (0x8u << 8) // (SSC) Compare 0 -#define AT91C_SSC_STOP (0x1u << 12) // (SSC) Receive Stop Selection -#define AT91C_SSC_STTOUT (0x1u << 15) // (SSC) Receive/Transmit Start Output Selection -#define AT91C_SSC_STTDLY (0xFFu << 16) // (SSC) Receive/Transmit Start Delay -#define AT91C_SSC_PERIOD (0xFFu << 24) // (SSC) Receive/Transmit Period Divider Selection +#define AT91C_SSC_CKS (0x3u << 0) // (SSC) Receive/Transmit Clock Selection +#define AT91C_SSC_CKS_DIV 0x0u // (SSC) Divided Clock +#define AT91C_SSC_CKS_TK 0x1u // (SSC) TK Clock signal +#define AT91C_SSC_CKS_RK 0x2u // (SSC) RK pin +#define AT91C_SSC_CKO (0x7u << 2) // (SSC) Receive/Transmit Clock Output Mode Selection +#define AT91C_SSC_CKO_NONE (0x0u << 2) // (SSC) Receive/Transmit Clock Output Mode: None RK pin: Input-only +#define AT91C_SSC_CKO_CONTINOUS (0x1u << 2) // (SSC) Continuous Receive/Transmit Clock RK pin: Output +#define AT91C_SSC_CKO_DATA_TX (0x2u << 2) // (SSC) Receive/Transmit Clock only during data transfers RK pin: Output +#define AT91C_SSC_CKI (0x1u << 5) // (SSC) Receive/Transmit Clock Inversion +#define AT91C_SSC_CKG (0x3u << 6) // (SSC) Receive/Transmit Clock Gating Selection +#define AT91C_SSC_CKG_NONE (0x0u << 6) // (SSC) Receive/Transmit Clock Gating: None, continuous clock +#define AT91C_SSC_CKG_LOW (0x1u << 6) // (SSC) Receive/Transmit Clock enabled only if RF Low +#define AT91C_SSC_CKG_HIGH (0x2u << 6) // (SSC) Receive/Transmit Clock enabled only if RF High +#define AT91C_SSC_START (0xFu << 8) // (SSC) Receive/Transmit Start Selection +#define AT91C_SSC_START_CONTINOUS (0x0u << 8) // (SSC) Continuous, as soon as the receiver is enabled, and immediately after the end of transfer of the previous data. +#define AT91C_SSC_START_TX (0x1u << 8) // (SSC) Transmit/Receive start +#define AT91C_SSC_START_LOW_RF (0x2u << 8) // (SSC) Detection of a low level on RF input +#define AT91C_SSC_START_HIGH_RF (0x3u << 8) // (SSC) Detection of a high level on RF input +#define AT91C_SSC_START_FALL_RF (0x4u << 8) // (SSC) Detection of a falling edge on RF input +#define AT91C_SSC_START_RISE_RF (0x5u << 8) // (SSC) Detection of a rising edge on RF input +#define AT91C_SSC_START_LEVEL_RF (0x6u << 8) // (SSC) Detection of any level change on RF input +#define AT91C_SSC_START_EDGE_RF (0x7u << 8) // (SSC) Detection of any edge on RF input +#define AT91C_SSC_START_0 (0x8u << 8) // (SSC) Compare 0 +#define AT91C_SSC_STOP (0x1u << 12) // (SSC) Receive Stop Selection +#define AT91C_SSC_STTOUT (0x1u << 15) // (SSC) Receive/Transmit Start Output Selection +#define AT91C_SSC_STTDLY (0xFFu << 16) // (SSC) Receive/Transmit Start Delay +#define AT91C_SSC_PERIOD (0xFFu << 24) // (SSC) Receive/Transmit Period Divider Selection // -------- SSC_RFMR : (SSC Offset: 0x14) SSC Receive Frame Mode Register -------- -#define AT91C_SSC_DATLEN (0x1Fu << 0) // (SSC) Data Length -#define AT91C_SSC_LOOP (0x1u << 5) // (SSC) Loop Mode -#define AT91C_SSC_MSBF (0x1u << 7) // (SSC) Most Significant Bit First -#define AT91C_SSC_DATNB (0xFu << 8) // (SSC) Data Number per Frame -#define AT91C_SSC_FSLEN (0xFu << 16) // (SSC) Receive/Transmit Frame Sync length -#define AT91C_SSC_FSOS (0x7u << 20) // (SSC) Receive/Transmit Frame Sync Output Selection -#define AT91C_SSC_FSOS_NONE (0x0u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: None RK pin Input-only -#define AT91C_SSC_FSOS_NEGATIVE (0x1u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Negative Pulse -#define AT91C_SSC_FSOS_POSITIVE (0x2u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Positive Pulse -#define AT91C_SSC_FSOS_LOW (0x3u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver Low during data transfer -#define AT91C_SSC_FSOS_HIGH (0x4u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver High during data transfer -#define AT91C_SSC_FSOS_TOGGLE (0x5u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Toggling at each start of data transfer -#define AT91C_SSC_FSEDGE (0x1u << 24) // (SSC) Frame Sync Edge Detection +#define AT91C_SSC_DATLEN (0x1Fu << 0) // (SSC) Data Length +#define AT91C_SSC_LOOP (0x1u << 5) // (SSC) Loop Mode +#define AT91C_SSC_MSBF (0x1u << 7) // (SSC) Most Significant Bit First +#define AT91C_SSC_DATNB (0xFu << 8) // (SSC) Data Number per Frame +#define AT91C_SSC_FSLEN (0xFu << 16) // (SSC) Receive/Transmit Frame Sync length +#define AT91C_SSC_FSOS (0x7u << 20) // (SSC) Receive/Transmit Frame Sync Output Selection +#define AT91C_SSC_FSOS_NONE (0x0u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: None RK pin Input-only +#define AT91C_SSC_FSOS_NEGATIVE (0x1u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Negative Pulse +#define AT91C_SSC_FSOS_POSITIVE (0x2u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Positive Pulse +#define AT91C_SSC_FSOS_LOW (0x3u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver Low during data transfer +#define AT91C_SSC_FSOS_HIGH (0x4u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Driver High during data transfer +#define AT91C_SSC_FSOS_TOGGLE (0x5u << 20) // (SSC) Selected Receive/Transmit Frame Sync Signal: Toggling at each start of data transfer +#define AT91C_SSC_FSEDGE (0x1u << 24) // (SSC) Frame Sync Edge Detection // -------- SSC_TCMR : (SSC Offset: 0x18) SSC Transmit Clock Mode Register -------- // -------- SSC_TFMR : (SSC Offset: 0x1c) SSC Transmit Frame Mode Register -------- -#define AT91C_SSC_DATDEF (0x1u << 5) // (SSC) Data Default Value -#define AT91C_SSC_FSDEN (0x1u << 23) // (SSC) Frame Sync Data Enable +#define AT91C_SSC_DATDEF (0x1u << 5) // (SSC) Data Default Value +#define AT91C_SSC_FSDEN (0x1u << 23) // (SSC) Frame Sync Data Enable // -------- SSC_SR : (SSC Offset: 0x40) SSC Status Register -------- -#define AT91C_SSC_TXRDY (0x1u << 0) // (SSC) Transmit Ready -#define AT91C_SSC_TXEMPTY (0x1u << 1) // (SSC) Transmit Empty -#define AT91C_SSC_ENDTX (0x1u << 2) // (SSC) End Of Transmission -#define AT91C_SSC_TXBUFE (0x1u << 3) // (SSC) Transmit Buffer Empty -#define AT91C_SSC_RXRDY (0x1u << 4) // (SSC) Receive Ready -#define AT91C_SSC_OVRUN (0x1u << 5) // (SSC) Receive Overrun -#define AT91C_SSC_ENDRX (0x1u << 6) // (SSC) End of Reception -#define AT91C_SSC_RXBUFF (0x1u << 7) // (SSC) Receive Buffer Full -#define AT91C_SSC_CP0 (0x1u << 8) // (SSC) Compare 0 -#define AT91C_SSC_CP1 (0x1u << 9) // (SSC) Compare 1 -#define AT91C_SSC_TXSYN (0x1u << 10) // (SSC) Transmit Sync -#define AT91C_SSC_RXSYN (0x1u << 11) // (SSC) Receive Sync -#define AT91C_SSC_TXENA (0x1u << 16) // (SSC) Transmit Enable -#define AT91C_SSC_RXENA (0x1u << 17) // (SSC) Receive Enable +#define AT91C_SSC_TXRDY (0x1u << 0) // (SSC) Transmit Ready +#define AT91C_SSC_TXEMPTY (0x1u << 1) // (SSC) Transmit Empty +#define AT91C_SSC_ENDTX (0x1u << 2) // (SSC) End Of Transmission +#define AT91C_SSC_TXBUFE (0x1u << 3) // (SSC) Transmit Buffer Empty +#define AT91C_SSC_RXRDY (0x1u << 4) // (SSC) Receive Ready +#define AT91C_SSC_OVRUN (0x1u << 5) // (SSC) Receive Overrun +#define AT91C_SSC_ENDRX (0x1u << 6) // (SSC) End of Reception +#define AT91C_SSC_RXBUFF (0x1u << 7) // (SSC) Receive Buffer Full +#define AT91C_SSC_CP0 (0x1u << 8) // (SSC) Compare 0 +#define AT91C_SSC_CP1 (0x1u << 9) // (SSC) Compare 1 +#define AT91C_SSC_TXSYN (0x1u << 10) // (SSC) Transmit Sync +#define AT91C_SSC_RXSYN (0x1u << 11) // (SSC) Receive Sync +#define AT91C_SSC_TXENA (0x1u << 16) // (SSC) Transmit Enable +#define AT91C_SSC_RXENA (0x1u << 17) // (SSC) Receive Enable // -------- SSC_IER : (SSC Offset: 0x44) SSC Interrupt Enable Register -------- // -------- SSC_IDR : (SSC Offset: 0x48) SSC Interrupt Disable Register -------- // -------- SSC_IMR : (SSC Offset: 0x4c) SSC Interrupt Mask Register -------- @@ -981,67 +981,67 @@ } AT91S_USART, *AT91PS_USART; // -------- US_CR : (USART Offset: 0x0) Debug Unit Control Register -------- -#define AT91C_US_RSTSTA (0x1u << 8) // (USART) Reset Status Bits -#define AT91C_US_STTBRK (0x1u << 9) // (USART) Start Break -#define AT91C_US_STPBRK (0x1u << 10) // (USART) Stop Break -#define AT91C_US_STTTO (0x1u << 11) // (USART) Start Time-out -#define AT91C_US_SENDA (0x1u << 12) // (USART) Send Address -#define AT91C_US_RSTIT (0x1u << 13) // (USART) Reset Iterations -#define AT91C_US_RSTNACK (0x1u << 14) // (USART) Reset Non Acknowledge -#define AT91C_US_RETTO (0x1u << 15) // (USART) Rearm Time-out -#define AT91C_US_DTREN (0x1u << 16) // (USART) Data Terminal ready Enable -#define AT91C_US_DTRDIS (0x1u << 17) // (USART) Data Terminal ready Disable -#define AT91C_US_RTSEN (0x1u << 18) // (USART) Request to Send enable -#define AT91C_US_RTSDIS (0x1u << 19) // (USART) Request to Send Disable +#define AT91C_US_RSTSTA (0x1u << 8) // (USART) Reset Status Bits +#define AT91C_US_STTBRK (0x1u << 9) // (USART) Start Break +#define AT91C_US_STPBRK (0x1u << 10) // (USART) Stop Break +#define AT91C_US_STTTO (0x1u << 11) // (USART) Start Time-out +#define AT91C_US_SENDA (0x1u << 12) // (USART) Send Address +#define AT91C_US_RSTIT (0x1u << 13) // (USART) Reset Iterations +#define AT91C_US_RSTNACK (0x1u << 14) // (USART) Reset Non Acknowledge +#define AT91C_US_RETTO (0x1u << 15) // (USART) Rearm Time-out +#define AT91C_US_DTREN (0x1u << 16) // (USART) Data Terminal ready Enable +#define AT91C_US_DTRDIS (0x1u << 17) // (USART) Data Terminal ready Disable +#define AT91C_US_RTSEN (0x1u << 18) // (USART) Request to Send enable +#define AT91C_US_RTSDIS (0x1u << 19) // (USART) Request to Send Disable // -------- US_MR : (USART Offset: 0x4) Debug Unit Mode Register -------- -#define AT91C_US_USMODE (0xFu << 0) // (USART) Usart mode -#define AT91C_US_USMODE_NORMAL 0x0u // (USART) Normal -#define AT91C_US_USMODE_RS485 0x1u // (USART) RS485 -#define AT91C_US_USMODE_HWHSH 0x2u // (USART) Hardware Handshaking -#define AT91C_US_USMODE_MODEM 0x3u // (USART) Modem -#define AT91C_US_USMODE_ISO7816_0 0x4u // (USART) ISO7816 protocol: T = 0 -#define AT91C_US_USMODE_ISO7816_1 0x6u // (USART) ISO7816 protocol: T = 1 -#define AT91C_US_USMODE_IRDA 0x8u // (USART) IrDA -#define AT91C_US_USMODE_SWHSH 0xCu // (USART) Software Handshaking -#define AT91C_US_CLKS (0x3u << 4) // (USART) Clock Selection (Baud Rate generator Input Clock -#define AT91C_US_CLKS_CLOCK (0x0u << 4) // (USART) Clock -#define AT91C_US_CLKS_FDIV1 (0x1u << 4) // (USART) fdiv1 -#define AT91C_US_CLKS_SLOW (0x2u << 4) // (USART) slow_clock (ARM) -#define AT91C_US_CLKS_EXT (0x3u << 4) // (USART) External (SCK) -#define AT91C_US_CHRL (0x3u << 6) // (USART) Clock Selection (Baud Rate generator Input Clock -#define AT91C_US_CHRL_5_BITS (0x0u << 6) // (USART) Character Length: 5 bits -#define AT91C_US_CHRL_6_BITS (0x1u << 6) // (USART) Character Length: 6 bits -#define AT91C_US_CHRL_7_BITS (0x2u << 6) // (USART) Character Length: 7 bits -#define AT91C_US_CHRL_8_BITS (0x3u << 6) // (USART) Character Length: 8 bits -#define AT91C_US_SYNC (0x1u << 8) // (USART) Synchronous Mode Select -#define AT91C_US_NBSTOP (0x3u << 12) // (USART) Number of Stop bits -#define AT91C_US_NBSTOP_1_BIT (0x0u << 12) // (USART) 1 stop bit -#define AT91C_US_NBSTOP_15_BIT (0x1u << 12) // (USART) Asynchronous (SYNC=0) 2 stop bits Synchronous (SYNC=1) 2 stop bits -#define AT91C_US_NBSTOP_2_BIT (0x2u << 12) // (USART) 2 stop bits -#define AT91C_US_MSBF (0x1u << 16) // (USART) Bit Order -#define AT91C_US_MODE9 (0x1u << 17) // (USART) 9-bit Character length -#define AT91C_US_CKLO (0x1u << 18) // (USART) Clock Output Select -#define AT91C_US_OVER (0x1u << 19) // (USART) Over Sampling Mode -#define AT91C_US_INACK (0x1u << 20) // (USART) Inhibit Non Acknowledge -#define AT91C_US_DSNACK (0x1u << 21) // (USART) Disable Successive NACK -#define AT91C_US_MAX_ITER (0x1u << 24) // (USART) Number of Repetitions -#define AT91C_US_FILTER (0x1u << 28) // (USART) Receive Line Filter >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 15 18:11:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7535816A408; Sat, 15 Apr 2006 18:11:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AAA716A403 for ; Sat, 15 Apr 2006 18:11:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6473E43D5E for ; Sat, 15 Apr 2006 18:11:50 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FIBoAY072879 for ; Sat, 15 Apr 2006 18:11:50 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FIBotV072871 for perforce@freebsd.org; Sat, 15 Apr 2006 18:11:50 GMT (envelope-from imp@freebsd.org) Date: Sat, 15 Apr 2006 18:11:50 GMT Message-Id: <200604151811.k3FIBotV072871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 18:11:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=95344 Change 95344 by imp@imp_hammer on 2006/04/15 18:11:24 Spring cleaning Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/AT91RM9200.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/Makefile#3 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/README#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/arm_init.s#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/at91rm9200_lowlevel.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/at91rm9200_lowlevel.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/debug_io.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/debug_io.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/eeprom.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/eeprom.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/emac.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/emac.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/env_vars.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/env_vars.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/linker.cfg#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/loader_prompt.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/loader_prompt.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/p_string.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/p_string.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/tag_list.c#3 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/tag_list.h#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/xmodem.c#2 delete .. //depot/projects/arm/src/sys/boot/arm/kb920x/xmodem.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 18:12:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A370916A405; Sat, 15 Apr 2006 18:12:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69F5A16A403 for ; Sat, 15 Apr 2006 18:12:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 220B243D45 for ; Sat, 15 Apr 2006 18:12:52 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FICqYQ073748 for ; Sat, 15 Apr 2006 18:12:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FICpit073742 for perforce@freebsd.org; Sat, 15 Apr 2006 18:12:51 GMT (envelope-from imp@freebsd.org) Date: Sat, 15 Apr 2006 18:12:51 GMT Message-Id: <200604151812.k3FICpit073742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 18:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=95345 Change 95345 by imp@imp_hammer on 2006/04/15 18:12:12 More. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/kb920x/main.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 21:16:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEEF316A403; Sat, 15 Apr 2006 21:16:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9590716A402 for ; Sat, 15 Apr 2006 21:16:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9872D43D73 for ; Sat, 15 Apr 2006 21:16:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FLG361083774 for ; Sat, 15 Apr 2006 21:16:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FLG39P083768 for perforce@freebsd.org; Sat, 15 Apr 2006 21:16:03 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 21:16:03 GMT Message-Id: <200604152116.k3FLG39P083768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 21:16:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=95353 Change 95353 by jb@jb_freebsd2 on 2006/04/15 21:15:12 Suck the 'C Type Format' conversion files. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/alist.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/alist.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/barrier.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/barrier.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/compare.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/ctf.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/ctfmerge.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/ctftools.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/dwarf.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/fifo.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/fifo.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/hash.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/hash.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/iidesc.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/input.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/merge.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/output.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/st_bugs.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/st_parse.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/stabs.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/stack.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/stack.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/strtab.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/strtab.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/tdata.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/traverse.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/traverse.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/util.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 21:22:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CD4616A409; Sat, 15 Apr 2006 21:22:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CEF2216A400 for ; Sat, 15 Apr 2006 21:22:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89B4243D5C for ; Sat, 15 Apr 2006 21:22:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FLMB1P088391 for ; Sat, 15 Apr 2006 21:22:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FLMBIc088378 for perforce@freebsd.org; Sat, 15 Apr 2006 21:22:11 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 21:22:11 GMT Message-Id: <200604152122.k3FLMBIc088378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 21:22:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=95354 Change 95354 by jb@jb_freebsd2 on 2006/04/15 21:21:20 Suck these files to the right tree. Oops. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/compare.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctftools.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/fifo.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/fifo.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/iidesc.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/input.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/st_bugs.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/st_parse.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/stabs.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/stack.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/stack.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/tdata.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/alist.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/alist.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/barrier.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/barrier.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/compare.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/ctfmerge.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/ctftools.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/fifo.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/fifo.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/hash.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/hash.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/iidesc.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/input.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/merge.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/output.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/st_bugs.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/st_parse.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/stabs.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/stack.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/stack.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/strtab.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/strtab.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/tdata.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/traverse.c#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/traverse.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/tools/ctf/cvt/util.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 21:24:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49AC416A405; Sat, 15 Apr 2006 21:24:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC05F16A403 for ; Sat, 15 Apr 2006 21:24:14 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95D4343D64 for ; Sat, 15 Apr 2006 21:24:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FLOETh089296 for ; Sat, 15 Apr 2006 21:24:14 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FLOE5H089293 for perforce@freebsd.org; Sat, 15 Apr 2006 21:24:14 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Apr 2006 21:24:14 GMT Message-Id: <200604152124.k3FLOE5H089293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 95355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 21:24:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=95355 Change 95355 by marcel@marcel_nfs on 2006/04/15 21:23:24 o Create child devices o Probe and attach child devices Affected files ... .. //depot/projects/uart/dev/puc/puc.c#22 edit .. //depot/projects/uart/dev/puc/pucvar.h#19 edit Differences ... ==== //depot/projects/uart/dev/puc/puc.c#22 (text+ko) ==== @@ -113,16 +113,17 @@ puc_attach(device_t dev) { struct puc_bar *bar; + struct puc_port *port; struct puc_softc *sc; struct rman *rm; intptr_t res; u_long start; - int error, i, port; + int error, idx; sc = device_get_softc(dev); - for (i = 0; i < PUC_PCI_BARS; i++) - sc->sc_bar[i].b_rid = -1; + for (idx = 0; idx < PUC_PCI_BARS; idx++) + sc->sc_bar[idx].b_rid = -1; sc->sc_ioport.rm_type = RMAN_ARRAY; sc->sc_ioport.rm_descr = "I/O port space"; @@ -143,13 +144,14 @@ sc->sc_port = malloc(sc->sc_nports * sizeof(struct puc_port), M_PUC, M_WAITOK|M_ZERO); - for (port = 0; port < sc->sc_nports; port++) { - sc->sc_port[port].p_nr = port + 1; - error = puc_query(sc->sc_cfg, PUC_QUERY_TYPE, port, &res); + for (idx = 0; idx < sc->sc_nports; idx++) { + port = &sc->sc_port[idx]; + port->p_nr = idx + 1; + error = puc_query(sc->sc_cfg, PUC_QUERY_TYPE, idx, &res); if (error) goto fail; - sc->sc_port[port].p_type = res; - error = puc_query(sc->sc_cfg, PUC_QUERY_RID, port, &res); + port->p_type = res; + error = puc_query(sc->sc_cfg, PUC_QUERY_RID, idx, &res); if (error) goto fail; bar = puc_get_bar(sc, res); @@ -157,19 +159,30 @@ error = ENXIO; goto fail; } - sc->sc_port[port].p_bar = bar; - error = puc_query(sc->sc_cfg, PUC_QUERY_OFS, port, &res); + port->p_bar = bar; + error = puc_query(sc->sc_cfg, PUC_QUERY_OFS, idx, &res); if (error) goto fail; start = rman_get_start(bar->b_res) + res; - error = puc_query(sc->sc_cfg, PUC_QUERY_LEN, port, &res); + error = puc_query(sc->sc_cfg, PUC_QUERY_LEN, idx, &res); if (error) goto fail; rm = (bar->b_type == SYS_RES_IOPORT) ? &sc->sc_ioport: &sc->sc_iomem; - sc->sc_port[port].p_res = rman_reserve_resource(rm, start, + port->p_res = rman_reserve_resource(rm, start, start + res - 1, res, 0, sc->sc_dev); + if (port->p_res == NULL) + continue; + + port->p_dev = device_add_child(dev, NULL, -1); + if (port->p_dev == NULL) { + rman_release_resource(port->p_res); + port->p_res = NULL; + continue; + } + + device_set_ivars(port->p_dev, (void *)port); } sc->sc_irid = 0; @@ -197,17 +210,31 @@ sc->sc_polled = 1; } + /* Probe and attach our children. */ + for (idx = 0; idx < sc->sc_nports; idx++) { + port = &sc->sc_port[idx]; + error = device_probe_and_attach(port->p_dev); + if (error) { + device_delete_child(dev, port->p_dev); + port->p_dev = NULL; + } + } + return (0); fail: - for (port = 0; port < sc->sc_nports; port++) { - if (sc->sc_port[port].p_res != NULL) - rman_release_resource(sc->sc_port[port].p_res); + for (idx = 0; idx < sc->sc_nports; idx++) { + port = &sc->sc_port[idx]; + if (port->p_dev != NULL) + device_delete_child(dev, port->p_dev); + if (port->p_res != NULL) + rman_release_resource(port->p_res); } - for (i = 0; i < PUC_PCI_BARS; i++) { - if (sc->sc_bar[i].b_res != NULL) - bus_release_resource(sc->sc_dev, sc->sc_bar[i].b_type, - sc->sc_bar[i].b_rid, sc->sc_bar[i].b_res); + for (idx = 0; idx < PUC_PCI_BARS; idx++) { + bar = &sc->sc_bar[idx]; + if (bar->b_res != NULL) + bus_release_resource(sc->sc_dev, bar->b_type, + bar->b_rid, bar->b_res); } rman_fini(&sc->sc_iomem); rman_fini(&sc->sc_ioport); ==== //depot/projects/uart/dev/puc/pucvar.h#19 (text+ko) ==== @@ -40,6 +40,7 @@ struct puc_port { struct puc_bar *p_bar; struct resource *p_res; + device_t p_dev; int p_nr; int p_type; int p_rclk; From owner-p4-projects@FreeBSD.ORG Sat Apr 15 21:41:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3D7C16A402; Sat, 15 Apr 2006 21:41:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E4BC16A400 for ; Sat, 15 Apr 2006 21:41:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 052C643D6D for ; Sat, 15 Apr 2006 21:41:36 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FLfZoj098492 for ; Sat, 15 Apr 2006 21:41:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FLfZSX098486 for perforce@freebsd.org; Sat, 15 Apr 2006 21:41:35 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 21:41:35 GMT Message-Id: <200604152141.k3FLfZSX098486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 21:41:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=95356 Change 95356 by jb@jb_freebsd2 on 2006/04/15 21:41:03 Suck more CTF sources. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/ctf_headers.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/list.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/list.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/memory.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/memory.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/symbol.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/symbol.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/utils.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/utils.h#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 22:35:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60B6C16A408; Sat, 15 Apr 2006 22:35:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 236C616A406 for ; Sat, 15 Apr 2006 22:35:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CED0B43D46 for ; Sat, 15 Apr 2006 22:35:41 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMZf67027776 for ; Sat, 15 Apr 2006 22:35:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMZfnA027770 for perforce@freebsd.org; Sat, 15 Apr 2006 22:35:41 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 22:35:41 GMT Message-Id: <200604152235.k3FMZfnA027770@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 22:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=95358 Change 95358 by jb@jb_freebsd2 on 2006/04/15 22:34:59 Build the 'C Type Format' conversion program. I tried raising the WARNS level above 1, but that means cleaning up Sun's code more. WARNS=2 complains about the #pragma ident. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#1 add .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/xalloc.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 22:45:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F9E416A403; Sat, 15 Apr 2006 22:45:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1042D16A400 for ; Sat, 15 Apr 2006 22:45:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA6FB43D4C for ; Sat, 15 Apr 2006 22:45:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMjsSp033568 for ; Sat, 15 Apr 2006 22:45:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMjsNP033565 for perforce@freebsd.org; Sat, 15 Apr 2006 22:45:54 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 22:45:54 GMT Message-Id: <200604152245.k3FMjsNP033565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 22:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=95359 Change 95359 by jb@jb_freebsd2 on 2006/04/15 22:45:20 Change a return value to match the function return type. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 (text) ==== @@ -1196,7 +1196,7 @@ (rc = inflate(&zstr, Z_NO_FLUSH)) != Z_STREAM_END || (rc = inflateEnd(&zstr)) != Z_OK) { warning("CTF decompress zlib error %s\n", zError(rc)); - return (NULL); + return (0); } debug(3, "reflated %lu bytes to %lu, pointer at %d\n", From owner-p4-projects@FreeBSD.ORG Sat Apr 15 22:46:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00E2616A406; Sat, 15 Apr 2006 22:46:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC57316A403 for ; Sat, 15 Apr 2006 22:46:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 717CD43D48 for ; Sat, 15 Apr 2006 22:46:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMkuEw033615 for ; Sat, 15 Apr 2006 22:46:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMkuVu033612 for perforce@freebsd.org; Sat, 15 Apr 2006 22:46:56 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 22:46:56 GMT Message-Id: <200604152246.k3FMkuVu033612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 22:46:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=95360 Change 95360 by jb@jb_freebsd2 on 2006/04/15 22:46:40 Change the comparison values from NULL to 0 to match the function return type. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#2 (text) ==== @@ -468,7 +468,7 @@ int pad; int i; - if (gelf_newehdr(dst, gelf_getclass(src)) == NULL) + if (gelf_newehdr(dst, gelf_getclass(src)) == 0) elfterminate(dstname, "Cannot copy ehdr to temp file"); gelf_getehdr(src, &sehdr); memcpy(&dehdr, &sehdr, sizeof (GElf_Ehdr)); @@ -484,7 +484,7 @@ */ if (sehdr.e_phnum != 0) { (void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT); - if (gelf_newphdr(dst, sehdr.e_phnum) == NULL) + if (gelf_newphdr(dst, sehdr.e_phnum) == 0) elfterminate(dstname, "Cannot make phdrs in temp file"); for (i = 0; i < sehdr.e_phnum; i++) { @@ -618,7 +618,7 @@ } } - if (gelf_update_shdr(dscn, &shdr) == NULL) + if (gelf_update_shdr(dscn, &shdr) == 0) elfterminate(dstname, "Cannot update sect %s", sname); new_offset = (off_t)shdr.sh_offset; From owner-p4-projects@FreeBSD.ORG Sat Apr 15 22:49:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 014D316A405; Sat, 15 Apr 2006 22:49:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D432F16A400 for ; Sat, 15 Apr 2006 22:48:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E0DA43D6D for ; Sat, 15 Apr 2006 22:48:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMmxut033668 for ; Sat, 15 Apr 2006 22:48:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMmxKB033665 for perforce@freebsd.org; Sat, 15 Apr 2006 22:48:59 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 22:48:59 GMT Message-Id: <200604152248.k3FMmxKB033665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 22:49:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=95361 Change 95361 by jb@jb_freebsd2 on 2006/04/15 22:48:06 SysV -> BSD signal handling. Only include Solaris headers on Solaris. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#2 (text) ==== @@ -152,9 +152,11 @@ int keep_stabs = 0; int c; +#if defined(sun) sighold(SIGINT); sighold(SIGQUIT); sighold(SIGTERM); +#endif progname = basename(argv[0]); @@ -216,9 +218,15 @@ */ set_terminate_cleanup(terminate_cleanup); +#if defined(sun) sigset(SIGINT, handle_sig); sigset(SIGQUIT, handle_sig); sigset(SIGTERM, handle_sig); +#else + signal(SIGINT, handle_sig); + signal(SIGQUIT, handle_sig); + signal(SIGTERM, handle_sig); +#endif filetd = tdata_new(); From owner-p4-projects@FreeBSD.ORG Sat Apr 15 22:53:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8742216A405; Sat, 15 Apr 2006 22:53:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44AAF16A402 for ; Sat, 15 Apr 2006 22:53:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FD1543D46 for ; Sat, 15 Apr 2006 22:53:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMr4tn036024 for ; Sat, 15 Apr 2006 22:53:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMr4sG036012 for perforce@freebsd.org; Sat, 15 Apr 2006 22:53:04 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 22:53:04 GMT Message-Id: <200604152253.k3FMr4sG036012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 22:53:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=95362 Change 95362 by jb@jb_freebsd2 on 2006/04/15 22:52:48 Dwarf 3 no longer uses DW_ATE_SUN_imaginary_float. The Dwarf 3 library we are using is the one from the bzipped CPIO in the OpenSolaris distribution. It looks like that library is a bit more recent than the code in this file. Puzzling. Fix the last entry in the die_creators[] array to match the structure type. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 (text) ==== @@ -85,6 +85,7 @@ #include #include +#include #include #include #include @@ -1303,8 +1304,11 @@ if (enc == DW_ATE_complex_float) { mult = 2; col = 1; - } else if (enc == DW_ATE_imaginary_float || - enc == DW_ATE_SUN_imaginary_float) + } else if (enc == DW_ATE_imaginary_float +#if defined(sun) + || enc == DW_ATE_SUN_imaginary_float +#endif + ) col = 2; while (map->fsm_typesz[szidx] != 0) { @@ -1352,8 +1356,10 @@ case DW_ATE_float: case DW_ATE_complex_float: case DW_ATE_imaginary_float: +#if defined(sun) case DW_ATE_SUN_imaginary_float: case DW_ATE_SUN_interval_float: +#endif intr->intr_type = INTR_REAL; intr->intr_signed = 1; intr->intr_fformat = die_base_type2enc(dw, off, enc, sz); @@ -1650,7 +1656,7 @@ { DW_TAG_variable, DW_F_NOTDP, die_variable_create }, { DW_TAG_volatile_type, 0, die_volatile_create }, { DW_TAG_restrict_type, 0, die_restrict_create }, - { 0, NULL } + { 0, 0, NULL } }; static const die_creator_t * From owner-p4-projects@FreeBSD.ORG Sat Apr 15 22:54:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2822A16A404; Sat, 15 Apr 2006 22:54:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 08A3616A402 for ; Sat, 15 Apr 2006 22:54:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C997A43D46 for ; Sat, 15 Apr 2006 22:54:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMs6eh036841 for ; Sat, 15 Apr 2006 22:54:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMs6NB036835 for perforce@freebsd.org; Sat, 15 Apr 2006 22:54:06 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 22:54:06 GMT Message-Id: <200604152254.k3FMs6NB036835@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 22:54:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=95363 Change 95363 by jb@jb_freebsd2 on 2006/04/15 22:53:10 Compatibility cruft. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#2 (text) ==== @@ -34,7 +34,11 @@ #include #include #include +#if defined(sun) #include +#else +#include +#endif #include "hash.h" #include "memory.h" ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#2 (text) ==== @@ -27,7 +27,12 @@ #pragma ident "@(#)strtab.c 1.2 05/06/08 SMI" #include +#if defined(sun) #include +#else +#include +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Apr 15 23:00:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69D1E16A406; Sat, 15 Apr 2006 23:00:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A3A716A400 for ; Sat, 15 Apr 2006 23:00:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D86CA43D45 for ; Sat, 15 Apr 2006 23:00:14 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FN0EEl041457 for ; Sat, 15 Apr 2006 23:00:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FN0E97041451 for perforce@freebsd.org; Sat, 15 Apr 2006 23:00:14 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 23:00:14 GMT Message-Id: <200604152300.k3FN0E97041451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 23:00:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=95364 Change 95364 by jb@jb_freebsd2 on 2006/04/15 22:59:17 Compatibility cruft. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf.h#2 (text) ==== @@ -30,6 +30,9 @@ #pragma ident "@(#)ctf.h 1.5 05/06/08 SMI" #include +#if !defined(sun) +#include +#endif #ifdef __cplusplus extern "C" { From owner-p4-projects@FreeBSD.ORG Sat Apr 15 23:29:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14E8416A403; Sat, 15 Apr 2006 23:29:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B609A16A400 for ; Sat, 15 Apr 2006 23:29:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DF5443D48 for ; Sat, 15 Apr 2006 23:29:52 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FNTpKH056070 for ; Sat, 15 Apr 2006 23:29:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FNTp3n056067 for perforce@freebsd.org; Sat, 15 Apr 2006 23:29:51 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 23:29:51 GMT Message-Id: <200604152329.k3FNTp3n056067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 23:29:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=95365 Change 95365 by jb@jb_freebsd2 on 2006/04/15 23:28:52 Build the 'C Type Format' merge utility. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 23:33:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B961216A402; Sat, 15 Apr 2006 23:33:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9005F16A401 for ; Sat, 15 Apr 2006 23:33:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E88543D46 for ; Sat, 15 Apr 2006 23:33:57 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FNXupG059307 for ; Sat, 15 Apr 2006 23:33:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FNXuj9059304 for perforce@freebsd.org; Sat, 15 Apr 2006 23:33:56 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 23:33:56 GMT Message-Id: <200604152333.k3FNXuj9059304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 23:33:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=95366 Change 95366 by jb@jb_freebsd2 on 2006/04/15 23:33:55 Build all the utilities now. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#2 (text+ko) ==== @@ -1,6 +1,5 @@ # $FreeBSD$ -SUBDIR= sgsmsg -#SUBDIR= ctfconvert ctfdump ctfmerge sgsmsg +SUBDIR= ctfconvert ctfdump ctfmerge sgsmsg .include From owner-p4-projects@FreeBSD.ORG Sat Apr 15 23:36:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5A5616A404; Sat, 15 Apr 2006 23:36:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4C5E16A402 for ; Sat, 15 Apr 2006 23:36:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90AC543D46 for ; Sat, 15 Apr 2006 23:36:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FNa0id061104 for ; Sat, 15 Apr 2006 23:36:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FNa0lk061098 for perforce@freebsd.org; Sat, 15 Apr 2006 23:36:00 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 23:36:00 GMT Message-Id: <200604152336.k3FNa0lk061098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 23:36:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=95368 Change 95368 by jb@jb_freebsd2 on 2006/04/15 23:35:29 SysV -> BSD signal handling. Lots of Solaris specific files here. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#2 (text) ==== @@ -177,16 +177,22 @@ #include #include #include +#if defined(sun) #include +#endif #include #include #include #include +#if defined(sun) #include +#endif #include #include #include +#if defined(sun) #include +#endif #include "ctf_headers.h" #include "ctftools.h" @@ -230,7 +236,9 @@ { size_t big, *size; int sizes, i; +#if defined(sun) struct memcntl_mha mha; +#endif /* * First, get the available pagesizes. @@ -259,6 +267,7 @@ if (brk((void *)((((uintptr_t)sbrk(0) - 1) & ~(big - 1)) + big)) != 0) return; +#if defined(sun) /* * Finally, set our heap to use the largest page size for which the * MC_HAT_ADVISE doesn't return EAGAIN. @@ -275,6 +284,7 @@ if (errno != EAGAIN) break; } +#endif } static void @@ -700,9 +710,15 @@ wq); } +#if defined(sun) sigset(SIGINT, handle_sig); sigset(SIGQUIT, handle_sig); sigset(SIGTERM, handle_sig); +#else + signal(SIGINT, handle_sig); + signal(SIGQUIT, handle_sig); + signal(SIGTERM, handle_sig); +#endif pthread_sigmask(SIG_UNBLOCK, &sets, NULL); } From owner-p4-projects@FreeBSD.ORG Sat Apr 15 23:37:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B01A616A402; Sat, 15 Apr 2006 23:37:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F6EF16A400 for ; Sat, 15 Apr 2006 23:37:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5ADFE43D46 for ; Sat, 15 Apr 2006 23:37:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FNb2SR061843 for ; Sat, 15 Apr 2006 23:37:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FNb2AH061837 for perforce@freebsd.org; Sat, 15 Apr 2006 23:37:02 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 23:37:02 GMT Message-Id: <200604152337.k3FNb2AH061837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 23:37:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=95369 Change 95369 by jb@jb_freebsd2 on 2006/04/15 23:36:32 FreeBSD's semaphores are a bit different. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.c#2 (text) ==== @@ -38,7 +38,9 @@ */ #include +#if defined(sun) #include +#endif #include #include "barrier.h" @@ -47,7 +49,11 @@ barrier_init(barrier_t *bar, int nthreads) { pthread_mutex_init(&bar->bar_lock, NULL); +#if defined(sun) sema_init(&bar->bar_sem, 0, USYNC_THREAD, NULL); +#else + sem_init(&bar->bar_sem, 0, 0); +#endif bar->bar_numin = 0; bar->bar_nthr = nthreads; @@ -60,7 +66,11 @@ if (++bar->bar_numin < bar->bar_nthr) { pthread_mutex_unlock(&bar->bar_lock); +#if defined(sun) sema_wait(&bar->bar_sem); +#else + sem_wait(&bar->bar_sem); +#endif return (0); @@ -70,7 +80,11 @@ /* reset for next use */ bar->bar_numin = 0; for (i = 1; i < bar->bar_nthr; i++) +#if defined(sun) sema_post(&bar->bar_sem); +#else + sem_post(&bar->bar_sem); +#endif pthread_mutex_unlock(&bar->bar_lock); return (1); ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.h#2 (text) ==== @@ -33,7 +33,12 @@ * APIs for the barrier synchronization primitive. */ +#if defined(sun) #include +#else +#include +typedef sem_t sema_t; +#endif #ifdef __cplusplus extern "C" { From owner-p4-projects@FreeBSD.ORG Sat Apr 15 23:43:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF69216A403; Sat, 15 Apr 2006 23:43:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EDBE16A401 for ; Sat, 15 Apr 2006 23:43:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36CB943D45 for ; Sat, 15 Apr 2006 23:43:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FNhALr066536 for ; Sat, 15 Apr 2006 23:43:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FNh9ad066533 for perforce@freebsd.org; Sat, 15 Apr 2006 23:43:09 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 23:43:09 GMT Message-Id: <200604152343.k3FNh9ad066533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 23:43:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=95370 Change 95370 by jb@jb_freebsd2 on 2006/04/15 23:42:34 Suck the sources for the last tool: ctfdump. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 15 23:58:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A037F16A404; Sat, 15 Apr 2006 23:58:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B17016A401 for ; Sat, 15 Apr 2006 23:58:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49A0443D45 for ; Sat, 15 Apr 2006 23:58:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FNwTGC073370 for ; Sat, 15 Apr 2006 23:58:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FNwT2L073364 for perforce@freebsd.org; Sat, 15 Apr 2006 23:58:29 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Apr 2006 23:58:29 GMT Message-Id: <200604152358.k3FNwT2L073364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 23:58:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=95371 Change 95371 by jb@jb_freebsd2 on 2006/04/15 23:58:05 Use getprogname() to get the program name rather than some mysterious external pointer. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/util.h#1 branch Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#2 (text) ==== @@ -40,6 +40,9 @@ { va_list ap; int err = errno; +#if !defined(sun) + const char *progname = getprogname(); +#endif (void) fprintf(stderr, "%s: ", progname); @@ -58,6 +61,9 @@ elfdie(char *format, ...) { va_list ap; +#if !defined(sun) + const char *progname = getprogname(); +#endif (void) fprintf(stderr, "%s: ", progname);