From owner-p4-projects@FreeBSD.ORG Sun Jun 6 04:13:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AC4A16A4D2; Sun, 6 Jun 2004 04:13:10 -0700 (PDT) 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 3776216A4CF for ; Sun, 6 Jun 2004 04:13:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15E9F43D2D for ; Sun, 6 Jun 2004 04:13:09 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i56BD8uh023458 for ; Sun, 6 Jun 2004 11:13:08 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i56BD8jN023455 for perforce@freebsd.org; Sun, 6 Jun 2004 11:13:08 GMT (envelope-from scottl@freebsd.org) Date: Sun, 6 Jun 2004 11:13:08 GMT Message-Id: <200406061113.i56BD8jN023455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2004 11:13:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=54260 Change 54260 by scottl@scottl-esp-sparc64 on 2004/06/06 11:12:40 Store the device_t in the ncr53c9x softc Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#12 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#12 (text+ko) ==== @@ -401,6 +401,7 @@ sc->sc_features |= NCR_F_DMASELECT; /* Do the common parts of attachment. */ + sc->sc_dev = esc->sc_dev; ncr53c9x_attach(sc); } From owner-p4-projects@FreeBSD.ORG Sun Jun 6 04:15:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DE5C16A4D1; Sun, 6 Jun 2004 04:15:12 -0700 (PDT) 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 364B416A4CF for ; Sun, 6 Jun 2004 04:15:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E65643D41 for ; Sun, 6 Jun 2004 04:15:12 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i56BFCOf023536 for ; Sun, 6 Jun 2004 11:15:12 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i56BFB8f023533 for perforce@freebsd.org; Sun, 6 Jun 2004 11:15:11 GMT (envelope-from scottl@freebsd.org) Date: Sun, 6 Jun 2004 11:15:11 GMT Message-Id: <200406061115.i56BFB8f023533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2004 11:15:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=54261 Change 54261 by scottl@scottl-esp-sparc64 on 2004/06/06 11:14:12 Remove spl Change simple_lock to mtx_lock move sc_dev.dv_xname to dv_name Pare down ncr53x9x_poll() to something more appropriate. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#5 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#5 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#5 (text+ko) ==== @@ -82,6 +82,7 @@ #include #include #include +#include #include #include #include @@ -102,8 +103,7 @@ static void ncr53c9x_select(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); static int ncr53c9x_reselect(struct ncr53c9x_softc *, int, int, int); static void ncr53c9x_scsi_reset(struct ncr53c9x_softc *); -static int ncr53c9x_poll(struct ncr53c9x_softc *, - struct scsipi_xfer *, int); +static int ncr53c9x_poll(struct cam_sim *); static void ncr53c9x_sched(struct ncr53c9x_softc *); static void ncr53c9x_done(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); static void ncr53c9x_msgin(struct ncr53c9x_softc *); @@ -190,14 +190,15 @@ struct scsipi_adapter *adapt = &sc->sc_adapter; struct scsipi_channel *chan = &sc->sc_channel; - simple_lock_init(&sc->sc_lock); + mtx_init(&sc->sc_lock, "ncr" "ncr53c9x lock", MTX_DEF); + sc->dv_name = device_get_nameunit(sc->sc_dev); /* * Note, the front-end has set us up to print the chip variation. */ if (sc->sc_rev >= NCR_VARIANT_MAX) { printf("\n%s: unknown variant %d, devices not attached\n", - sc->sc_dev.dv_xname, sc->sc_rev); + sc->dv_name, sc->sc_rev); return; } @@ -226,7 +227,7 @@ return; } - callout_init(&sc->sc_watchdog); + callout_init(&sc->sc_watchdog, 0); /* * Treat NCR53C90 with the 86C01 DMA chip exactly as ESP100 @@ -284,7 +285,7 @@ */ if (scsipi_adapter_addref(adapt) != 0) { printf("%s: unable to enable controller\n", - sc->sc_dev.dv_xname); + sc->dv_name); return; } @@ -381,7 +382,7 @@ default: printf("%s: unknown revision code, assuming ESP100\n", - sc->sc_dev.dv_xname); + sc->dv_name); NCR_WRITE_REG(sc, NCR_CFG1, sc->sc_cfg1); NCR_WRITE_REG(sc, NCR_CCF, sc->sc_ccf); NCR_WRITE_REG(sc, NCR_SYNCOFF, 0); @@ -393,10 +394,10 @@ #if 0 printf("%s: ncr53c9x_reset: revision %d\n", - sc->sc_dev.dv_xname, sc->sc_rev); + sc->dv_name, sc->sc_rev); printf("%s: ncr53c9x_reset: cfg1 0x%x, cfg2 0x%x, cfg3 0x%x, " "ccf 0x%x, timeout 0x%x\n", - sc->sc_dev.dv_xname, sc->sc_cfg1, sc->sc_cfg2, sc->sc_cfg3, + sc->dv_name, sc->sc_cfg1, sc->sc_cfg2, sc->sc_cfg3, sc->sc_ccf, sc->sc_timeout); #endif } @@ -411,7 +412,7 @@ (*sc->sc_glue->gl_dma_stop)(sc); - printf("%s: resetting SCSI bus\n", sc->sc_dev.dv_xname); + printf("%s: resetting SCSI bus\n", sc->dv_name); NCRCMD(sc, NCRCMD_RSTSCSI); } @@ -774,12 +775,9 @@ struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; { - int s; - s = splbio(); ecb->flags = 0; pool_put(&ecb_pool, (void *)ecb); - splx(s); return; } @@ -789,11 +787,8 @@ int flags; { struct ncr53c9x_ecb *ecb; - int s; - s = splbio(); ecb = (struct ncr53c9x_ecb *)pool_get(&ecb_pool, PR_NOWAIT); - splx(s); if (ecb) { memset(ecb, 0, sizeof(*ecb)); ecb->flags |= ECB_ALLOC; @@ -812,21 +807,17 @@ */ void -ncr53c9x_scsipi_request(chan, req, arg) - struct scsipi_channel *chan; - scsipi_adapter_req_t req; - void *arg; +ncr53c9x_action(struct cam_sim *sim, union ccb *ccb) { struct scsipi_xfer *xs; struct scsipi_periph *periph; struct ncr53c9x_softc *sc = (void *)chan->chan_adapter->adapt_dev; struct ncr53c9x_ecb *ecb; - int s, flags; + int flags; - NCR_TRACE(("[ncr53c9x_scsipi_request] ")); + NCR_TRACE(("[ncr53c9x_action] ")); - s = splbio(); - simple_lock(&sc->sc_lock); + mtx_lock(&sc->sc_lock); switch (req) { case ADAPTER_REQ_RUN_XFER: @@ -847,8 +838,7 @@ scsipi_printaddr(periph); printf("unable to allocate ecb\n"); xs->error = XS_RESOURCE_SHORTAGE; - simple_unlock(&sc->sc_lock); - splx(s); + mtx_unlock(&sc->sc_lock); scsipi_done(xs); return; } @@ -877,12 +867,14 @@ if ((flags & XS_CTL_POLL) == 0) break; +#if 0 /* Not allowed to use interrupts, use polling instead */ if (ncr53c9x_poll(sc, xs, ecb->timeout)) { ncr53c9x_timeout(ecb); if (ncr53c9x_poll(sc, xs, ecb->timeout)) ncr53c9x_timeout(ecb); } +#endif break; case ADAPTER_REQ_GROW_RESOURCES: @@ -902,14 +894,14 @@ if ((sc->sc_cfflags & (1<<((xm->xm_target&7)+16))) == 0 && (xm->xm_mode & PERIPH_CAP_TQING)) { NCR_MISC(("%s: target %d: tagged queuing\n", - sc->sc_dev.dv_xname, xm->xm_target)); + sc->dv_name, xm->xm_target)); ti->flags |= T_TAG; } else ti->flags &= ~T_TAG; if ((xm->xm_mode & PERIPH_CAP_WIDE16) != 0) { NCR_MISC(("%s: target %d: wide scsi negotiation\n", - sc->sc_dev.dv_xname, xm->xm_target)); + sc->dv_name, xm->xm_target)); if (sc->sc_rev == NCR_VARIANT_FAS366) { ti->flags |= T_WIDE; ti->width = 1; @@ -919,7 +911,7 @@ if ((xm->xm_mode & PERIPH_CAP_SYNC) != 0 && (ti->flags & T_SYNCHOFF) == 0 && sc->sc_minsync != 0) { NCR_MISC(("%s: target %d: sync negotiation\n", - sc->sc_dev.dv_xname, xm->xm_target)); + sc->dv_name, xm->xm_target)); ti->flags |= T_NEGOTIATE; ti->period = sc->sc_minsync; } @@ -933,8 +925,7 @@ break; } - simple_unlock(&sc->sc_lock); - splx(s); + mtx_unlock(&sc->sc_lock); } static void @@ -967,34 +958,14 @@ /* * Used when interrupt driven I/O isn't allowed, e.g. during boot. */ -static int -ncr53c9x_poll(sc, xs, count) - struct ncr53c9x_softc *sc; - struct scsipi_xfer *xs; - int count; +static void +ncr53c9x_poll(struct cam_sim *sim) { NCR_TRACE(("[ncr53c9x_poll] ")); - while (count) { - if (NCRDMA_ISINTR(sc)) { - simple_unlock(&sc->sc_lock); - ncr53c9x_intr(sc); - simple_lock(&sc->sc_lock); - } -#if alternatively - if (NCR_READ_REG(sc, NCR_STAT) & NCRSTAT_INT) - ncr53c9x_intr(sc); -#endif - if ((xs->xs_status & XS_STS_DONE) != 0) - return (0); - if (sc->sc_state == NCR_IDLE) { - NCR_TRACE(("[ncr53c9x_poll: rescheduling] ")); - ncr53c9x_sched(sc); - } - DELAY(1000); - count--; + if (NCRDMA_ISINTR(sc)) { + ncr53c9x_intr(cam_sim_softc(sim)); } - return (1); } /* @@ -1224,9 +1195,9 @@ ncr53c9x_free_ecb(sc, ecb); ti->cmds++; - simple_unlock(&sc->sc_lock); + mtx_unlock(&sc->sc_lock); scsipi_done(xs); - simple_lock(&sc->sc_lock); + mtx_lock(&sc->sc_lock); } static void @@ -1410,7 +1381,7 @@ if (selid & (selid - 1)) { printf("%s: reselect with invalid selid %02x;" " sending DEVICE RESET\n", - sc->sc_dev.dv_xname, selid); + sc->dv_name, selid); goto reset; } @@ -1446,7 +1417,7 @@ if (ecb == NULL) { printf("%s: reselect from target %d lun %d tag %x:%x " "with no nexus; sending ABORT\n", - sc->sc_dev.dv_xname, target, lun, tagtype, tagid); + sc->dv_name, target, lun, tagtype, tagid); goto abort; } @@ -1505,7 +1476,7 @@ if (sc->sc_imlen == 0) { printf("%s: msgin: no msg byte available\n", - sc->sc_dev.dv_xname); + sc->dv_name); return; } @@ -1519,7 +1490,7 @@ sc->sc_state != NCR_RESELECTED) { printf("%s: phase change, dropping message, " "prev %d, state %d\n", - sc->sc_dev.dv_xname, sc->sc_prevphase, sc->sc_state); + sc->dv_name, sc->sc_prevphase, sc->sc_state); sc->sc_flags &= ~NCR_DROP_MSGI; sc->sc_imlen = 0; } @@ -1612,8 +1583,7 @@ * - Dequeue ecb from the queued array. */ printf("%s: tagged queuing rejected: " - "target %d\n", - sc->sc_dev.dv_xname, + "target %d\n", sc->dv_name, ecb->xs->xs_periph->periph_target); NCR_MSGS(("(rejected sent tag)")); @@ -1634,8 +1604,7 @@ case SEND_SDTR: printf("%s: sync transfer rejected: " - "target %d\n", - sc->sc_dev.dv_xname, + "target %d\n", sc->dv_name, ecb->xs->xs_periph->periph_target); sc->sc_flags &= ~NCR_SYNCHNEGO; @@ -1647,8 +1616,7 @@ case SEND_WDTR: printf("%s: wide transfer rejected: " - "target %d\n", - sc->sc_dev.dv_xname, + "target %d\n", sc->dv_xname, ecb->xs->xs_periph->periph_target); ti->flags &= ~(T_WIDE | T_WDTRSENT); ti->width = 0; @@ -1759,7 +1727,7 @@ case MSG_EXT_WDTR: #ifdef NCR53C9X_DEBUG printf("%s: wide mode %d\n", - sc->sc_dev.dv_xname, sc->sc_imess[3]); + sc->dv_name, sc->sc_imess[3]); #endif if (sc->sc_imess[3] == 1) { ti->cfg3 |= NCRFASCFG3_EWIDE; @@ -1800,8 +1768,7 @@ printf("%s: TAG reselect without IDENTIFY;" " MSG %x;" " sending DEVICE RESET\n", - sc->sc_dev.dv_xname, - sc->sc_imess[0]); + sc->dv_name, sc->sc_imess[0]); goto reset; } (void) ncr53c9x_reselect(sc, sc->sc_msgify, @@ -1815,8 +1782,7 @@ printf("%s: reselect without IDENTIFY;" " MSG %x;" " sending DEVICE RESET\n", - sc->sc_dev.dv_xname, - sc->sc_imess[1]); + sc->dv_name, sc->sc_imess[1]); goto reset; } (void) ncr53c9x_reselect(sc, sc->sc_msgify, 0, 0); @@ -1824,7 +1790,7 @@ default: printf("%s: unexpected MESSAGE IN; sending DEVICE RESET\n", - sc->sc_dev.dv_xname); + sc->dv_name); reset: ncr53c9x_sched_msgout(SEND_DEV_RESET); break; @@ -1882,7 +1848,7 @@ goto new; } else { printf("%s at line %d: unexpected MESSAGE OUT phase\n", - sc->sc_dev.dv_xname, __LINE__); + sc->dv_name, __LINE__); } } @@ -1919,7 +1885,7 @@ case SEND_IDENTIFY: if (sc->sc_state != NCR_CONNECTED) { printf("%s at line %d: no nexus\n", - sc->sc_dev.dv_xname, __LINE__); + sc->dv_name, __LINE__); } ecb = sc->sc_nexus; sc->sc_omess[0] = @@ -1928,7 +1894,7 @@ case SEND_TAG: if (sc->sc_state != NCR_CONNECTED) { printf("%s at line %d: no nexus\n", - sc->sc_dev.dv_xname, __LINE__); + sc->dv_name, __LINE__); } ecb = sc->sc_nexus; sc->sc_omess[0] = ecb->tag[0]; @@ -2037,7 +2003,7 @@ if (!NCRDMA_ISINTR(sc)) return (0); - simple_lock(&sc->sc_lock); + mtx_lock(&sc->sc_lock); again: /* and what do the registers say... */ ncr53c9x_readregs(sc); @@ -2066,7 +2032,7 @@ DELAY(1); } if (sc->sc_state != NCR_SBR) { - printf("%s: SCSI bus reset\n", sc->sc_dev.dv_xname); + printf("%s: SCSI bus reset\n", sc->dv_name); ncr53c9x_init(sc, 0); /* Restart everything */ goto out; } @@ -2077,7 +2043,7 @@ #endif if (sc->sc_nexus != NULL) panic("%s: nexus in reset state", - sc->sc_dev.dv_xname); + sc->dv_name); goto sched; } @@ -2111,7 +2077,7 @@ */ #ifdef DEBUG printf("%s: ESP100 work-around activated\n", - sc->sc_dev.dv_xname); + sc->dv_name); #endif sc->sc_flags &= ~NCR_EXPECT_ILLCMD; goto out; @@ -2119,7 +2085,7 @@ /* illegal command, out of sync ? */ printf("%s: illegal command: 0x%x " "(state %d, phase %x, prevphase %x)\n", - sc->sc_dev.dv_xname, sc->sc_lastcmd, + sc->dv_name, sc->sc_lastcmd, sc->sc_state, sc->sc_phase, sc->sc_prevphase); if (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF) { NCRCMD(sc, NCRCMD_FLUSH); @@ -2142,7 +2108,7 @@ int r = NCRDMA_INTR(sc); if (r == -1) { printf("%s: DMA error; resetting\n", - sc->sc_dev.dv_xname); + sc->dv_name); ncr53c9x_init(sc, 1); goto out; } @@ -2173,7 +2139,7 @@ printf("%s: !TC on MSG OUT" " [intr %x, stat %x, step %d]" " prevphase %x, resid %lx\n", - sc->sc_dev.dv_xname, + sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep, @@ -2189,7 +2155,7 @@ printf("%s: !TC on DATA XFER" " [intr %x, stat %x, step %d]" " prevphase %x, resid %x\n", - sc->sc_dev.dv_xname, + sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep, @@ -2203,7 +2169,7 @@ * Check for less serious errors. */ if ((sc->sc_espstat & NCRSTAT_PE) != 0) { - printf("%s: SCSI bus parity error\n", sc->sc_dev.dv_xname); + printf("%s: SCSI bus parity error\n", sc->dv_name); if (sc->sc_prevphase == MESSAGE_IN_PHASE) ncr53c9x_sched_msgout(SEND_PARITY_ERROR); else @@ -2279,7 +2245,7 @@ */ printf("%s: unexpected disconnect " "[state %d, intr %x, stat %x, phase(c %x, p %x)]; ", - sc->sc_dev.dv_xname, sc->sc_state, + sc->dv_name, sc->sc_state, sc->sc_espintr, sc->sc_espstat, sc->sc_phase, sc->sc_prevphase); @@ -2309,7 +2275,7 @@ case NCR_SBR: printf("%s: waiting for SCSI Bus Reset to happen\n", - sc->sc_dev.dv_xname); + sc->dv_name); goto out; case NCR_RESELECTED: @@ -2318,7 +2284,7 @@ */ printf("%s: unhandled reselect continuation, " "state %d, intr %02x\n", - sc->sc_dev.dv_xname, sc->sc_state, sc->sc_espintr); + sc->dv_name, sc->sc_state, sc->sc_espintr); ncr53c9x_init(sc, 1); goto out; break; @@ -2332,7 +2298,7 @@ * Pull the brakes, i.e. reset */ printf("%s: target didn't send tag: %d bytes in fifo\n", - sc->sc_dev.dv_xname, i); + sc->dv_name, i); /* Drain and display fifo */ while (i-- > 0) printf("[%d] ", NCR_READ_REG(sc, NCR_FIFO)); @@ -2370,7 +2336,7 @@ * Pull the brakes, i.e. reset */ printf("%s: target didn't identify\n", - sc->sc_dev.dv_xname); + sc->dv_name); ncr53c9x_init(sc, 1); goto out; } @@ -2408,7 +2374,7 @@ printf("%s: RESELECT: %d bytes in FIFO! " "[intr %x, stat %x, step %d, " "prevphase %x]\n", - sc->sc_dev.dv_xname, + sc->dv_name, nfifo, sc->sc_espintr, sc->sc_espstat, @@ -2428,7 +2394,7 @@ /* IDENTIFY fail?! */ printf("%s: identify failed, " "state %d, intr %02x\n", - sc->sc_dev.dv_xname, sc->sc_state, + sc->dv_name, sc->sc_state, sc->sc_espintr); ncr53c9x_init(sc, 1); goto out; @@ -2466,12 +2432,12 @@ if ((ti->flags & T_NEGOTIATE) == 0 && ecb->tag[0] == 0) { printf("%s: step 1 & !NEG\n", - sc->sc_dev.dv_xname); + sc->dv_name); goto reset; } if (sc->sc_phase != MESSAGE_OUT_PHASE) { printf("%s: !MSGOUT\n", - sc->sc_dev.dv_xname); + sc->dv_name); goto reset; } if (ti->flags & T_WIDE) { @@ -2516,7 +2482,7 @@ printf("(%s:%d:%d): selection failed;" " %d left in FIFO " "[intr %x, stat %x, step %d]\n", - sc->sc_dev.dv_xname, + sc->dv_name, periph->periph_target, periph->periph_lun, NCR_READ_REG(sc, NCR_FFLAG) @@ -2536,7 +2502,7 @@ printf("(%s:%d:%d): select; " "%lu left in DMA buffer " "[intr %x, stat %x, step %d]\n", - sc->sc_dev.dv_xname, + sc->dv_name, periph->periph_target, periph->periph_lun, (u_long)sc->sc_cmdlen, @@ -2558,15 +2524,15 @@ printf("%s: unexpected status after select" ": [intr %x, stat %x, step %x]\n", - sc->sc_dev.dv_xname, + sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); NCRCMD(sc, NCRCMD_FLUSH); DELAY(1); goto reset; } if (sc->sc_state == NCR_IDLE) { - printf("%s: stray interrupt\n", sc->sc_dev.dv_xname); - simple_unlock(&sc->sc_lock); + printf("%s: stray interrupt\n", sc->dv_name); + mtx_unlock(&sc->sc_lock); return (0); } break; @@ -2581,14 +2547,14 @@ if (!(sc->sc_espintr & NCRINTR_DONE)) { printf("%s: ICCS: " ": [intr %x, stat %x, step %x]\n", - sc->sc_dev.dv_xname, + sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); } ncr53c9x_rdfifo(sc, NCR_RDFIFO_START); if (sc->sc_imlen < 2) printf("%s: can't get status, only %d bytes\n", - sc->sc_dev.dv_xname, (int)sc->sc_imlen); + sc->dv_name, (int)sc->sc_imlen); ecb->stat = sc->sc_imess[sc->sc_imlen - 2]; msg = sc->sc_imess[sc->sc_imlen - 1]; NCR_PHASE(("", ecb->stat, msg)); @@ -2600,7 +2566,7 @@ sc->sc_state = NCR_CMDCOMPLETE; } else printf("%s: STATUS_PHASE: msg %d\n", - sc->sc_dev.dv_xname, msg); + sc->dv_name, msg); sc->sc_imlen = 0; NCRCMD(sc, NCRCMD_MSGOK); goto shortcut; /* ie. wait for disconnect */ @@ -2609,7 +2575,7 @@ default: printf("%s: invalid state: %d [intr %x, phase(c %x, p %x)]\n", - sc->sc_dev.dv_xname, sc->sc_state, + sc->dv_name, sc->sc_state, sc->sc_espintr, sc->sc_phase, sc->sc_prevphase); goto reset; } @@ -2643,7 +2609,7 @@ if ((sc->sc_flags & NCR_WAITI) == 0) { printf("%s: MSGIN: unexpected FC bit: " "[intr %x, stat %x, step %x]\n", - sc->sc_dev.dv_xname, + sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); } @@ -2655,7 +2621,7 @@ } else { printf("%s: MSGIN: weird bits: " "[intr %x, stat %x, step %x]\n", - sc->sc_dev.dv_xname, + sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); } sc->sc_prevphase = MESSAGE_IN_PHASE; @@ -2750,12 +2716,12 @@ default: printf("%s: unexpected bus phase; resetting\n", - sc->sc_dev.dv_xname); + sc->dv_name); goto reset; } out: - simple_unlock(&sc->sc_lock); + mtx_unlock(&sc->sc_lock); return (1); reset: @@ -2844,13 +2810,12 @@ struct ncr53c9x_softc *sc = (void *)periph->periph_channel->chan_adapter->adapt_dev; struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[periph->periph_target]; - int s; scsipi_printaddr(periph); printf("%s: timed out [ecb %p (flags 0x%x, dleft %x, stat %x)], " "", - sc->sc_dev.dv_xname, + sc->dv_name, ecb, ecb->flags, ecb->dleft, ecb->stat, sc->sc_state, sc->sc_nexus, NCR_READ_REG(sc, NCR_STAT), @@ -2861,8 +2826,7 @@ printf("TRACE: %s.", ecb->trace); #endif - s = splbio(); - simple_lock(&sc->sc_lock); + mtx_lock(&sc->sc_lock); if (ecb->flags & ECB_ABORT) { /* abort timed out */ @@ -2888,8 +2852,7 @@ } } - simple_unlock(&sc->sc_lock); - splx(s); + mtx_unlock(&sc->sc_lock); } static void @@ -2899,12 +2862,11 @@ struct ncr53c9x_softc *sc = (struct ncr53c9x_softc *)arg; struct ncr53c9x_tinfo *ti; struct ncr53c9x_linfo *li; - int t, s; + int t; /* Delete any structures that have not been used in 10min. */ time_t old = time.tv_sec - (10 * 60); - s = splbio(); - simple_lock(&sc->sc_lock); + mtx_lock(&sc->sc_lock); for (t = 0; t < sc->sc_ntarg; t++) { ti = &sc->sc_tinfo[t]; li = LIST_FIRST(&ti->luns); @@ -2923,8 +2885,7 @@ li = LIST_NEXT(li, link); } } - simple_unlock(&sc->sc_lock); - splx(s); + mtx_unlock(&sc->sc_lock); callout_reset(&sc->sc_watchdog, 60 * hz, ncr53c9x_watch, sc); } ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#5 (text+ko) ==== @@ -270,6 +270,7 @@ struct ncr53c9x_softc { device_t sc_dev; /* us as a device */ + char *dv_name; struct cam_sim *sim; /* our scsi adapter */ struct cam_path *path; /* our scsi channel */ From owner-p4-projects@FreeBSD.ORG Sun Jun 6 04:27:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A58D316A4D1; Sun, 6 Jun 2004 04:27:27 -0700 (PDT) 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 7008516A4CF for ; Sun, 6 Jun 2004 04:27:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A17443D31 for ; Sun, 6 Jun 2004 04:27:27 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i56BRRCM025724 for ; Sun, 6 Jun 2004 11:27:27 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i56BRRaZ025721 for perforce@freebsd.org; Sun, 6 Jun 2004 11:27:27 GMT (envelope-from scottl@freebsd.org) Date: Sun, 6 Jun 2004 11:27:27 GMT Message-Id: <200406061127.i56BRRaZ025721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2004 11:27:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=54262 Change 54262 by scottl@scottl-esp-sparc64 on 2004/06/06 11:26:55 Change to the uma API. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#6 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#6 (text+ko) ==== @@ -87,6 +87,7 @@ #include #include #include +#include #include #include @@ -144,8 +145,8 @@ } \ } while (0) -static int ecb_pool_initialized = 0; -static struct pool ecb_pool; +static int ecb_zone_initialized = 0; +static uma_zone_t ecb_zone; /* * Names for the NCR53c9x variants, correspnding to the variant tags @@ -430,11 +431,12 @@ NCR_MISC(("[NCR_INIT(%d) %d] ", doreset, sc->sc_state)); - if (!ecb_pool_initialized) { - /* All instances share this pool */ - pool_init(&ecb_pool, sizeof(struct ncr53c9x_ecb), 0, 0, 0, - "ncr53c9x_ecb", NULL); - ecb_pool_initialized = 1; + if (!ecb_zone_initialized) { + /* All instances share this zone */ + ecb_zone = uma_zcreate("ncr53c9x ecb zone", + sizeof(struct ncr53c9x_ecb), NULL, NULL, + NULL, NULL, 8, M_NOWAIT); + ecb_zone_initialized = 1; } if (sc->sc_state == 0) { @@ -777,7 +779,7 @@ { ecb->flags = 0; - pool_put(&ecb_pool, (void *)ecb); + uma_zfree(ecb_zone, (void *)ecb); return; } @@ -788,7 +790,7 @@ { struct ncr53c9x_ecb *ecb; - ecb = (struct ncr53c9x_ecb *)pool_get(&ecb_pool, PR_NOWAIT); + ecb = (struct ncr53c9x_ecb *)uma_zalloc(ecb_zone, M_NOWAIT); if (ecb) { memset(ecb, 0, sizeof(*ecb)); ecb->flags |= ECB_ALLOC; From owner-p4-projects@FreeBSD.ORG Mon Jun 7 04:35:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4086A16A52E; Mon, 7 Jun 2004 04:35:31 +0000 (GMT) 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 12F5A16A4E2 for ; Mon, 7 Jun 2004 04:35:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA7C343D31 for ; Mon, 7 Jun 2004 04:35:30 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i574ZUZk078026 for ; Mon, 7 Jun 2004 04:35:30 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i574ZUF6078016 for perforce@freebsd.org; Mon, 7 Jun 2004 04:35:30 GMT (envelope-from scottl@freebsd.org) Date: Mon, 7 Jun 2004 04:35:30 GMT Message-Id: <200406070435.i574ZUF6078016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 04:35:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=54290 Change 54290 by scottl@scottl-esp-sparc64 on 2004/06/07 04:34:52 Change ncr53c9x_attach() to return an int so that it can pass up error codes. Use time_second for getting the approximate time Add some CAM includes Convert ncr53c9x_attach() to do the CAM thing. Disable ncr53c9x_detach() for now. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#7 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#6 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#7 (text+ko) ==== @@ -87,11 +87,16 @@ #include #include #include +#include #include #include #include +#include +#include +#include #include +#include #include #include @@ -104,7 +109,7 @@ static void ncr53c9x_select(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); static int ncr53c9x_reselect(struct ncr53c9x_softc *, int, int, int); static void ncr53c9x_scsi_reset(struct ncr53c9x_softc *); -static int ncr53c9x_poll(struct cam_sim *); +static void ncr53c9x_poll(struct cam_sim *); static void ncr53c9x_sched(struct ncr53c9x_softc *); static void ncr53c9x_done(struct ncr53c9x_softc *, struct ncr53c9x_ecb *); static void ncr53c9x_msgin(struct ncr53c9x_softc *); @@ -184,14 +189,14 @@ /* * Attach this instance, and then all the sub-devices */ -void -ncr53c9x_attach(sc) - struct ncr53c9x_softc *sc; +int +ncr53c9x_attach(struct ncr53c9x_softc *sc) { - struct scsipi_adapter *adapt = &sc->sc_adapter; - struct scsipi_channel *chan = &sc->sc_channel; + struct cam_devq *devq; + struct cam_sim *sim; + struct cam_path *path; - mtx_init(&sc->sc_lock, "ncr" "ncr53c9x lock", MTX_DEF); + mtx_init(&sc->sc_lock, "ncr", "ncr53c9x lock", MTX_DEF); sc->dv_name = device_get_nameunit(sc->sc_dev); /* @@ -200,7 +205,7 @@ if (sc->sc_rev >= NCR_VARIANT_MAX) { printf("\n%s: unknown variant %d, devices not attached\n", sc->dv_name, sc->sc_rev); - return; + return (EINVAL); } printf(": %s, %dMHz, SCSI ID %d\n", @@ -225,7 +230,7 @@ if (!sc->sc_omess || !sc->sc_imess || !sc->sc_tinfo) { printf("out of memory\n"); - return; + return (ENOMEM); } callout_init(&sc->sc_watchdog, 0); @@ -260,48 +265,42 @@ sc->sc_ccf &= 7; /* - * Fill in the scsipi_adapter. + * Register with CAM */ - adapt->adapt_dev = &sc->sc_dev; - adapt->adapt_nchannels = 1; - adapt->adapt_openings = 256; - adapt->adapt_max_periph = 256; - /* adapt_request initialized by front-end */ - /* adapt_minphys initialized by front-end */ + devq = cam_simq_alloc(sc->sc_ntarg); + if (devq == NULL) + return (ENOMEM); - /* - * Fill in the scsipi_channel. - */ - memset(chan, 0, sizeof(*chan)); - chan->chan_adapter = adapt; - chan->chan_bustype = &scsi_bustype; - chan->chan_channel = 0; - chan->chan_ntargets = sc->sc_ntarg; - chan->chan_nluns = 8; - chan->chan_id = sc->sc_id; + sim = cam_sim_alloc(ncr53c9x_action, ncr53c9x_poll, "esp", sc, + device_get_unit(sc->sc_dev), 256, 1, devq); + if (sim == NULL) { + cam_simq_free(devq); + return (ENOMEM); + } + if (xpt_bus_register(sim, 0) != CAM_SUCCESS) { + cam_sim_free(sim, TRUE); + return (EIO); + } - /* - * Add reference to adapter so that we drop the reference after - * config_found() to make sure the adatper is disabled. - */ - if (scsipi_adapter_addref(adapt) != 0) { - printf("%s: unable to enable controller\n", - sc->dv_name); - return; + if (xpt_create_path(&path, NULL, cam_sim_path(sim), + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) + != CAM_REQ_CMP) { + xpt_bus_deregister(cam_sim_path(sim)); + cam_sim_free(sim, TRUE); + return (EIO); } + sc->sc_sim = sim; + sc->sc_path = path; + /* Reset state & bus */ sc->sc_cfflags = sc->sc_dev.dv_cfdata->cf_flags; sc->sc_state = 0; ncr53c9x_init(sc, 1); - /* - * Now try to attach all the sub-devices - */ - sc->sc_child = config_found(&sc->sc_dev, &sc->sc_channel, scsiprint); + callout_reset(&sc->sc_watchdog, 60*hz, ncr53c9x_watch, sc); - scsipi_adapter_delref(adapt); - callout_reset(&sc->sc_watchdog, 60*hz, ncr53c9x_watch, sc); + return (0); } int @@ -309,18 +308,13 @@ struct ncr53c9x_softc *sc; int flags; { - int error; - if (sc->sc_child) { - error = config_detach(sc->sc_child, flags); - if (error) - return (error); - } - +#if 0 /* don't allow detach for now */ free(sc->sc_imess, M_DEVBUF); free(sc->sc_omess, M_DEVBUF); +#endif - return (0); + return (EINVAL); } /* @@ -1033,7 +1027,7 @@ if (lun < NCR_NLUN) ti->lun[lun] = li; } - li->last_used = time.tv_sec; + li->last_used = time_second; if (tag == 0) { /* Try to issue this as an un-tagged command */ if (li->untagged == NULL) @@ -2866,7 +2860,7 @@ struct ncr53c9x_linfo *li; int t; /* Delete any structures that have not been used in 10min. */ - time_t old = time.tv_sec - (10 * 60); + time_t old = time_second - (10 * 60); mtx_lock(&sc->sc_lock); for (t = 0; t < sc->sc_ntarg; t++) { ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#6 (text+ko) ==== @@ -272,11 +272,8 @@ device_t sc_dev; /* us as a device */ char *dv_name; - struct cam_sim *sim; /* our scsi adapter */ - struct cam_path *path; /* our scsi channel */ -#if 0 - struct device *sc_child; /* attached scsibus, if any */ -#endif + struct cam_sim *sc_sim; /* our scsi adapter */ + struct cam_path *sc_path; /* our scsi channel */ struct callout sc_watchdog; /* periodic timer */ struct ncr53c9x_glue *sc_glue; /* glue to MD code */ @@ -445,7 +442,7 @@ #define ncr53c9x_cpb2stp(sc, cpb) \ ((250 * (cpb)) / (sc)->sc_freq) -void ncr53c9x_attach(struct ncr53c9x_softc *); +int ncr53c9x_attach(struct ncr53c9x_softc *); int ncr53c9x_detach(struct ncr53c9x_softc *, int); void ncr53c9x_action(struct cam_sim *, union ccb *); void ncr53c9x_reset(struct ncr53c9x_softc *); From owner-p4-projects@FreeBSD.ORG Mon Jun 7 06:02:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B691216A4D1; Mon, 7 Jun 2004 06:02:33 +0000 (GMT) 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 7775516A4CE; Mon, 7 Jun 2004 06:02:33 +0000 (GMT) Received: from TRANG.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56C7343D48; Mon, 7 Jun 2004 06:02:33 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by TRANG.nuxi.com (8.12.11/8.12.10) with ESMTP id i5762THo005793; Sun, 6 Jun 2004 23:02:29 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.11/8.12.11/Submit) id i5762S2f005792; Sun, 6 Jun 2004 23:02:28 -0700 (PDT) (envelope-from obrien) Date: Sun, 6 Jun 2004 23:02:28 -0700 From: "David O'Brien" To: Peter Wemm Message-ID: <20040607060228.GB2746@dragon.nuxi.com> References: <200406032312.i53NCWLq055737@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200406032312.i53NCWLq055737@repoman.freebsd.org> User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 5.2-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 cc: Perforce Change Reviews Subject: Re: PERFORCE change 54116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 06:02:34 -0000 On Thu, Jun 03, 2004 at 04:12:32PM -0700, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=54116 > > Change 54116 by peter@peter_daintree on 2004/06/03 16:11:34 > > slight reorg. promote features bits to public interfaces, test cpuid > for the NX bits and turn on EFER_NXE etc. Can you please commit this to CVS? Properly turning on EFER_NXE on AMD64 (vs. Intel CT) was something I started working on. NXE support is something needed for 5.3. :-) -- -- David (obrien@FreeBSD.org) From owner-p4-projects@FreeBSD.ORG Mon Jun 7 10:25:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92FEC16A4D1; Mon, 7 Jun 2004 10:25:01 +0000 (GMT) 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 4F59F16A4CE for ; Mon, 7 Jun 2004 10:25:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A07543D46 for ; Mon, 7 Jun 2004 10:25:01 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57AP1Z0067092 for ; Mon, 7 Jun 2004 10:25:01 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57AOjNq067081 for perforce@freebsd.org; Mon, 7 Jun 2004 10:24:45 GMT (envelope-from dfr@freebsd.org) Date: Mon, 7 Jun 2004 10:24:45 GMT Message-Id: <200406071024.i57AOjNq067081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 54303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 10:25:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=54303 Change 54303 by dfr@dfr_home on 2004/06/07 10:24:24 IFC. Affected files ... .. //depot/projects/kse/bin/ps/ps.1#15 integrate .. //depot/projects/kse/bin/ps/ps.c#15 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#5 integrate .. //depot/projects/kse/include/Makefile#5 integrate .. //depot/projects/kse/include/complex.h#2 integrate .. //depot/projects/kse/include/ctype.h#6 integrate .. //depot/projects/kse/include/fts.h#3 integrate .. //depot/projects/kse/include/rpcsvc/yp_prot.h#2 integrate .. //depot/projects/kse/include/stdio.h#6 integrate .. //depot/projects/kse/include/wchar.h#10 integrate .. //depot/projects/kse/include/wctype.h#4 integrate .. //depot/projects/kse/lib/libc/Makefile#3 integrate .. //depot/projects/kse/lib/libc/arm/SYS.h#1 branch .. //depot/projects/kse/lib/libc/arm/_fpmath.h#1 branch .. //depot/projects/kse/lib/libc/arm/arith.h#1 branch .. //depot/projects/kse/lib/libc/arm/gen/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/arm/gen/_ctx_start.S#1 branch .. //depot/projects/kse/lib/libc/arm/gen/_setjmp.S#1 branch .. //depot/projects/kse/lib/libc/arm/gen/alloca.S#1 branch .. //depot/projects/kse/lib/libc/arm/gen/divsi3.S#1 branch .. //depot/projects/kse/lib/libc/arm/gen/fabs.c#1 branch .. //depot/projects/kse/lib/libc/arm/gen/frexp.c#1 branch .. //depot/projects/kse/lib/libc/arm/gen/infinity.c#1 branch .. //depot/projects/kse/lib/libc/arm/gen/isinf.c#1 branch .. //depot/projects/kse/lib/libc/arm/gen/ldexp.c#1 branch .. //depot/projects/kse/lib/libc/arm/gen/makecontext.c#1 branch .. //depot/projects/kse/lib/libc/arm/gen/modf.c#1 branch .. //depot/projects/kse/lib/libc/arm/gen/setjmp.S#1 branch .. //depot/projects/kse/lib/libc/arm/gen/signalcontext.c#1 branch .. //depot/projects/kse/lib/libc/arm/gen/sigsetjmp.S#1 branch .. //depot/projects/kse/lib/libc/arm/net/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/arm/net/htonl.S#1 branch .. //depot/projects/kse/lib/libc/arm/net/htons.S#1 branch .. //depot/projects/kse/lib/libc/arm/net/ntohl.S#1 branch .. //depot/projects/kse/lib/libc/arm/net/ntohs.S#1 branch .. //depot/projects/kse/lib/libc/arm/softfloat/arm-gcc.h#1 branch .. //depot/projects/kse/lib/libc/arm/softfloat/milieu.h#1 branch .. //depot/projects/kse/lib/libc/arm/softfloat/softfloat.h#1 branch .. //depot/projects/kse/lib/libc/arm/stdlib/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/arm/stdlib/gdtoa.mk#1 branch .. //depot/projects/kse/lib/libc/arm/string/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/arm/string/bcopy.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/bzero.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/ffs.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/memcmp.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/memcpy.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/memcpy_arm.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/memcpy_xscale.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/memmove.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/memset.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/strcmp.S#1 branch .. //depot/projects/kse/lib/libc/arm/string/strncmp.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/arm/sys/Ovfork.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/brk.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/cerror.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/fork.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/getcontext.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/pipe.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/ptrace.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/sbrk.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/shmat.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/sigreturn.S#1 branch .. //depot/projects/kse/lib/libc/arm/sys/syscall.S#1 branch .. //depot/projects/kse/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/kse/lib/libc/gen/dlopen.3#5 integrate .. //depot/projects/kse/lib/libc/gen/fmtcheck.c#3 integrate .. //depot/projects/kse/lib/libc/gen/ftok.c#2 integrate .. //depot/projects/kse/lib/libc/gen/fts.c#4 integrate .. //depot/projects/kse/lib/libc/gen/getgrent.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/kse/lib/libc/gen/getpwent.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getpwent.c#3 integrate .. //depot/projects/kse/lib/libc/gen/getvfsent.3#3 delete .. //depot/projects/kse/lib/libc/gen/getvfsent.c#4 delete .. //depot/projects/kse/lib/libc/gen/lockf.3#3 integrate .. //depot/projects/kse/lib/libc/gen/signal.3#3 integrate .. //depot/projects/kse/lib/libc/gen/syslog.c#3 integrate .. //depot/projects/kse/lib/libc/gen/ualarm.3#3 integrate .. //depot/projects/kse/lib/libc/gen/wordexp.c#2 integrate .. //depot/projects/kse/lib/libc/gmon/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/locale/big5.c#4 integrate .. //depot/projects/kse/lib/libc/locale/btowc.c#4 integrate .. //depot/projects/kse/lib/libc/locale/euc.c#5 integrate .. //depot/projects/kse/lib/libc/locale/gb18030.c#3 integrate .. //depot/projects/kse/lib/libc/locale/gb2312.c#3 integrate .. //depot/projects/kse/lib/libc/locale/gbk.c#3 integrate .. //depot/projects/kse/lib/libc/locale/ldpart.c#4 integrate .. //depot/projects/kse/lib/libc/locale/mblen.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mblen.c#5 integrate .. //depot/projects/kse/lib/libc/locale/mblocal.h#1 branch .. //depot/projects/kse/lib/libc/locale/mbrlen.3#4 integrate .. //depot/projects/kse/lib/libc/locale/mbrlen.c#4 integrate .. //depot/projects/kse/lib/libc/locale/mbrtowc.3#4 integrate .. //depot/projects/kse/lib/libc/locale/mbrtowc.c#5 integrate .. //depot/projects/kse/lib/libc/locale/mbsinit.3#3 integrate .. //depot/projects/kse/lib/libc/locale/mbsinit.c#3 integrate .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.3#4 integrate .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.c#4 integrate .. //depot/projects/kse/lib/libc/locale/mbstowcs.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbstowcs.c#5 integrate .. //depot/projects/kse/lib/libc/locale/mbtowc.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbtowc.c#6 integrate .. //depot/projects/kse/lib/libc/locale/mskanji.c#4 integrate .. //depot/projects/kse/lib/libc/locale/multibyte.3#6 integrate .. //depot/projects/kse/lib/libc/locale/none.c#4 integrate .. //depot/projects/kse/lib/libc/locale/runetype.c#3 integrate .. //depot/projects/kse/lib/libc/locale/setrunelocale.c#5 integrate .. //depot/projects/kse/lib/libc/locale/srune.c#3 integrate .. //depot/projects/kse/lib/libc/locale/table.c#4 integrate .. //depot/projects/kse/lib/libc/locale/tolower.c#3 integrate .. //depot/projects/kse/lib/libc/locale/toupper.c#3 integrate .. //depot/projects/kse/lib/libc/locale/utf2.c#4 integrate .. //depot/projects/kse/lib/libc/locale/utf8.5#3 integrate .. //depot/projects/kse/lib/libc/locale/utf8.c#4 integrate .. //depot/projects/kse/lib/libc/locale/wcrtomb.3#4 integrate .. //depot/projects/kse/lib/libc/locale/wcrtomb.c#5 integrate .. //depot/projects/kse/lib/libc/locale/wcsrtombs.3#4 integrate .. //depot/projects/kse/lib/libc/locale/wcsrtombs.c#4 integrate .. //depot/projects/kse/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/kse/lib/libc/locale/wcstombs.c#5 integrate .. //depot/projects/kse/lib/libc/locale/wctob.c#4 integrate .. //depot/projects/kse/lib/libc/locale/wctomb.3#2 integrate .. //depot/projects/kse/lib/libc/locale/wctomb.c#5 integrate .. //depot/projects/kse/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/kse/lib/libc/net/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/net/eui64.3#1 branch .. //depot/projects/kse/lib/libc/net/eui64.c#1 branch .. //depot/projects/kse/lib/libc/net/getaddrinfo.c#7 integrate .. //depot/projects/kse/lib/libc/net/name6.c#7 integrate .. //depot/projects/kse/lib/libc/net/res_query.c#5 integrate .. //depot/projects/kse/lib/libc/softfloat/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/softfloat/README.NetBSD#1 branch .. //depot/projects/kse/lib/libc/softfloat/README.txt#1 branch .. //depot/projects/kse/lib/libc/softfloat/bits32/softfloat-macros#1 branch .. //depot/projects/kse/lib/libc/softfloat/bits32/softfloat.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/bits64/softfloat-macros#1 branch .. //depot/projects/kse/lib/libc/softfloat/bits64/softfloat.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/eqdf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/eqsf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/fpgetmask.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/fpgetround.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/fpgetsticky.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/fpsetmask.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/fpsetround.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/fpsetsticky.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/gedf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/gesf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/gtdf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/gtsf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/ledf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/lesf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/ltdf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/ltsf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/nedf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/negdf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/negsf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/nesf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/softfloat-for-gcc.h#1 branch .. //depot/projects/kse/lib/libc/softfloat/softfloat-history.txt#1 branch .. //depot/projects/kse/lib/libc/softfloat/softfloat-source.txt#1 branch .. //depot/projects/kse/lib/libc/softfloat/softfloat-specialize#1 branch .. //depot/projects/kse/lib/libc/softfloat/softfloat.txt#1 branch .. //depot/projects/kse/lib/libc/softfloat/templates/milieu.h#1 branch .. //depot/projects/kse/lib/libc/softfloat/templates/softfloat-specialize#1 branch .. //depot/projects/kse/lib/libc/softfloat/templates/softfloat.h#1 branch .. //depot/projects/kse/lib/libc/softfloat/timesoftfloat.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/timesoftfloat.txt#1 branch .. //depot/projects/kse/lib/libc/softfloat/unorddf2.c#1 branch .. //depot/projects/kse/lib/libc/softfloat/unordsf2.c#1 branch .. //depot/projects/kse/lib/libc/stdio/fgetwc.c#5 integrate .. //depot/projects/kse/lib/libc/stdio/findfp.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/fputwc.c#5 integrate .. //depot/projects/kse/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/fseek.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/getwc.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/getwchar.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/local.h#7 integrate .. //depot/projects/kse/lib/libc/stdio/putwc.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/putwchar.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/ungetwc.c#5 integrate .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/kse/lib/libc/stdio/vfscanf.c#6 integrate .. //depot/projects/kse/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/vfwscanf.c#4 integrate .. //depot/projects/kse/lib/libc/stdlib/Makefile.inc#4 integrate .. //depot/projects/kse/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/kse/lib/libc/stdlib/radixsort.3#2 integrate .. //depot/projects/kse/lib/libc/sys/acct.2#4 integrate .. //depot/projects/kse/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/kse/lib/libc/sys/flock.2#3 integrate .. //depot/projects/kse/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/kse/lib/libc/sys/mlock.2#4 integrate .. //depot/projects/kse/lib/libc/sys/mmap.2#4 integrate .. //depot/projects/kse/lib/libc/sys/nfssvc.2#3 integrate .. //depot/projects/kse/lib/libc/sys/send.2#3 integrate .. //depot/projects/kse/lib/libc/xdr/xdr_float.c#3 integrate .. //depot/projects/kse/lib/libkvm/kvm_amd64.c#2 integrate .. //depot/projects/kse/lib/libkvm/kvm_arm.c#1 branch .. //depot/projects/kse/lib/libpthread/arch/arm/Makefile.inc#1 branch .. //depot/projects/kse/lib/libpthread/arch/arm/arm/context.S#1 branch .. //depot/projects/kse/lib/libpthread/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/kse/lib/libpthread/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/kse/lib/libpthread/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/kse/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_barrier.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_cancel.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_detach.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_join.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_resume_np.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_spinlock.c#2 integrate .. //depot/projects/kse/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/kse/libexec/rtld-elf/Makefile#2 integrate .. //depot/projects/kse/libexec/rtld-elf/arm/Makefile.inc#1 branch .. //depot/projects/kse/libexec/rtld-elf/arm/lockdflt.c#1 branch .. //depot/projects/kse/libexec/rtld-elf/arm/reloc.c#1 branch .. //depot/projects/kse/libexec/rtld-elf/arm/rtld_machdep.h#1 branch .. //depot/projects/kse/libexec/rtld-elf/arm/rtld_start.S#1 branch .. //depot/projects/kse/libexec/rtld-elf/libmap.c#2 integrate .. //depot/projects/kse/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/kse/sys/Makefile#4 integrate .. //depot/projects/kse/sys/alpha/alpha/elf_machdep.c#7 integrate .. //depot/projects/kse/sys/alpha/alpha/fp_emulate.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/ieee_float.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/interrupt.c#17 integrate .. //depot/projects/kse/sys/alpha/alpha/mem.c#9 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#37 integrate .. //depot/projects/kse/sys/alpha/alpha/promcons.c#8 integrate .. //depot/projects/kse/sys/alpha/alpha/support.s#9 integrate .. //depot/projects/kse/sys/alpha/alpha/uio_machdep.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#34 integrate .. //depot/projects/kse/sys/alpha/conf/GENERIC#18 integrate .. //depot/projects/kse/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/kse/sys/alpha/include/float.h#5 integrate .. //depot/projects/kse/sys/alpha/include/fpu.h#5 integrate .. //depot/projects/kse/sys/alpha/include/pmap.h#15 integrate .. //depot/projects/kse/sys/alpha/include/profile.h#3 integrate .. //depot/projects/kse/sys/alpha/include/sf_buf.h#2 integrate .. //depot/projects/kse/sys/alpha/linux/linux_proto.h#10 integrate .. //depot/projects/kse/sys/alpha/linux/linux_syscall.h#7 integrate .. //depot/projects/kse/sys/alpha/linux/linux_sysent.c#7 integrate .. //depot/projects/kse/sys/alpha/linux/syscalls.master#8 integrate .. //depot/projects/kse/sys/alpha/tlsb/zs_tlsb.c#8 integrate .. //depot/projects/kse/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/kse/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/kse/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/kse/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/kse/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/kse/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/kse/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/kse/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/kse/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/kse/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/kse/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/kse/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/kse/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/kse/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/kse/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/kse/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/kse/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/kse/sys/amd64/include/float.h#3 integrate .. //depot/projects/kse/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/kse/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/kse/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/kse/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/kse/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/kse/sys/amd64/include/profile.h#3 integrate .. //depot/projects/kse/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/kse/sys/amd64/include/smp.h#2 integrate .. //depot/projects/kse/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/kse/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/kse/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/kse/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/kse/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/kse/sys/amd64/isa/nmi.c#3 integrate .. //depot/projects/kse/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/kse/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/kse/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/kse/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/kse/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/kse/sys/arm/arm/blockio.S#1 branch .. //depot/projects/kse/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/kse/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/kse/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/kse/sys/arm/arm/copystr.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/kse/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/kse/sys/arm/arm/critical.c#1 branch .. //depot/projects/kse/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/kse/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/kse/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/kse/sys/arm/arm/disassem.c#1 branch .. //depot/projects/kse/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/kse/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/kse/sys/arm/arm/exception.S#1 branch .. //depot/projects/kse/sys/arm/arm/fiq.c#1 branch .. //depot/projects/kse/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/kse/sys/arm/arm/fusu.S#1 branch .. //depot/projects/kse/sys/arm/arm/genassym.c#1 branch .. //depot/projects/kse/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/kse/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/kse/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/kse/sys/arm/arm/intr.c#1 branch .. //depot/projects/kse/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/kse/sys/arm/arm/locore.S#1 branch .. //depot/projects/kse/sys/arm/arm/machdep.c#1 branch .. //depot/projects/kse/sys/arm/arm/nexus.c#1 branch .. //depot/projects/kse/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/kse/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/kse/sys/arm/arm/pmap.c#1 branch .. //depot/projects/kse/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/kse/sys/arm/arm/setstack.s#1 branch .. //depot/projects/kse/sys/arm/arm/support.S#1 branch .. //depot/projects/kse/sys/arm/arm/swtch.S#1 branch .. //depot/projects/kse/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/kse/sys/arm/arm/trap.c#1 branch .. //depot/projects/kse/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/kse/sys/arm/arm/undefined.c#1 branch .. //depot/projects/kse/sys/arm/arm/vectors.S#1 branch .. //depot/projects/kse/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/kse/sys/arm/conf/SIMICS#1 branch .. //depot/projects/kse/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/kse/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/kse/sys/arm/include/_types.h#4 integrate .. //depot/projects/kse/sys/arm/include/armreg.h#1 branch .. //depot/projects/kse/sys/arm/include/asm.h#1 branch .. //depot/projects/kse/sys/arm/include/asmacros.h#1 branch .. //depot/projects/kse/sys/arm/include/atomic.h#1 branch .. //depot/projects/kse/sys/arm/include/blockio.h#1 branch .. //depot/projects/kse/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/kse/sys/arm/include/bus.h#1 branch .. //depot/projects/kse/sys/arm/include/clock.h#1 branch .. //depot/projects/kse/sys/arm/include/cpu.h#1 branch .. //depot/projects/kse/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/kse/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/kse/sys/arm/include/critical.h#1 branch .. //depot/projects/kse/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/kse/sys/arm/include/disassem.h#1 branch .. //depot/projects/kse/sys/arm/include/elf.h#4 integrate .. //depot/projects/kse/sys/arm/include/endian.h#3 integrate .. //depot/projects/kse/sys/arm/include/fiq.h#1 branch .. //depot/projects/kse/sys/arm/include/float.h#1 branch .. //depot/projects/kse/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/kse/sys/arm/include/fp.h#1 branch .. //depot/projects/kse/sys/arm/include/frame.h#1 branch .. //depot/projects/kse/sys/arm/include/ieee.h#1 branch .. //depot/projects/kse/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/kse/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/kse/sys/arm/include/intr.h#1 branch .. //depot/projects/kse/sys/arm/include/katelib.h#1 branch .. //depot/projects/kse/sys/arm/include/machdep.h#1 branch .. //depot/projects/kse/sys/arm/include/md_var.h#1 branch .. //depot/projects/kse/sys/arm/include/metadata.h#1 branch .. //depot/projects/kse/sys/arm/include/mutex.h#1 branch .. //depot/projects/kse/sys/arm/include/param.h#4 integrate .. //depot/projects/kse/sys/arm/include/pcb.h#1 branch .. //depot/projects/kse/sys/arm/include/pcpu.h#1 branch .. //depot/projects/kse/sys/arm/include/pmap.h#1 branch .. //depot/projects/kse/sys/arm/include/proc.h#1 branch .. //depot/projects/kse/sys/arm/include/profile.h#1 branch .. //depot/projects/kse/sys/arm/include/psl.h#1 branch .. //depot/projects/kse/sys/arm/include/pte.h#1 branch .. //depot/projects/kse/sys/arm/include/ptrace.h#1 branch .. //depot/projects/kse/sys/arm/include/reg.h#1 branch .. //depot/projects/kse/sys/arm/include/reloc.h#1 branch .. //depot/projects/kse/sys/arm/include/resource.h#1 branch .. //depot/projects/kse/sys/arm/include/runq.h#1 branch .. //depot/projects/kse/sys/arm/include/setjmp.h#1 branch .. //depot/projects/kse/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/kse/sys/arm/include/sigframe.h#1 branch .. //depot/projects/kse/sys/arm/include/signal.h#4 integrate .. //depot/projects/kse/sys/arm/include/smp.h#1 branch .. //depot/projects/kse/sys/arm/include/stdarg.h#1 branch .. //depot/projects/kse/sys/arm/include/swi.h#1 branch .. //depot/projects/kse/sys/arm/include/trap.h#1 branch .. //depot/projects/kse/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/kse/sys/arm/include/undefined.h#1 branch .. //depot/projects/kse/sys/arm/include/utrap.h#1 branch .. //depot/projects/kse/sys/arm/include/vmparam.h#1 branch .. //depot/projects/kse/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/kse/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/kse/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/kse/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/kse/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/kse/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/kse/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/kse/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/kse/sys/boot/Makefile#8 integrate .. //depot/projects/kse/sys/boot/common/loader.8#17 integrate .. //depot/projects/kse/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/kse/sys/boot/forth/loader.conf.5#7 integrate .. //depot/projects/kse/sys/boot/i386/boot0/Makefile#5 integrate .. //depot/projects/kse/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/kse/sys/boot/i386/boot0/boot0.s#3 delete .. //depot/projects/kse/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/kse/sys/boot/i386/boot0/boot0ext.s#2 delete .. //depot/projects/kse/sys/boot/i386/boot0/boot0sio.s#2 delete .. //depot/projects/kse/sys/boot/i386/boot0ext/Makefile#2 integrate .. //depot/projects/kse/sys/boot/i386/boot0sio/Makefile#2 integrate .. //depot/projects/kse/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/kse/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/kse/sys/boot/i386/btx/btx/Makefile#5 integrate .. //depot/projects/kse/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/kse/sys/boot/i386/btx/btxldr/Makefile#4 integrate .. //depot/projects/kse/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/kse/sys/boot/i386/cdboot/Makefile#4 integrate .. //depot/projects/kse/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/kse/sys/boot/i386/libi386/biosacpi.c#4 integrate .. //depot/projects/kse/sys/boot/i386/mbr/Makefile#4 integrate .. //depot/projects/kse/sys/boot/i386/pxeldr/Makefile#5 integrate .. //depot/projects/kse/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/kse/sys/boot/pc98/boot2/serial_16550.S#5 integrate .. //depot/projects/kse/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/kse/sys/boot/pc98/btx/btx/Makefile#5 integrate .. //depot/projects/kse/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/kse/sys/boot/pc98/btx/btxldr/Makefile#4 integrate .. //depot/projects/kse/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_da.c#25 integrate .. //depot/projects/kse/sys/coda/coda_fbsd.c#5 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/kse/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/kse/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/kse/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/kse/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/kse/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/kse/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/kse/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/kse/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/kse/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/kse/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/kse/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#18 integrate .. //depot/projects/kse/sys/conf/Makefile.alpha#15 integrate .. //depot/projects/kse/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/kse/sys/conf/Makefile.arm#1 branch .. //depot/projects/kse/sys/conf/Makefile.i386#15 integrate .. //depot/projects/kse/sys/conf/Makefile.ia64#19 integrate .. //depot/projects/kse/sys/conf/Makefile.pc98#14 integrate .. //depot/projects/kse/sys/conf/Makefile.powerpc#16 integrate .. //depot/projects/kse/sys/conf/Makefile.sparc64#18 integrate .. //depot/projects/kse/sys/conf/NOTES#21 integrate .. //depot/projects/kse/sys/conf/files#55 integrate .. //depot/projects/kse/sys/conf/files.alpha#19 integrate .. //depot/projects/kse/sys/conf/files.amd64#2 integrate .. //depot/projects/kse/sys/conf/files.arm#1 branch .. //depot/projects/kse/sys/conf/files.i386#33 integrate .. //depot/projects/kse/sys/conf/files.ia64#17 integrate .. //depot/projects/kse/sys/conf/files.pc98#33 integrate .. //depot/projects/kse/sys/conf/files.sparc64#22 integrate .. //depot/projects/kse/sys/conf/kern.mk#3 integrate .. //depot/projects/kse/sys/conf/kern.post.mk#16 integrate .. //depot/projects/kse/sys/conf/kern.pre.mk#17 integrate .. //depot/projects/kse/sys/conf/kmod.mk#15 integrate .. //depot/projects/kse/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/kse/sys/conf/ldscript.arm#1 branch .. //depot/projects/kse/sys/conf/majors#15 integrate .. //depot/projects/kse/sys/conf/options#30 integrate .. //depot/projects/kse/sys/conf/options.arm#1 branch .. //depot/projects/kse/sys/conf/options.pc98#23 integrate .. //depot/projects/kse/sys/conf/options.sparc64#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/CHANGES.txt#3 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acconfig.h#13 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acdebug.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acdisasm.h#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acdispat.h#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acefi.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acenv.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acevents.h#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acexcep.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acfreebsd.h#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acglobal.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/achware.h#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acinterp.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/aclocal.h#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acmacros.h#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acnamesp.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acobject.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acparser.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acpica_prep.sh#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acpixf.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acstruct.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/actbl.h#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/actypes.h#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acutils.h#13 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbcmds.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbdisply.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbexec.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbinput.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmopcode.c#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmutils.c#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsmethod.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsmthdat.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsopcode.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dswload.c#13 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dswstate.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evevent.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evmisc.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evregion.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evxface.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evxfevnt.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evxfregn.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exconfig.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/excreate.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exdump.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exfldio.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exmutex.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exoparg2.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exresnte.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exresolv.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exstore.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exstoren.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/hwgpe.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/hwregs.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/hwsleep.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsaccess.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsalloc.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsdump.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nseval.c#12 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsinit.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nssearch.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsutils.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsxfname.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psxface.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rsaddr.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rsutils.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rsxface.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/uteval.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utglobal.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utmisc.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utxface.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/oltr/if_oltr.c#3 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src.diff#1 branch .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/kse/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/kse/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/kse/sys/ddb/db_elf.c#5 integrate .. //depot/projects/kse/sys/dev/aac/aac.c#25 integrate .. //depot/projects/kse/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/kse/sys/dev/aac/aac_disk.c#16 integrate .. //depot/projects/kse/sys/dev/aac/aac_linux.c#3 integrate .. //depot/projects/kse/sys/dev/aac/aac_pci.c#17 integrate .. //depot/projects/kse/sys/dev/aac/aacvar.h#14 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdDebug.c#5 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdHardware.c#6 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdInterrupt.c#7 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdMemory.c#7 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdSchedule.c#11 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdStream.c#4 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdSynch.c#8 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdTable.c#4 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#31 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_acad.c#8 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_button.c#8 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_cmbat.c#11 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_cpu.c#12 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_ec.c#14 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_lid.c#8 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pci.c#5 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib.c#12 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_powerres.c#11 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_resource.c#12 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_thermal.c#14 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_timer.c#10 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/kse/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/kse/sys/dev/adlink/adlink.c#3 integrate .. //depot/projects/kse/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/kse/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/kse/sys/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx.reg#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx.seq#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx_inline.h#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.c#8 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.h#7 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/kse/sys/dev/amd/amd.c#3 integrate .. //depot/projects/kse/sys/dev/amr/amr_disk.c#6 integrate .. //depot/projects/kse/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/kse/sys/dev/an/if_an.c#16 integrate .. //depot/projects/kse/sys/dev/an/if_an_pccard.c#5 integrate .. //depot/projects/kse/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/kse/sys/dev/ar/if_ar_pci.c#3 integrate .. //depot/projects/kse/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/kse/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/kse/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/kse/sys/dev/asr/asr.c#12 integrate .. //depot/projects/kse/sys/dev/ata/ata-all.c#24 integrate .. //depot/projects/kse/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/kse/sys/dev/ata/ata-card.c#8 integrate .. //depot/projects/kse/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/kse/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/kse/sys/dev/ata/ata-commands.h#2 integrate .. //depot/projects/kse/sys/dev/ata/ata-disk.c#24 integrate .. //depot/projects/kse/sys/dev/ata/ata-disk.h#11 integrate .. //depot/projects/kse/sys/dev/ata/ata-dma.c#27 integrate .. //depot/projects/kse/sys/dev/ata/ata-isa.c#10 integrate .. //depot/projects/kse/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/kse/sys/dev/ata/ata-pci.c#28 integrate .. //depot/projects/kse/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/kse/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cd.c#21 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cd.h#9 integrate .. //depot/projects/kse/sys/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/kse/sys/dev/ata/atapi-tape.h#5 integrate .. //depot/projects/kse/sys/dev/awi/awi.c#9 integrate .. //depot/projects/kse/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/kse/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/kse/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/kse/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_core.c#8 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_mem.c#5 integrate .. //depot/projects/kse/sys/dev/bktr/bktr_os.c#9 integrate .. //depot/projects/kse/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/kse/sys/dev/cardbus/cardbus.c#12 integrate .. //depot/projects/kse/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/kse/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/kse/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/kse/sys/dev/ciss/cissvar.h#4 integrate .. //depot/projects/kse/sys/dev/cnw/if_cnw.c#5 integrate .. //depot/projects/kse/sys/dev/cp/cpddk.c#1 branch .. //depot/projects/kse/sys/dev/cp/cpddk.h#1 branch .. //depot/projects/kse/sys/dev/cp/if_cp.c#1 branch .. //depot/projects/kse/sys/dev/cp/ng_cp.h#1 branch .. //depot/projects/kse/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/kse/sys/dev/cs/if_cs_pccard.c#4 integrate .. //depot/projects/kse/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/kse/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/kse/sys/dev/cy/cy.c#1 branch .. //depot/projects/kse/sys/dev/cy/cy_isa.c#1 branch .. //depot/projects/kse/sys/dev/cy/cy_pci.c#1 branch .. //depot/projects/kse/sys/dev/cy/cyreg.h#1 branch .. //depot/projects/kse/sys/dev/cy/cyvar.h#1 branch .. //depot/projects/kse/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/kse/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/kse/sys/dev/digi/digi.c#13 integrate .. //depot/projects/kse/sys/dev/digi/digi_isa.c#7 integrate .. //depot/projects/kse/sys/dev/digi/digi_pci.c#5 integrate .. //depot/projects/kse/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/kse/sys/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/kse/sys/dev/em/if_em.c#12 integrate .. //depot/projects/kse/sys/dev/em/if_em.h#10 integrate .. //depot/projects/kse/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/kse/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/kse/sys/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/kse/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/kse/sys/dev/ex/if_ex_pccard.c#4 integrate .. //depot/projects/kse/sys/dev/fb/splash.c#4 integrate .. //depot/projects/kse/sys/dev/fb/tga.c#4 integrate .. //depot/projects/kse/sys/dev/fdc/fdc.c#1 branch .. //depot/projects/kse/sys/dev/fdc/fdcreg.h#1 branch .. //depot/projects/kse/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/kse/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/kse/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/kse/sys/dev/firewire/firewire.h#4 integrate .. //depot/projects/kse/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/kse/sys/dev/firewire/fwcrom.c#3 integrate .. //depot/projects/kse/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/kse/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/kse/sys/dev/firewire/fwmem.h#3 integrate .. //depot/projects/kse/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/kse/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/kse/sys/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/kse/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/kse/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/kse/sys/dev/firewire/iec13213.h#3 integrate .. //depot/projects/kse/sys/dev/firewire/iec68113.h#3 integrate .. //depot/projects/kse/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/kse/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/kse/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/kse/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/kse/sys/dev/fxp/if_fxp.c#21 integrate .. //depot/projects/kse/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/kse/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/kse/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/kse/sys/dev/gx/if_gx.c#8 integrate .. //depot/projects/kse/sys/dev/hfa/fore_load.c#8 delete .. //depot/projects/kse/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/kse/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/kse/sys/dev/hme/if_hme_pci.c#5 integrate .. //depot/projects/kse/sys/dev/hme/if_hme_sbus.c#4 integrate .. //depot/projects/kse/sys/dev/hme/if_hmereg.h#5 integrate .. //depot/projects/kse/sys/dev/ic/cd1400.h#1 branch .. //depot/projects/kse/sys/dev/ichsmb/ichsmb_pci.c#5 integrate .. //depot/projects/kse/sys/dev/ichwd/ichwd.c#1 branch .. //depot/projects/kse/sys/dev/ichwd/ichwd.h#1 branch .. //depot/projects/kse/sys/dev/ida/ida_disk.c#8 integrate .. //depot/projects/kse/sys/dev/ida/ida_eisa.c#3 integrate .. //depot/projects/kse/sys/dev/ida/ida_pci.c#3 integrate .. //depot/projects/kse/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/kse/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/kse/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/kse/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/kse/sys/dev/iicbus/iic.c#8 integrate .. //depot/projects/kse/sys/dev/iicbus/iicbus.c#5 integrate .. //depot/projects/kse/sys/dev/iir/iir.c#5 integrate .. //depot/projects/kse/sys/dev/iir/iir.h#5 integrate .. //depot/projects/kse/sys/dev/iir/iir_ctrl.c#5 integrate .. //depot/projects/kse/sys/dev/ips/ips.c#2 integrate .. //depot/projects/kse/sys/dev/ips/ips.h#2 integrate .. //depot/projects/kse/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/kse/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/kse/sys/dev/isp/isp.c#26 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.c#19 integrate .. //depot/projects/kse/sys/dev/isp/isp_inline.h#12 integrate .. //depot/projects/kse/sys/dev/isp/isp_pci.c#16 integrate .. //depot/projects/kse/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/kse/sys/dev/isp/isp_target.c#8 integrate .. //depot/projects/kse/sys/dev/isp/ispvar.h#17 integrate .. //depot/projects/kse/sys/dev/ispfw/ispfw.c#6 integrate .. //depot/projects/kse/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/kse/sys/dev/ixgb/README#1 branch .. //depot/projects/kse/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/kse/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/kse/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/kse/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/kse/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/kse/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/kse/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/kse/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/kse/sys/dev/joy/joy_pccard.c#4 integrate .. //depot/projects/kse/sys/dev/led/led.c#2 integrate .. //depot/projects/kse/sys/dev/led/led.h#2 integrate .. //depot/projects/kse/sys/dev/lge/if_lge.c#8 integrate .. //depot/projects/kse/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/kse/sys/dev/lnc/if_lnc_cbus.c#3 integrate .. //depot/projects/kse/sys/dev/lnc/if_lnc_isa.c#3 integrate .. //depot/projects/kse/sys/dev/lnc/if_lnc_pci.c#3 integrate .. //depot/projects/kse/sys/dev/md/md.c#27 integrate .. //depot/projects/kse/sys/dev/mii/acphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/amphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/kse/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/kse/sys/dev/mii/dcphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/kse/sys/dev/mii/exphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/inphy.c#5 integrate .. //depot/projects/kse/sys/dev/mii/lxtphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/mii.c#8 integrate .. //depot/projects/kse/sys/dev/mii/mii_physubr.c#7 integrate .. //depot/projects/kse/sys/dev/mii/mlphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/nsgphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/nsphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/pnaphy.c#6 integrate .. //depot/projects/kse/sys/dev/mii/pnphy.c#6 integrate .. //depot/projects/kse/sys/dev/mii/qsphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/kse/sys/dev/mii/rlphy.c#9 integrate .. //depot/projects/kse/sys/dev/mii/ruephy.c#2 integrate .. //depot/projects/kse/sys/dev/mii/tdkphy.c#8 integrate .. //depot/projects/kse/sys/dev/mii/tlphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/ukphy.c#6 integrate .. //depot/projects/kse/sys/dev/mii/ukphy_subr.c#4 integrate .. //depot/projects/kse/sys/dev/mii/xmphy.c#7 integrate .. //depot/projects/kse/sys/dev/mlx/mlx_disk.c#6 integrate .. //depot/projects/kse/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/kse/sys/dev/musycc/musycc.c#3 integrate .. //depot/projects/kse/sys/dev/my/if_my.c#6 integrate .. //depot/projects/kse/sys/dev/ncv/ncr53c500_pccard.c#8 integrate .. //depot/projects/kse/sys/dev/nge/if_nge.c#14 integrate .. //depot/projects/kse/sys/dev/nmdm/nmdm.c#11 integrate .. //depot/projects/kse/sys/dev/nsp/nsp_pccard.c#9 integrate .. //depot/projects/kse/sys/dev/ofw/ofw_console.c#9 integrate .. //depot/projects/kse/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/kse/sys/dev/ofw/openfirmio.c#4 integrate .. //depot/projects/kse/sys/dev/ofw/openfirmio.h#4 integrate .. //depot/projects/kse/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/kse/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/kse/sys/dev/pccard/Makefile.pccarddevs#3 delete .. //depot/projects/kse/sys/dev/pccard/card_if.m#8 integrate .. //depot/projects/kse/sys/dev/pccard/devlist2h.awk#4 delete .. //depot/projects/kse/sys/dev/pccard/files.pccard#2 delete .. //depot/projects/kse/sys/dev/pccard/pccard_cis.c#10 integrate .. //depot/projects/kse/sys/dev/pccard/pccard_cis_quirks.c#5 integrate .. //depot/projects/kse/sys/dev/pccard/pccarddevs#15 integrate .. //depot/projects/kse/sys/dev/pccard/pccarddevs.h#15 delete .. //depot/projects/kse/sys/dev/pccard/pccardvar.h#10 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbb.c#24 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbbvar.h#10 integrate .. //depot/projects/kse/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/kse/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/kse/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/kse/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/kse/sys/dev/pci/eisa_pci.c#3 integrate .. //depot/projects/kse/sys/dev/pci/fixup_pci.c#3 integrate .. //depot/projects/kse/sys/dev/pci/ignore_pci.c#3 integrate .. //depot/projects/kse/sys/dev/pci/isa_pci.c#4 integrate .. //depot/projects/kse/sys/dev/pci/pci.c#18 integrate .. //depot/projects/kse/sys/dev/pci/pci_pci.c#15 integrate .. //depot/projects/kse/sys/dev/pci/pci_private.h#6 integrate .. //depot/projects/kse/sys/dev/ppbus/pcfclock.c#6 integrate .. //depot/projects/kse/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/kse/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/kse/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/kse/sys/dev/puc/puc_pccard.c#4 integrate .. //depot/projects/kse/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/kse/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/kse/sys/dev/puc/pucdata.c#9 integrate .. //depot/projects/kse/sys/dev/puc/pucvar.h#6 integrate .. //depot/projects/kse/sys/dev/random/harvest.c#5 integrate .. //depot/projects/kse/sys/dev/random/hash.c#6 integrate .. //depot/projects/kse/sys/dev/random/hash.h#4 integrate .. //depot/projects/kse/sys/dev/random/nehemiah.c#1 branch .. //depot/projects/kse/sys/dev/random/nehemiah.h#1 branch .. //depot/projects/kse/sys/dev/random/probe.c#1 branch .. //depot/projects/kse/sys/dev/random/randomdev.c#10 integrate .. //depot/projects/kse/sys/dev/random/randomdev.h#5 integrate .. //depot/projects/kse/sys/dev/random/randomdev_soft.c#1 branch .. //depot/projects/kse/sys/dev/random/randomdev_soft.h#1 branch .. //depot/projects/kse/sys/dev/random/yarrow.c#8 integrate .. //depot/projects/kse/sys/dev/random/yarrow.h#3 integrate .. //depot/projects/kse/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/kse/sys/dev/rc/rc.c#3 integrate .. //depot/projects/kse/sys/dev/re/if_re.c#2 integrate .. //depot/projects/kse/sys/dev/rp/rp.c#8 integrate .. //depot/projects/kse/sys/dev/rp/rp_isa.c#3 integrate .. //depot/projects/kse/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/kse/sys/dev/sab/sab.c#4 integrate .. //depot/projects/kse/sys/dev/safe/safe.c#2 integrate .. //depot/projects/kse/sys/dev/sbni/if_sbni.c#7 integrate .. //depot/projects/kse/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/kse/sys/dev/si/si.c#7 integrate .. //depot/projects/kse/sys/dev/si/si_eisa.c#3 integrate .. //depot/projects/kse/sys/dev/si/si_isa.c#4 integrate .. //depot/projects/kse/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/kse/sys/dev/sio/sio.c#21 integrate .. //depot/projects/kse/sys/dev/sio/sio_ebus.c#5 delete .. //depot/projects/kse/sys/dev/sio/sio_pccard.c#6 integrate .. //depot/projects/kse/sys/dev/smbus/smb.c#7 integrate .. //depot/projects/kse/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/kse/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/kse/sys/dev/sn/if_sn_pccard.c#6 integrate .. //depot/projects/kse/sys/dev/snc/dp83932.c#4 integrate .. //depot/projects/kse/sys/dev/snc/if_snc_pccard.c#3 integrate .. //depot/projects/kse/sys/dev/snp/snp.c#10 integrate .. //depot/projects/kse/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/kse/sys/dev/sound/isa/emu8000.c#8 delete .. //depot/projects/kse/sys/dev/sound/isa/ess.c#6 integrate .. //depot/projects/kse/sys/dev/sound/isa/gusmidi.c#8 delete .. //depot/projects/kse/sys/dev/sound/isa/mpu.c#10 delete .. //depot/projects/kse/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/kse/sys/dev/sound/isa/opl.c#7 delete .. //depot/projects/kse/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/kse/sys/dev/sound/isa/sb16.c#9 integrate .. //depot/projects/kse/sys/dev/sound/isa/sb8.c#7 integrate .. //depot/projects/kse/sys/dev/sound/isa/sbc.c#6 integrate .. //depot/projects/kse/sys/dev/sound/isa/uartsio.c#9 delete .. //depot/projects/kse/sys/dev/sound/midi/midi.c#8 delete .. //depot/projects/kse/sys/dev/sound/midi/midi.h#7 delete .. //depot/projects/kse/sys/dev/sound/midi/midibuf.c#6 delete .. //depot/projects/kse/sys/dev/sound/midi/midibuf.h#3 delete .. //depot/projects/kse/sys/dev/sound/midi/midisynth.c#4 delete .. //depot/projects/kse/sys/dev/sound/midi/midisynth.h#3 delete .. //depot/projects/kse/sys/dev/sound/midi/miditypes.h#3 delete .. //depot/projects/kse/sys/dev/sound/midi/sequencer.c#9 delete .. //depot/projects/kse/sys/dev/sound/midi/sequencer.h#4 delete .. //depot/projects/kse/sys/dev/sound/midi/timer.c#4 delete .. //depot/projects/kse/sys/dev/sound/midi/timer.h#2 delete .. //depot/projects/kse/sys/dev/sound/pci/cmi.c#11 integrate .. //depot/projects/kse/sys/dev/sound/pci/csa.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pci/csamidi.c#7 delete .. //depot/projects/kse/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pci/ds1.c#6 integrate .. //depot/projects/kse/sys/dev/sound/pci/emu10k1.c#6 integrate .. //depot/projects/kse/sys/dev/sound/pci/ich.c#19 integrate .. //depot/projects/kse/sys/dev/sound/pci/t4dwave.c#9 integrate .. //depot/projects/kse/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/kse/sys/dev/sound/pcm/ac97.c#10 integrate .. //depot/projects/kse/sys/dev/sound/pcm/buffer.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pcm/sound.h#10 integrate .. //depot/projects/kse/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/kse/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/kse/sys/dev/sr/if_sr_pci.c#3 integrate .. //depot/projects/kse/sys/dev/stg/tmc18c30_pccard.c#9 integrate .. //depot/projects/kse/sys/dev/sx/cd1865.h#1 branch .. //depot/projects/kse/sys/dev/sx/sx.c#1 branch .. //depot/projects/kse/sys/dev/sx/sx.h#1 branch .. //depot/projects/kse/sys/dev/sx/sx_pci.c#1 branch .. //depot/projects/kse/sys/dev/sx/sx_util.c#1 branch .. //depot/projects/kse/sys/dev/sx/sx_util.h#1 branch .. //depot/projects/kse/sys/dev/sx/sxvar.h#1 branch .. //depot/projects/kse/sys/dev/syscons/scterm-sc.c#6 integrate .. //depot/projects/kse/sys/dev/syscons/scvgarndr.c#5 integrate .. //depot/projects/kse/sys/dev/syscons/syscons.c#20 integrate .. //depot/projects/kse/sys/dev/syscons/sysmouse.c#6 integrate .. //depot/projects/kse/sys/dev/tdfx/tdfx_pci.c#9 integrate .. //depot/projects/kse/sys/dev/tga/tga_pci.c#3 integrate .. //depot/projects/kse/sys/dev/trm/trm.c#3 integrate .. //depot/projects/kse/sys/dev/twa/twa.h#2 integrate .. //depot/projects/kse/sys/dev/twa/twa_cam.c#2 integrate .. //depot/projects/kse/sys/dev/twa/twa_freebsd.c#3 integrate .. //depot/projects/kse/sys/dev/twa/twa_includes.h#3 integrate .. //depot/projects/kse/sys/dev/twe/twe.c#6 integrate .. //depot/projects/kse/sys/dev/twe/twe_compat.h#3 integrate .. //depot/projects/kse/sys/dev/twe/twereg.h#4 integrate .. //depot/projects/kse/sys/dev/twe/twevar.h#5 integrate .. //depot/projects/kse/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/kse/sys/dev/txp/if_txp.c#8 integrate .. //depot/projects/kse/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/kse/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/kse/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/kse/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/kse/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/kse/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/kse/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/kse/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/kse/sys/dev/ubsec/ubsec.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 7 14:50:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90DC716A4D1; Mon, 7 Jun 2004 14:50:30 +0000 (GMT) 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 685DF16A4CE for ; Mon, 7 Jun 2004 14:50:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 659EF43D4C for ; Mon, 7 Jun 2004 14:50:30 +0000 (GMT) (envelope-from dfr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57EoUAx030899 for ; Mon, 7 Jun 2004 14:50:30 GMT (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57EoTip030896 for perforce@freebsd.org; Mon, 7 Jun 2004 14:50:29 GMT (envelope-from dfr@freebsd.org) Date: Mon, 7 Jun 2004 14:50:29 GMT Message-Id: <200406071450.i57EoTip030896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson To: Perforce Change Reviews Subject: PERFORCE change 54315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 14:50:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=54315 Change 54315 by dfr@dfr_home on 2004/06/07 14:50:12 IFC Affected files ... .. //depot/projects/kse/include/wchar.h#11 integrate .. //depot/projects/kse/lib/libc/gen/signal.3#4 integrate .. //depot/projects/kse/lib/libc/i386/gen/signalcontext.c#4 integrate .. //depot/projects/kse/lib/libc/sys/sigaction.2#4 integrate .. //depot/projects/kse/lib/libc/sys/wait.2#3 integrate .. //depot/projects/kse/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/kse/sys/dev/sound/pcm/sound.c#15 integrate .. //depot/projects/kse/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/kse/sys/i386/include/ioctl_meteor.h#2 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#72 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#83 integrate .. //depot/projects/kse/sys/kern/uipc_syscalls.c#26 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#40 integrate .. //depot/projects/kse/sys/netinet/ip_icmp.c#15 integrate Differences ... ==== //depot/projects/kse/include/wchar.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.40 2004/05/27 10:08:44 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.41 2004/06/07 10:31:10 tjr Exp $ */ /*- @@ -180,7 +180,7 @@ #define getwc(fp) fgetwc(fp) #define getwchar() fgetwc(__stdinp) -#define putwc(wc, fp) fputwc(x, fp) +#define putwc(wc, fp) fputwc(wc, fp) #define putwchar(wc) fputwc(wc, __stdoutp) #if __ISO_C_VISIBLE >= 1999 ==== //depot/projects/kse/lib/libc/gen/signal.3#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)signal.3 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/gen/signal.3,v 1.35 2004/04/27 09:18:49 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/signal.3,v 1.36 2004/06/07 11:01:39 yar Exp $ .\" -.Dd April 19, 1994 +.Dd June 7, 2004 .Dt SIGNAL 3 .Os .Sh NAME @@ -204,6 +204,22 @@ function; ignored signals remain ignored. .Pp +If a process explicitly specifies +.Dv SIG_IGN +as the action for the signal +.Dv SIGCHLD , +the system will not create zombie processes when children +of the calling process exit. +As a consequence, the system will discard the exit status +from the child processes. +If the calling process subsequently issues a call to +.Xr wait 2 +or equivalent, it will block until all of the calling process's +children terminate, and then return a value of \-1 with +.Va errno +set to +.Er ECHILD . +.Pp See .Xr sigaction 2 for a list of functions @@ -239,6 +255,7 @@ .Xr sigaltstack 2 , .Xr sigprocmask 2 , .Xr sigsuspend 2 , +.Xr wait 2 , .Xr fpsetmask 3 , .Xr setjmp 3 , .Xr siginterrupt 3 , @@ -248,3 +265,7 @@ .Fn signal facility appeared in .Bx 4.0 . +The option to avoid the creation of child zombies through ignoring +.Dv SIGCHLD +appeared in +.Fx 5.0 . ==== //depot/projects/kse/lib/libc/i386/gen/signalcontext.c#4 (text+ko) ==== @@ -22,29 +22,29 @@ * 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$ */ #include -__FBSDID("$FreeBSD"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/signalcontext.c,v 1.6 2004/02/10 20:42:32 cperciva Exp $"); #include -#include -#include #include #include #include +#include +#include + +__weak_reference(__signalcontext, signalcontext); extern void _ctx_start(ucontext_t *, int argc, ...); int -signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func) +__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func) { + register_t *p; struct sigframe *sfp; - int *p; - /* + /*- * Set up stack. * (n = sizeof(int)) * 2n+sizeof(struct sigframe) ucp @@ -52,29 +52,28 @@ * 1n &func * 0n &_ctx_start */ - p = (int *)ucp->uc_mcontext.mc_esp; - *--p = (int)ucp; - p -= sizeof(struct sigframe); + p = (register_t *)(void *)(intptr_t)ucp->uc_mcontext.mc_esp; + *--p = (register_t)(intptr_t)ucp; + p = (register_t *)((u_register_t)p & ~0xF); /* Align to 16 bytes. */ + p = (register_t *)((u_register_t)p - sizeof(struct sigframe)); sfp = (struct sigframe *)p; bzero(sfp, sizeof(struct sigframe)); sfp->sf_signum = sig; - sfp->sf_siginfo = (int)&sfp->sf_si; - sfp->sf_ucontext = (int)&sfp->sf_uc; + sfp->sf_siginfo = (register_t)(intptr_t)&sfp->sf_si; + sfp->sf_ucontext = (register_t)(intptr_t)&sfp->sf_uc; sfp->sf_ahu.sf_action = (__siginfohandler_t *)func; bcopy(ucp, &sfp->sf_uc, sizeof(ucontext_t)); sfp->sf_si.si_signo = sig; + *--p = (register_t)(intptr_t)func; - *--p = (int)func; - /* * Set up ucontext_t. */ ucp->uc_mcontext.mc_ebp = ucp->uc_mcontext.mc_esp - sizeof(int); - ucp->uc_mcontext.mc_esp = (int)p; - ucp->uc_mcontext.mc_eip = (int)_ctx_start; + ucp->uc_mcontext.mc_esp = (register_t)(intptr_t)p; + ucp->uc_mcontext.mc_eip = (register_t)(intptr_t)_ctx_start; ucp->uc_mcontext.mc_eflags &= ~PSL_T; ucp->uc_link = &sfp->sf_uc; - SIGDELSET(ucp->uc_sigmask, sig); + sigdelset(&ucp->uc_sigmask, sig); return (0); } - ==== //depot/projects/kse/lib/libc/sys/sigaction.2#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sigaction.2 8.2 (Berkeley) 4/3/94 -.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.49 2003/09/08 19:57:16 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.50 2004/06/07 11:01:39 yar Exp $ .\" -.Dd April 3, 1994 +.Dd June 7, 2004 .Dt SIGACTION 2 .Os .Sh NAME @@ -201,6 +201,12 @@ (or equivalent), it blocks until all of the calling process's child processes terminate, and then returns a value of -1 with errno set to .Er ECHILD . +The same effect of avoiding zombie creation can also be achieved by setting +.Fa sa_handler +for +.Dv SIGCHLD +to +.Dv SIG_IGN . .It Dv SA_ONSTACK If this bit is set, the system will deliver the signal to the process on a @@ -601,6 +607,10 @@ .\" and .\" SA_SIGINFO flags are featuring options commonly found in other operating systems. +The flags are approved by +.St -susv2 , +along with the option to avoid zombie creation by ignoring +.Dv SIGCHLD . .Sh SEE ALSO .Xr kill 1 , .Xr kill 2 , ==== //depot/projects/kse/lib/libc/sys/wait.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)wait.2 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.16 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.17 2004/06/07 11:01:39 yar Exp $ .\" .Dd April 19, 1994 .Dt WAIT 2 @@ -274,6 +274,14 @@ .It Bq Er ECHILD The calling process has no existing unwaited-for child processes. +.It Bq Er ECHILD +No status from the terminated child process is available +because the calling process has asked the system to discard +such status by ignoring the signal +.Dv SIGCHLD +or setting the flag +.Dv SA_NOCLDWAIT +for that signal. .It Bq Er EFAULT The .Fa status ==== //depot/projects/kse/sys/alpha/include/ioctl_meteor.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 1995 Mark Tinguely and Jim Lowe +/*- + * Copyright (c) 2003 David O'Brien * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,11 +10,6 @@ * 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 Mark Tinguely and Jim Lowe - * 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 @@ -28,160 +23,16 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.1 2000/04/15 08:07:56 roger Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.4 2003/12/08 07:22:41 obrien Exp $ */ -/* - * ioctl constants for Matrox Meteor Capture card. - */ #ifndef _MACHINE_IOCTL_METEOR_H_ #define _MACHINE_IOCTL_METEOR_H_ -#ifndef _KERNEL -#include +#ifdef __GNUC__ +#warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif -#include -struct meteor_capframe { - short command; /* see below for valid METEORCAPFRM commands */ - short lowat; /* start transfer if < this number */ - short hiwat; /* stop transfer if > this number */ -} ; +#include -/* structure for METEOR[GS]ETGEO - get/set geometry */ -struct meteor_geomet { - u_short rows; - u_short columns; - u_short frames; - u_long oformat; -} ; - -/* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */ -struct meteor_counts { - u_long fifo_errors; /* count of fifo errors since open */ - u_long dma_errors; /* count of dma errors since open */ - u_long frames_captured; /* count of frames captured since open */ - u_long even_fields_captured; /* count of even fields captured */ - u_long odd_fields_captured; /* count of odd fields captured */ -} ; - -/* structure for getting and setting direct transfers to vram */ -struct meteor_video { - u_long addr; /* Address of location to dma to */ - u_long width; /* Width of memory area */ - u_long banksize; /* Size of Vram bank */ - u_long ramsize; /* Size of Vram */ -}; - -#define METEORCAPTUR _IOW('x', 1, int) /* capture a frame */ -#define METEORCAPFRM _IOW('x', 2, struct meteor_capframe) /* sync capture */ -#define METEORSETGEO _IOW('x', 3, struct meteor_geomet) /* set geometry */ -#define METEORGETGEO _IOR('x', 4, struct meteor_geomet) /* get geometry */ -#define METEORSTATUS _IOR('x', 5, unsigned short) /* get status */ -#define METEORSHUE _IOW('x', 6, signed char) /* set hue */ -#define METEORGHUE _IOR('x', 6, signed char) /* get hue */ -#define METEORSFMT _IOW('x', 7, unsigned long) /* set format */ -#define METEORGFMT _IOR('x', 7, unsigned long) /* get format */ -#define METEORSINPUT _IOW('x', 8, unsigned long) /* set input dev */ -#define METEORGINPUT _IOR('x', 8, unsigned long) /* get input dev */ -#define METEORSCHCV _IOW('x', 9, unsigned char) /* set uv gain */ -#define METEORGCHCV _IOR('x', 9, unsigned char) /* get uv gain */ -#define METEORSCOUNT _IOW('x',10, struct meteor_counts) -#define METEORGCOUNT _IOR('x',10, struct meteor_counts) -#define METEORSFPS _IOW('x',11, unsigned short) /* set fps */ -#define METEORGFPS _IOR('x',11, unsigned short) /* get fps */ -#define METEORSSIGNAL _IOW('x', 12, unsigned int) /* set signal */ -#define METEORGSIGNAL _IOR('x', 12, unsigned int) /* get signal */ -#define METEORSVIDEO _IOW('x', 13, struct meteor_video) /* set video */ -#define METEORGVIDEO _IOR('x', 13, struct meteor_video) /* get video */ -#define METEORSBRIG _IOW('x', 14, unsigned char) /* set brightness */ -#define METEORGBRIG _IOR('x', 14, unsigned char) /* get brightness */ -#define METEORSCSAT _IOW('x', 15, unsigned char) /* set chroma sat */ -#define METEORGCSAT _IOR('x', 15, unsigned char) /* get uv saturation */ -#define METEORSCONT _IOW('x', 16, unsigned char) /* set contrast */ -#define METEORGCONT _IOR('x', 16, unsigned char) /* get contrast */ -#define METEORSBT254 _IOW('x', 17, unsigned short) /* set Bt254 reg */ -#define METEORGBT254 _IOR('x', 17, unsigned short) /* get Bt254 reg */ -#define METEORSHWS _IOW('x', 18, unsigned char) /* set hor start reg */ -#define METEORGHWS _IOR('x', 18, unsigned char) /* get hor start reg */ -#define METEORSVWS _IOW('x', 19, unsigned char) /* set vert start reg */ -#define METEORGVWS _IOR('x', 19, unsigned char) /* get vert start reg */ -#define METEORSTS _IOW('x', 20, unsigned char) /* set time stamp */ -#define METEORGTS _IOR('x', 20, unsigned char) /* get time stamp */ - -#define METEOR_STATUS_ID_MASK 0xf000 /* ID of 7196 */ -#define METEOR_STATUS_DIR 0x0800 /* Direction of Expansion port YUV */ -#define METEOR_STATUS_OEF 0x0200 /* Field detected: Even/Odd */ -#define METEOR_STATUS_SVP 0x0100 /* State of VRAM Port:inactive/active */ -#define METEOR_STATUS_STTC 0x0080 /* Time Constant: TV/VCR */ -#define METEOR_STATUS_HCLK 0x0040 /* Horiz PLL: locked/unlocked */ -#define METEOR_STATUS_FIDT 0x0020 /* Field detect: 50/60hz */ -#define METEOR_STATUS_ALTD 0x0002 /* Line alt: no line alt/line alt */ -#define METEOR_STATUS_CODE 0x0001 /* Colour info: no colour/colour */ - - /* METEORCAPTUR capture options */ -#define METEOR_CAP_SINGLE 0x0001 /* capture one frame */ -#define METEOR_CAP_CONTINOUS 0x0002 /* continuously capture */ -#define METEOR_CAP_STOP_CONT 0x0004 /* stop the continuous capture */ - - /* METEORCAPFRM capture commands */ -#define METEOR_CAP_N_FRAMES 0x0001 /* capture N frames */ -#define METEOR_CAP_STOP_FRAMES 0x0002 /* stop capture N frames */ -#define METEOR_HALT_N_FRAMES 0x0003 /* halt of capture N frames */ -#define METEOR_CONT_N_FRAMES 0x0004 /* continue after above halt */ - - /* valid video input formats: */ -#define METEOR_FMT_NTSC 0x00100 /* NTSC -- initialized default */ -#define METEOR_FMT_PAL 0x00200 /* PAL */ -#define METEOR_FMT_SECAM 0x00400 /* SECAM */ -#define METEOR_FMT_AUTOMODE 0x00800 /* auto-mode */ -#define METEOR_INPUT_DEV0 0x01000 /* camera input 0 -- default */ -#define METEOR_INPUT_DEV_RCA METEOR_INPUT_DEV0 -#define METEOR_INPUT_DEV1 0x02000 /* camera input 1 */ -#define METEOR_INPUT_DEV2 0x04000 /* camera input 2 */ -#define METEOR_INPUT_DEV3 0x08000 /* camera input 3 */ -#define METEOR_INPUT_DEV_RGB 0x0a000 /* for rgb version of meteor */ -#define METEOR_INPUT_DEV_SVIDEO 0x06000 /* S-video input port */ - - /* valid video output formats: */ -#define METEOR_GEO_RGB16 0x0010000 /* packed -- initialized default */ -#define METEOR_GEO_RGB24 0x0020000 /* RBG 24 bits packed */ - /* internally stored in 32 bits */ -#define METEOR_GEO_YUV_PACKED 0x0040000 /* 4-2-2 YUV 16 bits packed */ -#define METEOR_GEO_YUV_PLANAR 0x0080000 /* 4-2-2 YUV 16 bits planer */ -#define METEOR_GEO_YUV_PLANER METEOR_GEO_YUV_PLANAR -#define METEOR_GEO_UNSIGNED 0x0400000 /* unsigned uv outputs */ -#define METEOR_GEO_EVEN_ONLY 0x1000000 /* set for even only field capture */ -#define METEOR_GEO_ODD_ONLY 0x2000000 /* set for odd only field capture */ -#define METEOR_GEO_FIELD_MASK 0x3000000 -#define METEOR_GEO_YUV_422 0x4000000 /* 4-2-2 YUV in Y-U-V combined */ -#define METEOR_GEO_OUTPUT_MASK 0x40f0000 -#define METEOR_GEO_YUV_12 0x10000000 /* YUV 12 format */ -#define METEOR_GEO_YUV_9 0x40000000 /* YUV 9 format */ - -#define METEOR_FIELD_MODE 0x80000000 /* Field cap or Frame cap */ - -#define METEOR_SIG_MODE_MASK 0xffff0000 -#define METEOR_SIG_FRAME 0x00000000 /* signal every frame */ -#define METEOR_SIG_FIELD 0x00010000 /* signal every field */ - - /* following structure is used to coordinate the synchronous */ - -struct meteor_mem { - /* kernel write only */ - int frame_size; /* row*columns*depth */ - unsigned num_bufs; /* number of frames in buffer (1-32) */ - /* user and kernel change these */ - int lowat; /* kernel starts capture if < this number */ - int hiwat; /* kernel stops capture if > this number. - hiwat <= numbufs */ - unsigned active; /* bit mask of active frame buffers - kernel sets, user clears */ - int num_active_bufs; /* count of active frame buffer - kernel increments, user decrements */ - - /* reference to mmapped data */ - caddr_t buf; /* The real space (virtual addr) */ -} ; - -#endif /* !_MACHINE_IOCTL_METEOR_H_ */ +#endif /* _MACHINE_IOCTL_METEOR_H_ */ ==== //depot/projects/kse/sys/dev/sound/pcm/sound.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.90 2004/02/28 19:47:02 truckman Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.91 2004/06/07 12:25:14 truckman Exp $"); devclass_t pcm_devclass; @@ -869,7 +869,6 @@ x = pcm_inprog(d, 1); if (x != 1) { - printf("x: %d\n", x); pcm_inprog(d, -1); return EINPROGRESS; } ==== //depot/projects/kse/sys/geom/nop/g_nop.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/nop/g_nop.c,v 1.2 2004/05/21 15:23:48 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/nop/g_nop.c,v 1.4 2004/06/07 13:40:40 pjd Exp $"); #include #include @@ -124,6 +124,7 @@ struct g_geom *gp; struct g_provider *newpp; struct g_consumer *cp; + char name[64]; int error; g_topology_assert(); @@ -132,10 +133,16 @@ newpp = NULL; cp = NULL; - gp = g_new_geomf(mp, "%s%s", pp->name, G_NOP_SUFFIX); + snprintf(name, sizeof(name), "%s%s", pp->name, G_NOP_SUFFIX); + LIST_FOREACH(gp, &mp->geom, geom) { + if (strcmp(gp->name, name) == 0) { + gctl_error(req, "Provider %s already exists.", name); + return (EEXIST); + } + } + gp = g_new_geomf(mp, name); if (gp == NULL) { - gctl_error(req, "Cannot create geom %s%s.", pp->name, - G_NOP_SUFFIX); + gctl_error(req, "Cannot create geom %s.", name); return (ENOMEM); } gp->softc = NULL; @@ -147,8 +154,7 @@ newpp = g_new_providerf(gp, gp->name); if (newpp == NULL) { - gctl_error(req, "Cannot create provider %s%s.", pp->name, - G_NOP_SUFFIX); + gctl_error(req, "Cannot create provider %s.", name); error = ENOMEM; goto fail; } ==== //depot/projects/kse/sys/i386/include/ioctl_meteor.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 1995 Mark Tinguely and Jim Lowe +/*- + * Copyright (c) 2003 David O'Brien * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,11 +10,6 @@ * 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 Mark Tinguely and Jim Lowe - * 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 @@ -28,160 +23,16 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.11 1999/12/29 04:33:02 peter Exp $ + * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.15 2004/03/12 21:45:30 trhodes Exp $ */ -/* - * ioctl constants for Matrox Meteor Capture card. - */ #ifndef _MACHINE_IOCTL_METEOR_H_ #define _MACHINE_IOCTL_METEOR_H_ -#ifndef _KERNEL -#include +#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif -#include -struct meteor_capframe { - short command; /* see below for valid METEORCAPFRM commands */ - short lowat; /* start transfer if < this number */ - short hiwat; /* stop transfer if > this number */ -} ; +#include -/* structure for METEOR[GS]ETGEO - get/set geometry */ -struct meteor_geomet { - u_short rows; - u_short columns; - u_short frames; - u_long oformat; -} ; - -/* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */ -struct meteor_counts { - u_long fifo_errors; /* count of fifo errors since open */ - u_long dma_errors; /* count of dma errors since open */ - u_long frames_captured; /* count of frames captured since open */ - u_long even_fields_captured; /* count of even fields captured */ - u_long odd_fields_captured; /* count of odd fields captured */ -} ; - -/* structure for getting and setting direct transfers to vram */ -struct meteor_video { - u_long addr; /* Address of location to dma to */ - u_long width; /* Width of memory area */ - u_long banksize; /* Size of Vram bank */ - u_long ramsize; /* Size of Vram */ -}; - -#define METEORCAPTUR _IOW('x', 1, int) /* capture a frame */ -#define METEORCAPFRM _IOW('x', 2, struct meteor_capframe) /* sync capture */ -#define METEORSETGEO _IOW('x', 3, struct meteor_geomet) /* set geometry */ -#define METEORGETGEO _IOR('x', 4, struct meteor_geomet) /* get geometry */ -#define METEORSTATUS _IOR('x', 5, unsigned short) /* get status */ -#define METEORSHUE _IOW('x', 6, signed char) /* set hue */ -#define METEORGHUE _IOR('x', 6, signed char) /* get hue */ -#define METEORSFMT _IOW('x', 7, unsigned long) /* set format */ -#define METEORGFMT _IOR('x', 7, unsigned long) /* get format */ -#define METEORSINPUT _IOW('x', 8, unsigned long) /* set input dev */ -#define METEORGINPUT _IOR('x', 8, unsigned long) /* get input dev */ -#define METEORSCHCV _IOW('x', 9, unsigned char) /* set uv gain */ -#define METEORGCHCV _IOR('x', 9, unsigned char) /* get uv gain */ -#define METEORSCOUNT _IOW('x',10, struct meteor_counts) -#define METEORGCOUNT _IOR('x',10, struct meteor_counts) -#define METEORSFPS _IOW('x',11, unsigned short) /* set fps */ -#define METEORGFPS _IOR('x',11, unsigned short) /* get fps */ -#define METEORSSIGNAL _IOW('x', 12, unsigned int) /* set signal */ -#define METEORGSIGNAL _IOR('x', 12, unsigned int) /* get signal */ -#define METEORSVIDEO _IOW('x', 13, struct meteor_video) /* set video */ -#define METEORGVIDEO _IOR('x', 13, struct meteor_video) /* get video */ -#define METEORSBRIG _IOW('x', 14, unsigned char) /* set brightness */ -#define METEORGBRIG _IOR('x', 14, unsigned char) /* get brightness */ -#define METEORSCSAT _IOW('x', 15, unsigned char) /* set chroma sat */ -#define METEORGCSAT _IOR('x', 15, unsigned char) /* get uv saturation */ -#define METEORSCONT _IOW('x', 16, unsigned char) /* set contrast */ -#define METEORGCONT _IOR('x', 16, unsigned char) /* get contrast */ -#define METEORSBT254 _IOW('x', 17, unsigned short) /* set Bt254 reg */ -#define METEORGBT254 _IOR('x', 17, unsigned short) /* get Bt254 reg */ -#define METEORSHWS _IOW('x', 18, unsigned char) /* set hor start reg */ -#define METEORGHWS _IOR('x', 18, unsigned char) /* get hor start reg */ -#define METEORSVWS _IOW('x', 19, unsigned char) /* set vert start reg */ -#define METEORGVWS _IOR('x', 19, unsigned char) /* get vert start reg */ -#define METEORSTS _IOW('x', 20, unsigned char) /* set time stamp */ -#define METEORGTS _IOR('x', 20, unsigned char) /* get time stamp */ - -#define METEOR_STATUS_ID_MASK 0xf000 /* ID of 7196 */ -#define METEOR_STATUS_DIR 0x0800 /* Direction of Expansion port YUV */ -#define METEOR_STATUS_OEF 0x0200 /* Field detected: Even/Odd */ -#define METEOR_STATUS_SVP 0x0100 /* State of VRAM Port:inactive/active */ -#define METEOR_STATUS_STTC 0x0080 /* Time Constant: TV/VCR */ -#define METEOR_STATUS_HCLK 0x0040 /* Horiz PLL: locked/unlocked */ -#define METEOR_STATUS_FIDT 0x0020 /* Field detect: 50/60hz */ -#define METEOR_STATUS_ALTD 0x0002 /* Line alt: no line alt/line alt */ -#define METEOR_STATUS_CODE 0x0001 /* Colour info: no colour/colour */ - - /* METEORCAPTUR capture options */ -#define METEOR_CAP_SINGLE 0x0001 /* capture one frame */ -#define METEOR_CAP_CONTINOUS 0x0002 /* continuously capture */ -#define METEOR_CAP_STOP_CONT 0x0004 /* stop the continuous capture */ - - /* METEORCAPFRM capture commands */ -#define METEOR_CAP_N_FRAMES 0x0001 /* capture N frames */ -#define METEOR_CAP_STOP_FRAMES 0x0002 /* stop capture N frames */ -#define METEOR_HALT_N_FRAMES 0x0003 /* halt of capture N frames */ -#define METEOR_CONT_N_FRAMES 0x0004 /* continue after above halt */ - - /* valid video input formats: */ -#define METEOR_FMT_NTSC 0x00100 /* NTSC -- initialized default */ -#define METEOR_FMT_PAL 0x00200 /* PAL */ -#define METEOR_FMT_SECAM 0x00400 /* SECAM */ -#define METEOR_FMT_AUTOMODE 0x00800 /* auto-mode */ -#define METEOR_INPUT_DEV0 0x01000 /* camera input 0 -- default */ -#define METEOR_INPUT_DEV_RCA METEOR_INPUT_DEV0 -#define METEOR_INPUT_DEV1 0x02000 /* camera input 1 */ -#define METEOR_INPUT_DEV2 0x04000 /* camera input 2 */ -#define METEOR_INPUT_DEV3 0x08000 /* camera input 3 */ -#define METEOR_INPUT_DEV_RGB 0x0a000 /* for rgb version of meteor */ -#define METEOR_INPUT_DEV_SVIDEO 0x06000 /* S-video input port */ - - /* valid video output formats: */ -#define METEOR_GEO_RGB16 0x0010000 /* packed -- initialized default */ -#define METEOR_GEO_RGB24 0x0020000 /* RBG 24 bits packed */ - /* internally stored in 32 bits */ -#define METEOR_GEO_YUV_PACKED 0x0040000 /* 4-2-2 YUV 16 bits packed */ -#define METEOR_GEO_YUV_PLANAR 0x0080000 /* 4-2-2 YUV 16 bits planer */ -#define METEOR_GEO_YUV_PLANER METEOR_GEO_YUV_PLANAR -#define METEOR_GEO_UNSIGNED 0x0400000 /* unsigned uv outputs */ -#define METEOR_GEO_EVEN_ONLY 0x1000000 /* set for even only field capture */ -#define METEOR_GEO_ODD_ONLY 0x2000000 /* set for odd only field capture */ -#define METEOR_GEO_FIELD_MASK 0x3000000 -#define METEOR_GEO_YUV_422 0x4000000 /* 4-2-2 YUV in Y-U-V combined */ -#define METEOR_GEO_OUTPUT_MASK 0x40f0000 -#define METEOR_GEO_YUV_12 0x10000000 /* YUV 12 format */ -#define METEOR_GEO_YUV_9 0x40000000 /* YUV 9 format */ - -#define METEOR_FIELD_MODE 0x80000000 /* Field cap or Frame cap */ - -#define METEOR_SIG_MODE_MASK 0xffff0000 -#define METEOR_SIG_FRAME 0x00000000 /* signal every frame */ -#define METEOR_SIG_FIELD 0x00010000 /* signal every field */ - - /* following structure is used to coordinate the synchronous */ - -struct meteor_mem { - /* kernel write only */ - int frame_size; /* row*columns*depth */ - unsigned num_bufs; /* number of frames in buffer (1-32) */ - /* user and kernel change these */ - int lowat; /* kernel starts capture if < this number */ - int hiwat; /* kernel stops capture if > this number. - hiwat <= numbufs */ - unsigned active; /* bit mask of active frame buffers - kernel sets, user clears */ - int num_active_bufs; /* count of active frame buffer - kernel increments, user decrements */ - - /* reference to mmapped data */ - caddr_t buf; /* The real space (virtual addr) */ -} ; - -#endif /* !_MACHINE_IOCTL_METEOR_H_ */ +#endif /* _MACHINE_IOCTL_METEOR_H_ */ ==== //depot/projects/kse/sys/kern/kern_sig.c#72 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.279 2004/06/02 07:52:35 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.280 2004/06/07 13:35:02 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -746,12 +746,18 @@ int error; error = copyin(uap->set, &set, sizeof(set)); - if (error) - return (error); + if (error) { + td->td_retval[0] = error; + return (0); + } error = kern_sigtimedwait(td, set, &info, NULL); - if (error) - return (error); + if (error) { + if (error == ERESTART) + return (error); + td->td_retval[0] = error; + return (0); + } error = copyout(&info.si_signo, uap->sig, sizeof(info.si_signo)); /* Repost if we got an error. */ @@ -760,7 +766,8 @@ tdsignal(td, info.si_signo, SIGTARGET_TD); PROC_UNLOCK(td->td_proc); } - return (error); + td->td_retval[0] = error; + return (0); } /* * MPSAFE ==== //depot/projects/kse/sys/kern/kern_synch.c#83 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.248 2004/05/14 20:51:42 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.249 2004/06/07 09:35:00 tjr Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" @@ -171,13 +171,6 @@ sq = sleepq_lookup(ident); mtx_lock_spin(&sched_lock); - /* - * If we are capable of async syscalls and there isn't already - * another one ready to return, start a new thread - * and queue it as ready to run. Note that there is danger here - * because we need to make sure that we don't sleep allocating - * the thread (recursion here might be bad). - */ if (p->p_flag & P_SA || p->p_numthreads > 1) { /* * Just don't bother if we are exiting ==== //depot/projects/kse/sys/kern/uipc_syscalls.c#26 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.186 2004/06/02 04:15:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.187 2004/06/07 09:59:50 ume Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1574,11 +1574,19 @@ buflen = MLEN; /* unix domain compat. hack */ else #endif - return (EINVAL); + if ((u_int)buflen > MCLBYTES) + return (EINVAL); } m = m_get(M_TRYWAIT, type); if (m == NULL) return (ENOBUFS); + if ((u_int)buflen > MLEN) { + MCLGET(m, M_TRYWAIT); + if ((m->m_flags & M_EXT) == 0) { + m_free(m); + return (ENOBUFS); + } + } m->m_len = buflen; error = copyin(buf, mtod(m, caddr_t), (u_int)buflen); if (error) ==== //depot/projects/kse/sys/kern/vfs_syscalls.c#40 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.347 2004/06/04 11:00:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.348 2004/06/07 12:19:55 pjd Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -4097,7 +4097,7 @@ struct statfs *buf; } */ *uap; { - struct statfs *sp, sb; + struct statfs *sp; struct mount *mp; struct vnode *vp; fhandle_t fh; @@ -4128,11 +4128,6 @@ sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK; if ((error = VFS_STATFS(mp, sp, td)) != 0) return (error); - if (suser(td)) { - bcopy(sp, &sb, sizeof(sb)); - sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; - sp = &sb; - } return (copyout(sp, uap->buf, sizeof(*sp))); } ==== //depot/projects/kse/sys/netinet/ip_icmp.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.92 2004/05/07 01:24:53 maxim Exp $ + * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.93 2004/06/07 09:56:59 ume Exp $ */ #include "opt_ipsec.h" @@ -154,10 +154,13 @@ if (type != ICMP_REDIRECT) icmpstat.icps_error++; /* + * Don't send error if the original packet was encrypted. * Don't send error if not the first fragment of message. * Don't error if the old packet protocol was ICMP * error message, only known informational types. */ + if (n->m_flags & M_DECRYPTED) + goto freeit; if (oip->ip_off &~ (IP_MF|IP_DF)) goto freeit; if (oip->ip_p == IPPROTO_ICMP && type != ICMP_REDIRECT && From owner-p4-projects@FreeBSD.ORG Mon Jun 7 16:36:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C984616A4D2; Mon, 7 Jun 2004 16:36:28 +0000 (GMT) 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 A136E16A4CE for ; Mon, 7 Jun 2004 16:36:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8638443D5C for ; Mon, 7 Jun 2004 16:36:28 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57GZgFu054989 for ; Mon, 7 Jun 2004 16:35:42 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57GZg9g054986 for perforce@freebsd.org; Mon, 7 Jun 2004 16:35:42 GMT (envelope-from scottl@freebsd.org) Date: Mon, 7 Jun 2004 16:35:42 GMT Message-Id: <200406071635.i57GZg9g054986@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 16:36:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=54323 Change 54323 by scottl@scottl-esp-sparc64 on 2004/06/07 16:34:55 Start working on ncr53c9x_action() and the XPT_SCSI_IO and XPT_RESET_BUS ops. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#8 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#8 (text+ko) ==== @@ -805,25 +805,21 @@ void ncr53c9x_action(struct cam_sim *sim, union ccb *ccb) { - struct scsipi_xfer *xs; - struct scsipi_periph *periph; - struct ncr53c9x_softc *sc = (void *)chan->chan_adapter->adapt_dev; + struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; int flags; NCR_TRACE(("[ncr53c9x_action] ")); + sc = cam_sim_softc(sim); mtx_lock(&sc->sc_lock); - switch (req) { - case ADAPTER_REQ_RUN_XFER: - xs = arg; - periph = xs->xs_periph; - flags = xs->xs_control; + switch (ccb->ccb_h.func_code) { + case XPT_SCSI_IO: + case XPT_RESET_BUS: + { + struct ccb_scsiio *csio; - NCR_CMDS(("[0x%x, %d]->%d ", (int)xs->cmd->opcode, xs->cmdlen, - periph->periph_target)); - /* Get an ECB to use. */ ecb = ncr53c9x_get_ecb(sc, xs->xs_control); /* @@ -831,27 +827,33 @@ * in the mid-layer. */ if (ecb == NULL) { - scsipi_printaddr(periph); + xpt_freeze_simq(sim, 1); + ccb->ccb_h.status = CAM_BUSY; printf("unable to allocate ecb\n"); - xs->error = XS_RESOURCE_SHORTAGE; mtx_unlock(&sc->sc_lock); - scsipi_done(xs); + xpt_done(ccb); return; } /* Initialize ecb */ - ecb->xs = xs; - ecb->timeout = xs->timeout; + ecb->ccb = ccb; + ecb->timeout = ccb->ccb_h.timeout; - if (flags & XS_CTL_RESET) { + if (ccb->ccb_h.func_code == XPT_RESET_BUS) { ecb->flags |= ECB_RESET; ecb->clen = 0; ecb->dleft = 0; } else { - memcpy(&ecb->cmd.cmd, xs->cmd, xs->cmdlen); - ecb->clen = xs->cmdlen; - ecb->daddr = xs->data; - ecb->dleft = xs->datalen; + csio = &ccb->csio; + if ((ccb->ccb_h.flags & CAM_CDB_POINTER) != 0) + bcopy(csio->cdb_io.cdb_ptr, &ecb->cmd.cmd, + csio->cdb_len); + else + bcopy(csio->cdb_io.cdb_bytes, &ecb->cmd.cmd, + csio->cdb_len); + ecb->clen = csio->cdb_len; + ecb->daddr = csio->data_ptr; + ecb->dleft = csio->dxfer_len; } ecb->stat = 0; @@ -860,10 +862,10 @@ if (sc->sc_state == NCR_IDLE) ncr53c9x_sched(sc); +#if 0 if ((flags & XS_CTL_POLL) == 0) break; -#if 0 /* Not allowed to use interrupts, use polling instead */ if (ncr53c9x_poll(sc, xs, ecb->timeout)) { ncr53c9x_timeout(ecb); @@ -872,13 +874,10 @@ } #endif break; + } - case ADAPTER_REQ_GROW_RESOURCES: - /* XXX Not supported. */ - break; - - case ADAPTER_REQ_SET_XFER_MODE: - { + case XPT_SET_TRAN_SETTINGS: + { struct ncr53c9x_tinfo *ti; struct scsipi_xfer_mode *xm = arg; @@ -919,6 +918,8 @@ ncr53c9x_update_xfer_mode(sc, xm->xm_target); } break; + default: + break; } mtx_unlock(&sc->sc_lock); From owner-p4-projects@FreeBSD.ORG Mon Jun 7 18:15:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69BF216A4DA; Mon, 7 Jun 2004 18:15:35 +0000 (GMT) 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 200AF16A4CE for ; Mon, 7 Jun 2004 18:15:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BAB943D48 for ; Mon, 7 Jun 2004 18:15:35 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57IEqr9083578 for ; Mon, 7 Jun 2004 18:14:52 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57IEpQG083575 for perforce@freebsd.org; Mon, 7 Jun 2004 18:14:51 GMT (envelope-from scottl@freebsd.org) Date: Mon, 7 Jun 2004 18:14:51 GMT Message-Id: <200406071814.i57IEpQG083575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 18:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=54331 Change 54331 by scottl@scottl-esp-sparc64 on 2004/06/07 18:14:37 CAM does not track timeouts itself, it just provides a timeout hint for drivers to use for doing their own tracking. Adjust the use of the callout API for this. Also fix up ncr53c9x_select(). Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#9 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#7 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#9 (text+ko) ==== @@ -150,6 +150,13 @@ } \ } while (0) +#ifndef mstohz +#define mstohz(ms) \ + (((ms) < 0x20000) ? \ + ((ms +0u) / 1000u) * hz : \ + ((ms +0u) * hz) /1000u) +#endif + static int ecb_zone_initialized = 0; static uma_zone_t ecb_zone; @@ -447,7 +454,7 @@ sc->sc_state = NCR_CLEANING; sc->sc_msgify = 0; if ((ecb = sc->sc_nexus) != NULL) { - ecb->xs->error = XS_TIMEOUT; + ecb->ccb->ccb_h.status = CAM_CMD_TIMEOUT; ncr53c9x_done(sc, ecb); } /* Cancel outstanding disconnected commands on each LUN */ @@ -462,13 +469,15 @@ * that never reached the disk? */ li->busy = 0; - ecb->xs->error = XS_TIMEOUT; + ecb->ccb->ccb_h.status = + CAM_CMD_TIMEOUT; ncr53c9x_done(sc, ecb); } for (i = 0; i < 256; i++) if ((ecb = li->queued[i])) { li->queued[i] = NULL; - ecb->xs->error = XS_TIMEOUT; + ecb->ccb->ccb_h.status = + CAM_CMD_TIMEOUT; ncr53c9x_done(sc, ecb); } li->used = 0; @@ -621,9 +630,8 @@ struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; { - struct scsipi_periph *periph = ecb->xs->xs_periph; - int target = periph->periph_target; - int lun = periph->periph_lun; + int target = ecb->ccb->ccb_h.target_id; + int lun = ecb->ccb->ccb_h.target_lun; struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[target]; int tiflags = ti->flags; u_char *cmd; @@ -640,10 +648,8 @@ * expecting to come back due to an interrupt, because it is * always possible that the interrupt may never happen. */ - if ((ecb->xs->xs_control & XS_CTL_POLL) == 0) { - callout_reset(&ecb->xs->xs_callout, mstohz(ecb->timeout), - ncr53c9x_timeout, ecb); - } + callout_reset(&ecb->ecb_callout, mstohz(ecb->timeout), + ncr53c9x_timeout, ecb); /* * The docs say the target register is never reset, and I @@ -1128,7 +1134,7 @@ NCR_TRACE(("[ncr53c9x_done(error:%x)] ", xs->error)); - callout_stop(&ecb->xs->xs_callout); + callout_stop(&ecb->ecb_callout); /* * Now, if we've come here with no error code, i.e. we've kept the @@ -2251,7 +2257,7 @@ goto reset; } printf("sending REQUEST SENSE\n"); - callout_stop(&ecb->xs->xs_callout); + callout_stop(&ecb->ecb_callout); ncr53c9x_sense(sc, ecb); goto out; } @@ -2320,7 +2326,7 @@ */ if (sc->sc_state == NCR_SELECTING) { NCR_INTS(("backoff selector ")); - callout_stop(&ecb->xs->xs_callout); + callout_stop(&ecb->ecb_callout); ncr53c9x_dequeue(sc, ecb); TAILQ_INSERT_HEAD(&sc->ready_list, ecb, chain); ecb->flags |= ECB_READY; @@ -2784,7 +2790,7 @@ /* * Reschedule timeout. */ - callout_reset(&ecb->xs->xs_callout, mstohz(ecb->timeout), + callout_reset(&ecb->ecb_callout, mstohz(ecb->timeout), ncr53c9x_timeout, ecb); } else { /* ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#7 (text+ko) ==== @@ -118,6 +118,7 @@ #define ECB_RESET 0x80 #define ECB_TENTATIVE_DONE 0x100 int timeout; + struct callout ecb_callout; struct { u_char msg[3]; /* Selection Id msg and tags */ From owner-p4-projects@FreeBSD.ORG Mon Jun 7 19:48:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C87716A4D1; Mon, 7 Jun 2004 19:48:06 +0000 (GMT) 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 0F5BC16A4CE for ; Mon, 7 Jun 2004 19:48:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED34143D5C for ; Mon, 7 Jun 2004 19:48:05 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57Jm5UB003642 for ; Mon, 7 Jun 2004 19:48:05 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57Jm5qn003635 for perforce@freebsd.org; Mon, 7 Jun 2004 19:48:05 GMT (envelope-from scottl@freebsd.org) Date: Mon, 7 Jun 2004 19:48:05 GMT Message-Id: <200406071948.i57Jm5qn003635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 19:48:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=54339 Change 54339 by scottl@scottl-esp-sparc64 on 2004/06/07 19:47:36 More conversions to a lot of functions. Add an sc pointer to the ecb so it can be retrieved in ncr53c9x_timeout(). Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#10 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#8 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#10 (text+ko) ==== @@ -126,7 +126,7 @@ static int ncr53c9x_rdfifo(struct ncr53c9x_softc *, int); static void ncr53c9x_update_xfer_mode(struct ncr53c9x_softc *, int); -static struct ncr53c9x_ecb *ncr53c9x_get_ecb(struct ncr53c9x_softc *, int); +static struct ncr53c9x_ecb *ncr53c9x_get_ecb(struct ncr53c9x_softc *); static struct ncr53c9x_linfo *ncr53c9x_lunsearch(struct ncr53c9x_tinfo *, int64_t lun); @@ -784,9 +784,8 @@ } static struct ncr53c9x_ecb * -ncr53c9x_get_ecb(sc, flags) +ncr53c9x_get_ecb(sc) struct ncr53c9x_softc *sc; - int flags; { struct ncr53c9x_ecb *ecb; @@ -794,6 +793,7 @@ if (ecb) { memset(ecb, 0, sizeof(*ecb)); ecb->flags |= ECB_ALLOC; + ecb->sc = sc; } return (ecb); } @@ -827,14 +827,14 @@ struct ccb_scsiio *csio; /* Get an ECB to use. */ - ecb = ncr53c9x_get_ecb(sc, xs->xs_control); + ecb = ncr53c9x_get_ecb(sc); /* * This should never happen as we track resources * in the mid-layer. */ if (ecb == NULL) { xpt_freeze_simq(sim, 1); - ccb->ccb_h.status = CAM_BUSY; + ccb->ccb_h.status = CAM_REQUEUE_REQ; printf("unable to allocate ecb\n"); mtx_unlock(&sc->sc_lock); xpt_done(ccb); @@ -964,10 +964,12 @@ static void ncr53c9x_poll(struct cam_sim *sim) { + struct ncr53c9x_softc *sc; NCR_TRACE(("[ncr53c9x_poll] ")); + sc = cam_sim_softc(sim); if (NCRDMA_ISINTR(sc)) { - ncr53c9x_intr(cam_sim_softc(sim)); + ncr53c9x_intr(sc); } } @@ -1126,13 +1128,16 @@ struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; { - struct scsipi_xfer *xs = ecb->xs; - struct scsipi_periph *periph = xs->xs_periph; - struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[periph->periph_target]; - int lun = periph->periph_lun; - struct ncr53c9x_linfo *li = TINFO_LUN(ti, lun); + union ccb *ccb = ecb->ccb; + struct ncr53c9x_tinfo *ti + struct ncr53c9x_linfo *li; + int lun; + + NCR_TRACE(("[ncr53c9x_done(status:%x)] ", ccb->ccb_h.status)); - NCR_TRACE(("[ncr53c9x_done(error:%x)] ", xs->error)); + ti = &sc->sc_tinfo[ccb->ccb_h.target_id]; + lun = ccb->ccb_h.target_lun; + li = TINFO_LUN(ti, lun); callout_stop(&ecb->ecb_callout); @@ -1144,12 +1149,11 @@ * commands for this target/lunit, else we lose the sense info. * We don't support chk sense conditions for the request sense cmd. */ - if (xs->error == XS_NOERROR) { - xs->status = ecb->stat; + if (ccb->ccb_h.status == CAM_REQ_CMP) { if ((ecb->flags & ECB_ABORT) != 0) { - xs->error = XS_TIMEOUT; + ccb->ccb_h.status = CAM_CMD_TIMEOUT; } else if ((ecb->flags & ECB_SENSE) != 0) { - xs->error = XS_SENSE; + ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; } else if ((ecb->stat & ST_MASK) == SCSI_CHECK) { /* First, save the return values */ xs->resid = ecb->dleft; @@ -1186,7 +1190,7 @@ } } - if (xs->error == XS_SELTIMEOUT) { + if (ccb->ccb_h.status == CAM_SEL_TIMEOUT) { /* Selection timeout -- discard this LUN if empty */ if (li->untagged == NULL && li->used == 0) { if (lun < NCR_NLUN) @@ -1199,7 +1203,7 @@ ncr53c9x_free_ecb(sc, ecb); ti->cmds++; mtx_unlock(&sc->sc_lock); - scsipi_done(xs); + xpt_done(ccb); mtx_lock(&sc->sc_lock); } @@ -2004,7 +2008,7 @@ NCR_INTS(("[ncr53c9x_intr: state %d]", sc->sc_state)); if (!NCRDMA_ISINTR(sc)) - return (0); + return; mtx_lock(&sc->sc_lock); again: @@ -2064,7 +2068,7 @@ } if (sc->sc_state == NCR_CONNECTED || sc->sc_state == NCR_SELECTING) { - ecb->xs->error = XS_TIMEOUT; + ecb->ccb->ccb_h.status = CAM_SEL_TIMEOUT; ncr53c9x_done(sc, ecb); } goto out; @@ -2201,11 +2205,10 @@ { struct ncr53c9x_linfo *li; - ecb->xs->error = XS_SELTIMEOUT; + ecb->ccb->ccb_h.statusr = CAM_SEL_TIMEOUT; /* Selection timeout -- discard all LUNs if empty */ - periph = ecb->xs->xs_periph; - ti = &sc->sc_tinfo[periph->periph_target]; + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; li = LIST_FIRST(&ti->luns); while (li != NULL) { if (li->untagged == NULL && li->used == 0) { @@ -2227,10 +2230,10 @@ if ((sc->sc_flags & NCR_SYNCHNEGO) != 0) { #ifdef NCR53C9X_DEBUG if (ecb != NULL) - scsipi_printaddr(ecb->xs->xs_periph); + xpt_print_path(ecb->ccb->ccb_h.path); printf("sync nego not completed!\n"); #endif - ti = &sc->sc_tinfo[ecb->xs->xs_periph->periph_target]; + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; sc->sc_flags &= ~NCR_SYNCHNEGO; ti->flags &= ~(T_NEGOTIATE | T_SYNCMODE); } @@ -2262,7 +2265,7 @@ goto out; } - ecb->xs->error = XS_TIMEOUT; + ecb->ccb->ccb_h.status = CAM_CMD_TIMEOUT; goto finish; case NCR_DISCONNECT: @@ -2536,7 +2539,7 @@ if (sc->sc_state == NCR_IDLE) { printf("%s: stray interrupt\n", sc->dv_name); mtx_unlock(&sc->sc_lock); - return (0); + return; } break; @@ -2725,7 +2728,7 @@ out: mtx_unlock(&sc->sc_lock); - return (1); + return; reset: ncr53c9x_init(sc, 1); @@ -2808,13 +2811,11 @@ void *arg; { struct ncr53c9x_ecb *ecb = arg; - struct scsipi_xfer *xs = ecb->xs; - struct scsipi_periph *periph = xs->xs_periph; - struct ncr53c9x_softc *sc = - (void *)periph->periph_channel->chan_adapter->adapt_dev; - struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[periph->periph_target]; + union ccb *ccb = ecb->ccb; + struct ncr53c9x_softc *sc = ecb->sc; + struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[ccb->ccb_h.target_id]; - scsipi_printaddr(periph); + xpt_print_path(ccb->ccb_h.path); printf("%s: timed out [ecb %p (flags 0x%x, dleft %x, stat %x)], " "", @@ -2839,7 +2840,7 @@ } else { /* abort the operation that has timed out */ printf("\n"); - xs->error = XS_TIMEOUT; + ccb->ccb_h.status = CAM_CMD_TIMEOUT; ncr53c9x_abort(sc, ecb); /* Disable sync mode if stuck in a data phase */ @@ -2847,11 +2848,11 @@ (ti->flags & T_SYNCMODE) != 0 && (sc->sc_phase & (MSGI|CDI)) == 0) { /* XXX ASYNC CALLBACK! */ - scsipi_printaddr(periph); + xpt_print_path(ccb->ccb_h.path); printf("sync negotiation disabled\n"); sc->sc_cfflags |= - (1 << ((periph->periph_target & 7) + 8)); - ncr53c9x_update_xfer_mode(sc, periph->periph_target); + (1 << ((ccb->ccb_h.target_id & 7) + 8)); + ncr53c9x_update_xfer_mode(sc, ccb->ccb_h.target_id); } } ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#8 (text+ko) ==== @@ -110,6 +110,7 @@ struct ncr53c9x_ecb { TAILQ_ENTRY(ncr53c9x_ecb) chain; union ccb *ccb; /* SCSI xfer ctrl block from above */ + struct ncr53c9x_softc *sc; int flags; #define ECB_ALLOC 0x01 #define ECB_READY 0x02 From owner-p4-projects@FreeBSD.ORG Mon Jun 7 20:49:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C900716A4D1; Mon, 7 Jun 2004 20:49:32 +0000 (GMT) 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 A2E1916A4CE for ; Mon, 7 Jun 2004 20:49:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D50D43D2D for ; Mon, 7 Jun 2004 20:49:32 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57KnRXU022944 for ; Mon, 7 Jun 2004 20:49:27 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57KnRw6022941 for perforce@freebsd.org; Mon, 7 Jun 2004 20:49:27 GMT (envelope-from scottl@freebsd.org) Date: Mon, 7 Jun 2004 20:49:27 GMT Message-Id: <200406072049.i57KnRw6022941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 20:49:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=54344 Change 54344 by scottl@scottl-esp-sparc64 on 2004/06/07 20:49:11 Fix up a bunch more functions mostly by eliminating the scsipi_periph structure. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#11 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#11 (text+ko) ==== @@ -813,7 +813,6 @@ { struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; - int flags; NCR_TRACE(("[ncr53c9x_action] ")); @@ -988,7 +987,6 @@ struct ncr53c9x_softc *sc; { struct ncr53c9x_ecb *ecb; - struct scsipi_periph *periph; struct ncr53c9x_tinfo *ti; struct ncr53c9x_linfo *li; int lun; @@ -1004,9 +1002,8 @@ */ for (ecb = TAILQ_FIRST(&sc->ready_list); ecb != NULL; ecb = TAILQ_NEXT(ecb, chain)) { - periph = ecb->xs->xs_periph; - ti = &sc->sc_tinfo[periph->periph_target]; - lun = periph->periph_lun; + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; + lun = ecb->ccb->ccb_h.target_lun; /* Select type of tag for this command */ if ((ti->flags & (T_RSELECTOFF)) != 0) @@ -1016,12 +1013,7 @@ else if ((ecb->flags & ECB_SENSE) != 0) tag = 0; else - tag = ecb->xs->xs_tag_type; -#if 0 - /* XXXX Use tags for polled commands? */ - if (ecb->xs->xs_control & XS_CTL_POLL) - tag = 0; -#endif + tag = ecb->ccb->csio.tag_id; li = TINFO_LUN(ti, lun); if (li == NULL) { @@ -1047,7 +1039,6 @@ if ((li->busy != 1) && li->used == 0) { /* We need to issue this untagged command now */ ecb = li->untagged; - periph = ecb->xs->xs_periph; } else { /* Not ready yet */ continue; @@ -1055,8 +1046,8 @@ } ecb->tag[0] = tag; if (tag != 0) { - li->queued[ecb->xs->xs_tag_id] = ecb; - ecb->tag[1] = ecb->xs->xs_tag_id; + li->queued[ecb->ccb->csio.tag_id] = ecb; + ecb->tag[1] = ecb->ccb->csio.tag_id; li->used++; } if (li->untagged != NULL && (li->busy != 1)) { @@ -1075,8 +1066,8 @@ break; } else NCR_TRACE(("%d:%d busy\n", - periph->periph_target, - periph->periph_lun)); + ecb->ccb->ccb_h.target_id, + ecb->ccb->ccb_h.target_lun)); } } @@ -1085,22 +1076,25 @@ struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; { - struct scsipi_xfer *xs = ecb->xs; - struct scsipi_periph *periph = xs->xs_periph; - struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[periph->periph_target]; - struct scsipi_sense *ss = (void *)&ecb->cmd.cmd; + union ccb *ccb = ecb->ccb; + struct ncr53c9x_tinfo *ti; + struct scsi_request_sense *ss = (void *)&ecb->cmd.cmd; struct ncr53c9x_linfo *li; - int lun = periph->periph_lun; + int lun; NCR_TRACE(("requesting sense ")); + + lun = ccb->ccb_h.target_lun; + ti = &sc->sc_tinfo[ccb->ccb_h.target_id]; + /* Next, setup a request sense command block */ memset(ss, 0, sizeof(*ss)); ss->opcode = REQUEST_SENSE; - ss->byte2 = periph->periph_lun << SCSI_CMD_LUN_SHIFT; - ss->length = sizeof(struct scsipi_sense_data); + ss->byte2 = ccb->ccb_h.target_lun << SCSI_CMD_LUN_SHIFT; + ss->length = sizeof(struct scsi_request_sense); ecb->clen = sizeof(*ss); - ecb->daddr = (char *)&xs->sense.scsi_sense; - ecb->dleft = sizeof(struct scsipi_sense_data); + ecb->daddr = (char *)&ecb->ccb->csio.sense_data; + ecb->dleft = sizeof(struct scsi_sense_data); ecb->flags |= ECB_SENSE; ecb->timeout = NCR_SENSE_TIMEOUT; ti->senses++; @@ -1129,7 +1123,7 @@ struct ncr53c9x_ecb *ecb; { union ccb *ccb = ecb->ccb; - struct ncr53c9x_tinfo *ti + struct ncr53c9x_tinfo *ti; struct ncr53c9x_linfo *li; int lun; @@ -1156,7 +1150,7 @@ ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; } else if ((ecb->stat & ST_MASK) == SCSI_CHECK) { /* First, save the return values */ - xs->resid = ecb->dleft; + ecb->ccb->csio.resid = ecb->dleft; ncr53c9x_sense(sc, ecb); return; } else { @@ -1212,11 +1206,12 @@ struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; { - struct ncr53c9x_tinfo *ti = - &sc->sc_tinfo[ecb->xs->xs_periph->periph_target]; + struct ncr53c9x_tinfo *ti; struct ncr53c9x_linfo *li; - int64_t lun = ecb->xs->xs_periph->periph_lun; - + int64_t lun; + + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; + lun = ecb->ccb->ccb_h.target_lun; li = TINFO_LUN(ti, lun); #ifdef DIAGNOSTIC if (li == NULL || li->lun != lun) @@ -1561,13 +1556,13 @@ case NCR_CONNECTED: ecb = sc->sc_nexus; - ti = &sc->sc_tinfo[ecb->xs->xs_periph->periph_target]; + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; switch (sc->sc_imess[0]) { case MSG_CMDCOMPLETE: NCR_MSGS(("cmdcomplete ")); if (sc->sc_dleft < 0) { - scsipi_printaddr(ecb->xs->xs_periph); + xpt_print_path(ecb->ccb->ccb_h.path); printf("got %ld extra bytes\n", -(long)sc->sc_dleft); sc->sc_dleft = 0; @@ -1575,7 +1570,7 @@ ecb->dleft = (ecb->flags & ECB_TENTATIVE_DONE) ? 0 : sc->sc_dleft; if ((ecb->flags & ECB_SENSE) == 0) - ecb->xs->resid = ecb->dleft; + ecb->ccb->csio.resid = ecb->dleft; sc->sc_state = NCR_CMDCOMPLETE; break; @@ -1591,13 +1586,13 @@ */ printf("%s: tagged queuing rejected: " "target %d\n", sc->dv_name, - ecb->xs->xs_periph->periph_target); + ecb->ccb->ccb_h.target_id); NCR_MSGS(("(rejected sent tag)")); NCRCMD(sc, NCRCMD_FLUSH); DELAY(1); ti->flags &= ~T_TAG; - lun = ecb->xs->xs_periph->periph_lun; + lun = ecb->ccb->ccb_h.target_lun; li = TINFO_LUN(ti, lun); if (ecb->tag[0] && li->queued[ecb->tag[1]] != NULL) { @@ -1612,19 +1607,19 @@ case SEND_SDTR: printf("%s: sync transfer rejected: " "target %d\n", sc->dv_name, - ecb->xs->xs_periph->periph_target); + ecb->ccb->ccb_h.target_id); sc->sc_flags &= ~NCR_SYNCHNEGO; ti->flags &= ~(T_NEGOTIATE | T_SYNCMODE); ncr53c9x_setsync(sc, ti); ncr53c9x_update_xfer_mode(sc, - ecb->xs->xs_periph->periph_target); + ecb->ccb->ccb_h.target_id); break; case SEND_WDTR: printf("%s: wide transfer rejected: " - "target %d\n", sc->dv_xname, - ecb->xs->xs_periph->periph_target); + "target %d\n", sc->dv_name, + ecb->ccb->ccb_h.target_id); ti->flags &= ~(T_WIDE | T_WDTRSENT); ti->width = 0; break; @@ -1689,7 +1684,7 @@ ti->period > 124) { #if 0 #ifdef NCR53C9X_DEBUG - scsipi_printaddr(ecb->xs->xs_periph); + xpt_print_path(ecb->ccb->ccb_h.path); printf("async mode\n"); #endif #endif @@ -1726,7 +1721,7 @@ } } ncr53c9x_update_xfer_mode(sc, - ecb->xs->xs_periph->periph_target); + ecb->ccb->ccb_h.target_id); sc->sc_flags &= ~NCR_SYNCHNEGO; ncr53c9x_setsync(sc, ti); break; @@ -1749,7 +1744,7 @@ ti->flags &= ~(T_WIDE | T_WDTRSENT); break; default: - scsipi_printaddr(ecb->xs->xs_periph); + xpt_print_path(ecb->ccb->ccb_h.path); printf("unrecognized MESSAGE EXTENDED;" " sending REJECT\n"); goto reject; @@ -1758,7 +1753,7 @@ default: NCR_MSGS(("ident ")); - scsipi_printaddr(ecb->xs->xs_periph); + xpt_print_path(ecb->ccb->ccb_h.path); printf("unrecognized MESSAGE; sending REJECT\n"); reject: ncr53c9x_sched_msgout(SEND_REJECT); @@ -1868,7 +1863,7 @@ switch (sc->sc_msgout) { case SEND_SDTR: ecb = sc->sc_nexus; - ti = &sc->sc_tinfo[ecb->xs->xs_periph->periph_target]; + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; sc->sc_omess[0] = MSG_EXTENDED; sc->sc_omess[1] = MSG_EXT_SDTR_LEN; sc->sc_omess[2] = MSG_EXT_SDTR; @@ -1882,7 +1877,7 @@ break; case SEND_WDTR: ecb = sc->sc_nexus; - ti = &sc->sc_tinfo[ecb->xs->xs_periph->periph_target]; + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; sc->sc_omess[0] = MSG_EXTENDED; sc->sc_omess[1] = MSG_EXT_WDTR_LEN; sc->sc_omess[2] = MSG_EXT_WDTR; @@ -1896,7 +1891,7 @@ } ecb = sc->sc_nexus; sc->sc_omess[0] = - MSG_IDENTIFY(ecb->xs->xs_periph->periph_lun, 0); + MSG_IDENTIFY(ecb->ccb->ccb_h.target_lun, 0); break; case SEND_TAG: if (sc->sc_state != NCR_CONNECTED) { @@ -1912,10 +1907,9 @@ sc->sc_flags |= NCR_ABORTING; sc->sc_omess[0] = MSG_BUS_DEV_RESET; ecb = sc->sc_nexus; - ti = &sc->sc_tinfo[ecb->xs->xs_periph->periph_target]; + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; ti->flags &= ~T_SYNCMODE; - ncr53c9x_update_xfer_mode(sc, - ecb->xs->xs_periph->periph_target); + ncr53c9x_update_xfer_mode(sc,ecb->ccb->ccb_h.target_id); if ((ti->flags & T_SYNCHOFF) == 0) /* We can re-start sync negotiation */ ti->flags |= T_NEGOTIATE; @@ -2000,7 +1994,6 @@ { struct ncr53c9x_softc *sc = arg; struct ncr53c9x_ecb *ecb; - struct scsipi_periph *periph; struct ncr53c9x_tinfo *ti; size_t size; int nfifo; @@ -2205,7 +2198,7 @@ { struct ncr53c9x_linfo *li; - ecb->ccb->ccb_h.statusr = CAM_SEL_TIMEOUT; + ecb->ccb->ccb_h.status = CAM_SEL_TIMEOUT; /* Selection timeout -- discard all LUNs if empty */ ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; @@ -2418,8 +2411,7 @@ if (ecb == NULL) panic("ncr53c9x: no nexus"); - periph = ecb->xs->xs_periph; - ti = &sc->sc_tinfo[periph->periph_target]; + ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; switch (sc->sc_espstep) { case 0: @@ -2489,8 +2481,8 @@ " %d left in FIFO " "[intr %x, stat %x, step %d]\n", sc->dv_name, - periph->periph_target, - periph->periph_lun, + ecb->ccb->ccb_h.target_id, + ecb->ccb->ccb_h.target_lun, NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF, sc->sc_espintr, sc->sc_espstat, @@ -2509,8 +2501,8 @@ "%lu left in DMA buffer " "[intr %x, stat %x, step %d]\n", sc->dv_name, - periph->periph_target, - periph->periph_lun, + ecb->ccb->ccb_h.target_id, + ecb->ccb->ccb_h.target_lun, (u_long)sc->sc_cmdlen, sc->sc_espintr, sc->sc_espstat, @@ -2568,7 +2560,7 @@ ecb->dleft = (ecb->flags & ECB_TENTATIVE_DONE) ? 0 : sc->sc_dleft; if ((ecb->flags & ECB_SENSE) == 0) - ecb->xs->resid = ecb->dleft; + ecb->ccb->csio.resid = ecb->dleft; sc->sc_state = NCR_CMDCOMPLETE; } else printf("%s: STATUS_PHASE: msg %d\n", From owner-p4-projects@FreeBSD.ORG Mon Jun 7 22:21:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B6A016A4D2; Mon, 7 Jun 2004 22:21:43 +0000 (GMT) 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 6558F16A4D0 for ; Mon, 7 Jun 2004 22:21:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A5BF43D48 for ; Mon, 7 Jun 2004 22:21:43 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57MLhvb045299 for ; Mon, 7 Jun 2004 22:21:43 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57MLg6W045290 for perforce@freebsd.org; Mon, 7 Jun 2004 22:21:42 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Jun 2004 22:21:42 GMT Message-Id: <200406072221.i57MLg6W045290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 22:21:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=54357 Change 54357 by peter@peter_daintree on 2004/06/07 22:21:10 "Fix" the swap problem. This includes fixing the same problem in two other places. The pmap_remove() bug was replicated into pmap_protect() and pmap_copy(), although fortunately, it wouldn't have mattered much there (if at all). While here, rename a variable to a better name, and fix a #define POLA problem. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#73 edit .. //depot/projects/hammer/sys/amd64/include/param.h#17 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#73 (text+ko) ==== @@ -1562,7 +1562,9 @@ void pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - vm_offset_t pdnxt; + vm_offset_t va_next; + pml4_entry_t *pml4e; + pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; pt_entry_t *pte; int anyvalid; @@ -1588,15 +1590,27 @@ anyvalid = 0; - for (; sva < eva; sva = pdnxt) { + for (; sva < eva; sva = va_next) { if (pmap->pm_stats.resident_count == 0) break; + pml4e = pmap_pml4e(pmap, sva); + if (pml4e == 0) { + va_next = (sva + NBPML4) & ~PML4MASK; + continue; + } + + pdpe = pmap_pdpe(pmap, sva); + if (pdpe == 0) { + va_next = (sva + NBPDP) & ~PDPMASK; + continue; + } + /* * Calculate index for next page table. */ - pdnxt = (sva + NBPDR) & ~PDRMASK; + va_next = (sva + NBPDR) & ~PDRMASK; pde = pmap_pde(pmap, sva); if (pde == 0) @@ -1625,10 +1639,10 @@ * by the current page table page, or to the end of the * range being removed. */ - if (pdnxt > eva) - pdnxt = eva; + if (va_next > eva) + va_next = eva; - for (; sva != pdnxt; sva += PAGE_SIZE) { + for (; sva != va_next; sva += PAGE_SIZE) { pte = pmap_pte(pmap, sva); if (pte == NULL || *pte == 0) continue; @@ -1714,7 +1728,9 @@ void pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) { - vm_offset_t pdnxt; + vm_offset_t va_next; + pml4_entry_t *pml4e; + pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; int anychanged; @@ -1731,9 +1747,21 @@ anychanged = 0; - for (; sva < eva; sva = pdnxt) { + for (; sva < eva; sva = va_next) { + + pml4e = pmap_pml4e(pmap, sva); + if (pml4e == 0) { + va_next = (sva + NBPML4) & ~PML4MASK; + continue; + } + + pdpe = pmap_pdpe(pmap, sva); + if (pdpe == 0) { + va_next = (sva + NBPDP) & ~PDPMASK; + continue; + } - pdnxt = (sva + NBPDR) & ~PDRMASK; + va_next = (sva + NBPDR) & ~PDRMASK; pde = pmap_pde(pmap, sva); if (pde == NULL) @@ -1757,10 +1785,10 @@ continue; } - if (pdnxt > eva) - pdnxt = eva; + if (va_next > eva) + va_next = eva; - for (; sva != pdnxt; sva += PAGE_SIZE) { + for (; sva != va_next; sva += PAGE_SIZE) { pt_entry_t pbits; pt_entry_t *pte; vm_page_t m; @@ -2194,7 +2222,7 @@ { vm_offset_t addr; vm_offset_t end_addr = src_addr + len; - vm_offset_t pdnxt; + vm_offset_t va_next; vm_page_t m; if (dst_addr != src_addr) @@ -2203,9 +2231,11 @@ if (!pmap_is_current(src_pmap)) return; - for (addr = src_addr; addr < end_addr; addr = pdnxt) { + for (addr = src_addr; addr < end_addr; addr = va_next) { pt_entry_t *src_pte, *dst_pte; vm_page_t dstmpte, srcmpte; + pml4_entry_t *pml4e; + pdp_entry_t *pdpe; pd_entry_t srcptepaddr, *pde; vm_pindex_t ptepindex; @@ -2221,7 +2251,19 @@ pv_entry_count > pv_entry_high_water) break; - pdnxt = (addr + NBPDR) & ~PDRMASK; + pml4e = pmap_pml4e(src_pmap, addr); + if (pml4e == 0) { + va_next = (addr + NBPML4) & ~PML4MASK; + continue; + } + + pdpe = pmap_pdpe(src_pmap, addr); + if (pdpe == 0) { + va_next = (addr + NBPDP) & ~PDPMASK; + continue; + } + + va_next = (addr + NBPDR) & ~PDRMASK; ptepindex = pmap_pde_pindex(addr); pde = pmap_pde(src_pmap, addr); @@ -2253,11 +2295,11 @@ if (srcmpte->hold_count == 0 || (srcmpte->flags & PG_BUSY)) continue; - if (pdnxt > end_addr) - pdnxt = end_addr; + if (va_next > end_addr) + va_next = end_addr; src_pte = vtopte(addr); - while (addr < pdnxt) { + while (addr < va_next) { pt_entry_t ptetemp; ptetemp = *src_pte; /* ==== //depot/projects/hammer/sys/amd64/include/param.h#17 (text+ko) ==== @@ -115,9 +115,9 @@ /* Size of the level 4 page-map level-4 table units */ #define NPML4EPG (PAGE_SIZE/(sizeof (pml4_entry_t))) #define NPML4EPGSHIFT 9 /* LOG2(NPML4EPG) */ -#define PML4SHIFT 39 /* LOG2(NBPML4T) */ -#define NBPML4T (1ul< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2123816A4D1; Mon, 7 Jun 2004 22:45:13 +0000 (GMT) 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 F09C016A4CE for ; Mon, 7 Jun 2004 22:45:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB0A143D2F for ; Mon, 7 Jun 2004 22:45:12 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57MjC3q050302 for ; Mon, 7 Jun 2004 22:45:12 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57MjCEG050299 for perforce@freebsd.org; Mon, 7 Jun 2004 22:45:12 GMT (envelope-from scottl@freebsd.org) Date: Mon, 7 Jun 2004 22:45:12 GMT Message-Id: <200406072245.i57MjCEG050299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 22:45:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=54359 Change 54359 by scottl@scottl-esp-sparc64 on 2004/06/07 22:45:04 Make sc->dv_name a const char Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#9 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#9 (text+ko) ==== @@ -72,7 +72,7 @@ #include /* Set this to 1 for normal debug, or 2 for per-target tracing. */ -/* #define NCR53C9X_DEBUG 1 */ +#define NCR53C9X_DEBUG 2 /* Wide or differential can have 16 targets */ #define NCR_NLUN 8 @@ -272,7 +272,7 @@ struct ncr53c9x_softc { device_t sc_dev; /* us as a device */ - char *dv_name; + const char *dv_name; struct cam_sim *sc_sim; /* our scsi adapter */ struct cam_path *sc_path; /* our scsi channel */ From owner-p4-projects@FreeBSD.ORG Mon Jun 7 22:46:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0040A16A4D1; Mon, 7 Jun 2004 22:46:14 +0000 (GMT) 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 CEA0D16A4CE for ; Mon, 7 Jun 2004 22:46:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B13F543D49 for ; Mon, 7 Jun 2004 22:46:14 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57MkEZ0050379 for ; Mon, 7 Jun 2004 22:46:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57MkEfN050376 for perforce@freebsd.org; Mon, 7 Jun 2004 22:46:14 GMT (envelope-from scottl@freebsd.org) Date: Mon, 7 Jun 2004 22:46:14 GMT Message-Id: <200406072246.i57MkEfN050376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 22:46:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=54360 Change 54360 by scottl@scottl-esp-sparc64 on 2004/06/07 22:46:06 Add some macros from NetBSD that help determine the message type. Tidy up a few other areas and comment out the target renegotiating code for now. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#12 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#12 (text+ko) ==== @@ -88,6 +88,7 @@ #include #include #include +#include #include #include @@ -301,7 +302,9 @@ sc->sc_path = path; /* Reset state & bus */ +#if 0 sc->sc_cfflags = sc->sc_dev.dv_cfdata->cf_flags; +#endif sc->sc_state = 0; ncr53c9x_init(sc, 1); @@ -881,6 +884,7 @@ break; } +#if 0 case XPT_SET_TRAN_SETTINGS: { struct ncr53c9x_tinfo *ti; @@ -923,6 +927,7 @@ ncr53c9x_update_xfer_mode(sc, xm->xm_target); } break; +#endif default: break; } @@ -935,6 +940,7 @@ struct ncr53c9x_softc *sc; int target; { +#if 0 struct scsipi_xfer_mode xm; struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[target]; @@ -955,6 +961,7 @@ xm.xm_mode |= PERIPH_CAP_TQING; scsipi_async_event(&sc->sc_channel, ASYNC_EVENT_XFER_MODE, &xm); +#endif } /* @@ -1148,27 +1155,31 @@ ccb->ccb_h.status = CAM_CMD_TIMEOUT; } else if ((ecb->flags & ECB_SENSE) != 0) { ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; - } else if ((ecb->stat & ST_MASK) == SCSI_CHECK) { + } else if (ecb->stat == SCSI_STATUS_CHECK_COND) { /* First, save the return values */ - ecb->ccb->csio.resid = ecb->dleft; + ccb->csio.resid = ecb->dleft; ncr53c9x_sense(sc, ecb); return; } else { - xs->resid = ecb->dleft; + ccb->csio.resid = ecb->dleft; } +#if 0 if (xs->status == SCSI_QUEUE_FULL || xs->status == XS_BUSY) xs->error = XS_BUSY; +#endif } #ifdef NCR53C9X_DEBUG if (ncr53c9x_debug & NCR_SHOWTRAC) { - if (xs->resid != 0) - printf("resid=%d ", xs->resid); + if (ccb->csio.resid != 0) + printf("resid=%d ", ccb->csio.resid); +#if 0 if (xs->error == XS_SENSE) printf("sense=0x%02x\n", xs->sense.scsi_sense.error_code); else printf("error=%d\n", xs->error); +#endif } #endif @@ -1448,6 +1459,12 @@ return (1); } +/* From NetBSD. These should go into CAM at some point */ +#define MSG_ISEXTENDED(m) ((m) == MSG_EXTENDED) +#define MSG_IS1BYTE(m) \ + ((!MSG_ISEXTENDED(m) && (m) < 0x20) || MSG_ISIDENTIFY(m)) +#define MSG_IS2BYTE(m) (((m) & 0xf0) == 0x20) + static inline int __verify_msg_format(u_char *p, int len) { From owner-p4-projects@FreeBSD.ORG Mon Jun 7 22:46:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A175816A50B; Mon, 7 Jun 2004 22:46:15 +0000 (GMT) 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 2E63516A4ED for ; Mon, 7 Jun 2004 22:46:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 270B143D54 for ; Mon, 7 Jun 2004 22:46:15 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57MkFdX050390 for ; Mon, 7 Jun 2004 22:46:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57MkEoS050384 for perforce@freebsd.org; Mon, 7 Jun 2004 22:46:14 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Jun 2004 22:46:14 GMT Message-Id: <200406072246.i57MkEoS050384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 22:46:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=54361 Change 54361 by peter@peter_hammer on 2004/06/07 22:46:11 make PG_NX stuff actually work. PG_FRAME now has to exclude high order bits too, since the page frame number only goes up to bit 52. Switch a few things to using ~PAGE_MASK instead of PG_FRAME since thats what they really wanted. Actually, they want trunc_page() etc, but thats for later. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#74 edit .. //depot/projects/hammer/sys/amd64/include/pmap.h#34 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#74 (text+ko) ==== @@ -1850,7 +1850,7 @@ if (pmap == NULL) return; - va &= PG_FRAME; + va &= (~(vm_paddr_t)PAGE_MASK); #ifdef PMAP_DIAGNOSTIC if (va > VM_MAX_KERNEL_ADDRESS) panic("pmap_enter: toobig"); @@ -2779,7 +2779,7 @@ /* If we gave a direct map region in pmap_mapdev, do nothing */ if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) return; - base = va & PG_FRAME; + base = va & (~(vm_paddr_t)PAGE_MASK); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) ==== //depot/projects/hammer/sys/amd64/include/pmap.h#34 (text+ko) ==== @@ -68,7 +68,7 @@ /* Our various interpretations of the above */ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 -#define PG_FRAME (~((vm_paddr_t)PAGE_MASK)) +#define PG_FRAME (0x000ffffffffff000ul) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ From owner-p4-projects@FreeBSD.ORG Mon Jun 7 23:11:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1171216A4D1; Mon, 7 Jun 2004 23:11:03 +0000 (GMT) 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 C3B6716A4CE for ; Mon, 7 Jun 2004 23:11:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA16943D68 for ; Mon, 7 Jun 2004 23:11:02 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57NAvHA055600 for ; Mon, 7 Jun 2004 23:10:57 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57NAj8v055597 for perforce@freebsd.org; Mon, 7 Jun 2004 23:10:45 GMT (envelope-from scottl@freebsd.org) Date: Mon, 7 Jun 2004 23:10:45 GMT Message-Id: <200406072310.i57NAj8v055597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 23:11:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=54363 Change 54363 by scottl@scottl-esp-sparc64 on 2004/06/07 23:09:46 IFC Affected files ... .. //depot/projects/scottl-esp/src/sys/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/mem.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/sys_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/timerreg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/uio_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/endian.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/float.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/fpu.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/limits.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/profile.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/sf_buf.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/sysarch.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/scottl-esp/src/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/asm.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/endian.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/exec.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/float.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/limits.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/profile.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/psl.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/reg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/include/tss.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/scottl-esp/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/isa_dma.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/nmi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/isa/timerreg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/critical.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/support.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/_limits.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/asm.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/bus.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/clock.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/critical.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/float.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/fp.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/frame.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/intr.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/limits.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/param.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/proc.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/profile.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/psl.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/pte.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/reg.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/resource.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/runq.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/signal.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/smp.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/swi.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/trap.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/scottl-esp/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/scottl-esp/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/scottl-esp/src/sys/boot/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/common/newvers.sh#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/scottl-esp/src/sys/boot/i386/boot0/boot0.s#2 delete .. //depot/projects/scottl-esp/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/scottl-esp/src/sys/boot/i386/boot0/boot0ext.s#2 delete .. //depot/projects/scottl-esp/src/sys/boot/i386/boot0/boot0sio.s#2 delete .. //depot/projects/scottl-esp/src/sys/boot/i386/boot0ext/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/boot0sio/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/boot2/fs.h#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/boot2/quota.h#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/scottl-esp/src/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/scottl-esp/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/scottl-esp/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/scottl-esp/src/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/scottl-esp/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/Makefile.arm#1 branch .. //depot/projects/scottl-esp/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/NOTES#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/files#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/files.alpha#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/files.amd64#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/files.arm#1 branch .. //depot/projects/scottl-esp/src/sys/conf/files.i386#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/files.ia64#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/files.pc98#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/kern.mk#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/ldscript.arm#1 branch .. //depot/projects/scottl-esp/src/sys/conf/majors#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/options#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/options.arm#1 branch .. //depot/projects/scottl-esp/src/sys/conf/options.pc98#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/scottl-esp/src/sys/conf/systags.sh#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src.diff#1 branch .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/scottl-esp/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/scottl-esp/src/sys/ddb/db_elf.c#2 integrate .. //depot/projects/scottl-esp/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/amd/amd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-commands.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/cp/cpddk.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/cp/cpddk.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/cp/if_cp.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/cp/ng_cp.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/cy/cy.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/cy/cy_isa.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/cy/cy_pci.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/cy/cyreg.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/cy/cyvar.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/digi/digi_isa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#13 edit .. //depot/projects/scottl-esp/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fb/gallant12x22.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fb/splash.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fb/tga.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fdc/fdc.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/fdc/fdcreg.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/iec68113.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/hfa/fore_load.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ic/cd1400.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ichwd/ichwd.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ichwd/ichwd.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ida/ida_disk.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ips/ips.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/isp/isp_inline.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/README#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/led/led.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/led/led.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/md/md.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/ruephy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mlx/mlx_disk.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ofw/openfirmio.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pccard/Makefile.pccarddevs#2 delete .. //depot/projects/scottl-esp/src/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pccard/devlist2h.awk#2 delete .. //depot/projects/scottl-esp/src/sys/dev/pccard/files.pccard#2 delete .. //depot/projects/scottl-esp/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pccard/pccarddevs.h#2 delete .. //depot/projects/scottl-esp/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/pci/eisa_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pci/ignore_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/random/harvest.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/random/hash.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/random/hash.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/random/nehemiah.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/random/nehemiah.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/random/probe.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/random/randomdev_soft.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/random/randomdev_soft.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/random/yarrow.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/rc/rc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sab/sab.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/si/si.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sio/sio_ebus.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sio/sioreg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sio/siovar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/emu8000.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/gusmidi.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/mpu.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/opl.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/isa/uartsio.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/midi.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/midi.h#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/midibuf.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/midibuf.h#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/midisynth.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/midisynth.h#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/miditypes.h#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/sequencer.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/sequencer.h#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/timer.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/midi/timer.h#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/csamidi.c#2 delete .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/sx/cd1865.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/sx/sx.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/sx/sx.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/sx/sx_pci.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/sx/sx_util.c#1 branch .. //depot/projects/scottl-esp/src/sys/dev/sx/sx_util.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/sx/sxvar.h#1 branch .. //depot/projects/scottl-esp/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/trm/trm.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twa/twa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twa/twa.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twa/twa_cam.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twa/twa_freebsd.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twa/twa_includes.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twe/twe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twe/twereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/devlist2h.awk#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/usbdevs.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/usbdevs_data.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/vinum/vinumio.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/xe/if_xevar.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/zs/z8530reg.h#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/zs/zs.c#2 integrate .. //depot/projects/scottl-esp/src/sys/dev/zs/zs_sbus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/fifofs/fifo.h#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/hpfs/hpfs_hash.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/nullfs/null.h#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/portalfs/portal.h#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs.h#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_mem.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_note.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/procfs/procfs_type.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/specfs/spec_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/umapfs/umap.h#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/umapfs/umap_subr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/scottl-esp/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/scottl-esp/src/sys/geom/gate/g_gate.c#1 branch .. //depot/projects/scottl-esp/src/sys/geom/gate/g_gate.h#1 branch .. //depot/projects/scottl-esp/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/scottl-esp/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/scottl-esp/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/scottl-esp/src/sys/geom/geom_sunlabel_enc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/scottl-esp/src/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/scottl-esp/src/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/scottl-esp/src/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_balloc.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_extern.h#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_ihash.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_mount.h#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_subr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/fs.h#2 integrate .. //depot/projects/scottl-esp/src/sys/gnu/ext2fs/inode.h#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/acpica/acpi_asus.c#1 branch .. //depot/projects/scottl-esp/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/acpica/acpi_toshiba.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/autoconf.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/bios.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/db_interface.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/scottl-esp/src/sys/i386/i386/swtch.s#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 7 23:51:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E86216A4D1; Mon, 7 Jun 2004 23:51:02 +0000 (GMT) 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 E13CF16A4CE for ; Mon, 7 Jun 2004 23:51:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D862B43D48 for ; Mon, 7 Jun 2004 23:51:01 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57Np1xP063749 for ; Mon, 7 Jun 2004 23:51:01 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57Np0E9063741 for perforce@freebsd.org; Mon, 7 Jun 2004 23:51:00 GMT (envelope-from ps@freebsd.org) Date: Mon, 7 Jun 2004 23:51:00 GMT Message-Id: <200406072351.i57Np0E9063741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Subject: PERFORCE change 54365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 23:51:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=54365 Change 54365 by ps@butter.corp on 2004/06/07 23:50:16 Populate for SACK work. Affected files ... .. //depot/projects/sack/Makefile#1 branch .. //depot/projects/sack/alpha/Makefile#1 branch .. //depot/projects/sack/alpha/alpha/alpha-gdbstub.c#1 branch .. //depot/projects/sack/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/sack/alpha/alpha/atomic.s#1 branch .. //depot/projects/sack/alpha/alpha/autoconf.c#1 branch .. //depot/projects/sack/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/sack/alpha/alpha/busspace.c#1 branch .. //depot/projects/sack/alpha/alpha/clock.c#1 branch .. //depot/projects/sack/alpha/alpha/clock_if.m#1 branch .. //depot/projects/sack/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/sack/alpha/alpha/critical.c#1 branch .. //depot/projects/sack/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/sack/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/sack/alpha/alpha/db_interface.c#1 branch .. //depot/projects/sack/alpha/alpha/db_trace.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/sack/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/sack/alpha/alpha/divrem.m4#1 branch .. //depot/projects/sack/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/sack/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/sack/alpha/alpha/exception.s#1 branch .. //depot/projects/sack/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/sack/alpha/alpha/genassym.c#1 branch .. //depot/projects/sack/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/sack/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/sack/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/sack/alpha/alpha/interrupt.c#1 branch .. //depot/projects/sack/alpha/alpha/locore.s#1 branch .. //depot/projects/sack/alpha/alpha/machdep.c#1 branch .. //depot/projects/sack/alpha/alpha/mem.c#1 branch .. //depot/projects/sack/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/sack/alpha/alpha/pal.s#1 branch .. //depot/projects/sack/alpha/alpha/pmap.c#1 branch .. //depot/projects/sack/alpha/alpha/prom.c#1 branch .. //depot/projects/sack/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/sack/alpha/alpha/promcons.c#1 branch .. //depot/projects/sack/alpha/alpha/sgmap.c#1 branch .. //depot/projects/sack/alpha/alpha/support.s#1 branch .. //depot/projects/sack/alpha/alpha/swtch.s#1 branch .. //depot/projects/sack/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/sack/alpha/alpha/timerreg.h#1 branch .. //depot/projects/sack/alpha/alpha/trap.c#1 branch .. //depot/projects/sack/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/sack/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/sack/alpha/compile/.cvsignore#1 branch .. //depot/projects/sack/alpha/conf/GENERIC#1 branch .. //depot/projects/sack/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/sack/alpha/conf/Makefile#1 branch .. //depot/projects/sack/alpha/conf/NOTES#1 branch .. //depot/projects/sack/alpha/conf/gethints.awk#1 branch .. //depot/projects/sack/alpha/include/_inttypes.h#1 branch .. //depot/projects/sack/alpha/include/_limits.h#1 branch .. //depot/projects/sack/alpha/include/_stdint.h#1 branch .. //depot/projects/sack/alpha/include/_types.h#1 branch .. //depot/projects/sack/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/sack/alpha/include/asm.h#1 branch .. //depot/projects/sack/alpha/include/atomic.h#1 branch .. //depot/projects/sack/alpha/include/bootinfo.h#1 branch .. //depot/projects/sack/alpha/include/bus.h#1 branch .. //depot/projects/sack/alpha/include/bus_memio.h#1 branch .. //depot/projects/sack/alpha/include/bus_pio.h#1 branch .. //depot/projects/sack/alpha/include/bwx.h#1 branch .. //depot/projects/sack/alpha/include/chipset.h#1 branch .. //depot/projects/sack/alpha/include/clock.h#1 branch .. //depot/projects/sack/alpha/include/clockvar.h#1 branch .. //depot/projects/sack/alpha/include/cpu.h#1 branch .. //depot/projects/sack/alpha/include/cpuconf.h#1 branch .. //depot/projects/sack/alpha/include/cpufunc.h#1 branch .. //depot/projects/sack/alpha/include/critical.h#1 branch .. //depot/projects/sack/alpha/include/db_machdep.h#1 branch .. //depot/projects/sack/alpha/include/elf.h#1 branch .. //depot/projects/sack/alpha/include/endian.h#1 branch .. //depot/projects/sack/alpha/include/exec.h#1 branch .. //depot/projects/sack/alpha/include/float.h#1 branch .. //depot/projects/sack/alpha/include/floatingpoint.h#1 branch .. //depot/projects/sack/alpha/include/fpu.h#1 branch .. //depot/projects/sack/alpha/include/frame.h#1 branch .. //depot/projects/sack/alpha/include/ieee.h#1 branch .. //depot/projects/sack/alpha/include/ieeefp.h#1 branch .. //depot/projects/sack/alpha/include/in_cksum.h#1 branch .. //depot/projects/sack/alpha/include/inst.h#1 branch .. //depot/projects/sack/alpha/include/intr.h#1 branch .. //depot/projects/sack/alpha/include/intrcnt.h#1 branch .. //depot/projects/sack/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/sack/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/sack/alpha/include/limits.h#1 branch .. //depot/projects/sack/alpha/include/md_var.h#1 branch .. //depot/projects/sack/alpha/include/mutex.h#1 branch .. //depot/projects/sack/alpha/include/pal.h#1 branch .. //depot/projects/sack/alpha/include/param.h#1 branch .. //depot/projects/sack/alpha/include/pc/bios.h#1 branch .. //depot/projects/sack/alpha/include/pc/display.h#1 branch .. //depot/projects/sack/alpha/include/pc/msdos.h#1 branch .. //depot/projects/sack/alpha/include/pc/vesa.h#1 branch .. //depot/projects/sack/alpha/include/pcb.h#1 branch .. //depot/projects/sack/alpha/include/pcpu.h#1 branch .. //depot/projects/sack/alpha/include/pmap.h#1 branch .. //depot/projects/sack/alpha/include/proc.h#1 branch .. //depot/projects/sack/alpha/include/profile.h#1 branch .. //depot/projects/sack/alpha/include/prom.h#1 branch .. //depot/projects/sack/alpha/include/pte.h#1 branch .. //depot/projects/sack/alpha/include/ptrace.h#1 branch .. //depot/projects/sack/alpha/include/reg.h#1 branch .. //depot/projects/sack/alpha/include/reloc.h#1 branch .. //depot/projects/sack/alpha/include/resource.h#1 branch .. //depot/projects/sack/alpha/include/rpb.h#1 branch .. //depot/projects/sack/alpha/include/runq.h#1 branch .. //depot/projects/sack/alpha/include/setjmp.h#1 branch .. //depot/projects/sack/alpha/include/sf_buf.h#1 branch .. //depot/projects/sack/alpha/include/sgmap.h#1 branch .. //depot/projects/sack/alpha/include/sigframe.h#1 branch .. //depot/projects/sack/alpha/include/signal.h#1 branch .. //depot/projects/sack/alpha/include/smp.h#1 branch .. //depot/projects/sack/alpha/include/stdarg.h#1 branch .. //depot/projects/sack/alpha/include/swiz.h#1 branch .. //depot/projects/sack/alpha/include/sysarch.h#1 branch .. //depot/projects/sack/alpha/include/ucontext.h#1 branch .. //depot/projects/sack/alpha/include/varargs.h#1 branch .. //depot/projects/sack/alpha/include/vmparam.h#1 branch .. //depot/projects/sack/alpha/isa/isa.c#1 branch .. //depot/projects/sack/alpha/isa/isa_dma.c#1 branch .. //depot/projects/sack/alpha/isa/isavar.h#1 branch .. //depot/projects/sack/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/sack/alpha/linux/Makefile#1 branch .. //depot/projects/sack/alpha/linux/linux.h#1 branch .. //depot/projects/sack/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/sack/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/sack/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/sack/alpha/linux/linux_locore.s#1 branch .. //depot/projects/sack/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/sack/alpha/linux/linux_proto.h#1 branch .. //depot/projects/sack/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/sack/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/sack/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/sack/alpha/linux/syscalls.conf#1 branch .. //depot/projects/sack/alpha/linux/syscalls.master#1 branch .. //depot/projects/sack/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/sack/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/sack/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/sack/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/sack/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/sack/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/sack/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/sack/alpha/osf1/Makefile#1 branch .. //depot/projects/sack/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/sack/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/sack/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/sack/alpha/osf1/osf1.h#1 branch .. //depot/projects/sack/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/sack/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/sack/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/sack/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/sack/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/sack/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/sack/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/sack/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/sack/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/sack/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/sack/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/sack/alpha/osf1/syscalls.master#1 branch .. //depot/projects/sack/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/sack/alpha/pci/apecs.c#1 branch .. //depot/projects/sack/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/sack/alpha/pci/apecsreg.h#1 branch .. //depot/projects/sack/alpha/pci/apecsvar.h#1 branch .. //depot/projects/sack/alpha/pci/bwx.c#1 branch .. //depot/projects/sack/alpha/pci/cia.c#1 branch .. //depot/projects/sack/alpha/pci/cia_pci.c#1 branch .. //depot/projects/sack/alpha/pci/ciareg.h#1 branch .. //depot/projects/sack/alpha/pci/ciavar.h#1 branch .. //depot/projects/sack/alpha/pci/irongate.c#1 branch .. //depot/projects/sack/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/sack/alpha/pci/irongatereg.h#1 branch .. //depot/projects/sack/alpha/pci/irongatevar.h#1 branch .. //depot/projects/sack/alpha/pci/lca.c#1 branch .. //depot/projects/sack/alpha/pci/lca_pci.c#1 branch .. //depot/projects/sack/alpha/pci/lcareg.h#1 branch .. //depot/projects/sack/alpha/pci/lcavar.h#1 branch .. //depot/projects/sack/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/sack/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/sack/alpha/pci/pcibus.c#1 branch .. //depot/projects/sack/alpha/pci/pcibus.h#1 branch .. //depot/projects/sack/alpha/pci/swiz.c#1 branch .. //depot/projects/sack/alpha/pci/t2.c#1 branch .. //depot/projects/sack/alpha/pci/t2_pci.c#1 branch .. //depot/projects/sack/alpha/pci/t2reg.h#1 branch .. //depot/projects/sack/alpha/pci/t2var.h#1 branch .. //depot/projects/sack/alpha/pci/tsunami.c#1 branch .. //depot/projects/sack/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/sack/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/sack/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/sack/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/sack/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/sack/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/sack/alpha/tlsb/gbus.c#1 branch .. //depot/projects/sack/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/sack/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/sack/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/sack/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/sack/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/sack/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/sack/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/sack/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/sack/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/sack/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/sack/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/sack/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/sack/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/sack/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/sack/amd64/Makefile#1 branch .. //depot/projects/sack/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/sack/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/sack/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/sack/amd64/acpica/madt.c#1 branch .. //depot/projects/sack/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/sack/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/sack/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/sack/amd64/amd64/atomic.c#1 branch .. //depot/projects/sack/amd64/amd64/autoconf.c#1 branch .. //depot/projects/sack/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/sack/amd64/amd64/critical.c#1 branch .. //depot/projects/sack/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/sack/amd64/amd64/db_interface.c#1 branch .. //depot/projects/sack/amd64/amd64/db_trace.c#1 branch .. //depot/projects/sack/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/exception.S#1 branch .. //depot/projects/sack/amd64/amd64/fpu.c#1 branch .. //depot/projects/sack/amd64/amd64/genassym.c#1 branch .. //depot/projects/sack/amd64/amd64/identcpu.c#1 branch .. //depot/projects/sack/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/sack/amd64/amd64/initcpu.c#1 branch .. //depot/projects/sack/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/io_apic.c#1 branch .. //depot/projects/sack/amd64/amd64/legacy.c#1 branch .. //depot/projects/sack/amd64/amd64/local_apic.c#1 branch .. //depot/projects/sack/amd64/amd64/locore.S#1 branch .. //depot/projects/sack/amd64/amd64/machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/mem.c#1 branch .. //depot/projects/sack/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/mpboot.S#1 branch .. //depot/projects/sack/amd64/amd64/mptable.c#1 branch .. //depot/projects/sack/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/sack/amd64/amd64/nexus.c#1 branch .. //depot/projects/sack/amd64/amd64/pmap.c#1 branch .. //depot/projects/sack/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/sack/amd64/amd64/support.S#1 branch .. //depot/projects/sack/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/trap.c#1 branch .. //depot/projects/sack/amd64/amd64/tsc.c#1 branch .. //depot/projects/sack/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/sack/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/sack/amd64/compile/.cvsignore#1 branch .. //depot/projects/sack/amd64/conf/GENERIC#1 branch .. //depot/projects/sack/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/sack/amd64/conf/Makefile#1 branch .. //depot/projects/sack/amd64/conf/NOTES#1 branch .. //depot/projects/sack/amd64/conf/gethints.awk#1 branch .. //depot/projects/sack/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/sack/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/sack/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/sack/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/sack/amd64/include/_inttypes.h#1 branch .. //depot/projects/sack/amd64/include/_limits.h#1 branch .. //depot/projects/sack/amd64/include/_stdint.h#1 branch .. //depot/projects/sack/amd64/include/_types.h#1 branch .. //depot/projects/sack/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/sack/amd64/include/apicreg.h#1 branch .. //depot/projects/sack/amd64/include/apicvar.h#1 branch .. //depot/projects/sack/amd64/include/asm.h#1 branch .. //depot/projects/sack/amd64/include/asmacros.h#1 branch .. //depot/projects/sack/amd64/include/atomic.h#1 branch .. //depot/projects/sack/amd64/include/bus.h#1 branch .. //depot/projects/sack/amd64/include/bus_amd64.h#1 branch .. //depot/projects/sack/amd64/include/bus_dma.h#1 branch .. //depot/projects/sack/amd64/include/bus_memio.h#1 branch .. //depot/projects/sack/amd64/include/bus_pio.h#1 branch .. //depot/projects/sack/amd64/include/clock.h#1 branch .. //depot/projects/sack/amd64/include/cpu.h#1 branch .. //depot/projects/sack/amd64/include/cpufunc.h#1 branch .. //depot/projects/sack/amd64/include/cputypes.h#1 branch .. //depot/projects/sack/amd64/include/critical.h#1 branch .. //depot/projects/sack/amd64/include/db_machdep.h#1 branch .. //depot/projects/sack/amd64/include/elf.h#1 branch .. //depot/projects/sack/amd64/include/endian.h#1 branch .. //depot/projects/sack/amd64/include/exec.h#1 branch .. //depot/projects/sack/amd64/include/float.h#1 branch .. //depot/projects/sack/amd64/include/floatingpoint.h#1 branch .. //depot/projects/sack/amd64/include/fpu.h#1 branch .. //depot/projects/sack/amd64/include/frame.h#1 branch .. //depot/projects/sack/amd64/include/ieeefp.h#1 branch .. //depot/projects/sack/amd64/include/in_cksum.h#1 branch .. //depot/projects/sack/amd64/include/intr_machdep.h#1 branch .. //depot/projects/sack/amd64/include/legacyvar.h#1 branch .. //depot/projects/sack/amd64/include/limits.h#1 branch .. //depot/projects/sack/amd64/include/md_var.h#1 branch .. //depot/projects/sack/amd64/include/metadata.h#1 branch .. //depot/projects/sack/amd64/include/mptable.h#1 branch .. //depot/projects/sack/amd64/include/mutex.h#1 branch .. //depot/projects/sack/amd64/include/param.h#1 branch .. //depot/projects/sack/amd64/include/pc/display.h#1 branch .. //depot/projects/sack/amd64/include/pcb.h#1 branch .. //depot/projects/sack/amd64/include/pcb_ext.h#1 branch .. //depot/projects/sack/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/sack/amd64/include/pcpu.h#1 branch .. //depot/projects/sack/amd64/include/pmap.h#1 branch .. //depot/projects/sack/amd64/include/proc.h#1 branch .. //depot/projects/sack/amd64/include/profile.h#1 branch .. //depot/projects/sack/amd64/include/psl.h#1 branch .. //depot/projects/sack/amd64/include/ptrace.h#1 branch .. //depot/projects/sack/amd64/include/reg.h#1 branch .. //depot/projects/sack/amd64/include/reloc.h#1 branch .. //depot/projects/sack/amd64/include/resource.h#1 branch .. //depot/projects/sack/amd64/include/runq.h#1 branch .. //depot/projects/sack/amd64/include/segments.h#1 branch .. //depot/projects/sack/amd64/include/setjmp.h#1 branch .. //depot/projects/sack/amd64/include/sf_buf.h#1 branch .. //depot/projects/sack/amd64/include/sigframe.h#1 branch .. //depot/projects/sack/amd64/include/signal.h#1 branch .. //depot/projects/sack/amd64/include/smp.h#1 branch .. //depot/projects/sack/amd64/include/specialreg.h#1 branch .. //depot/projects/sack/amd64/include/stdarg.h#1 branch .. //depot/projects/sack/amd64/include/sysarch.h#1 branch .. //depot/projects/sack/amd64/include/trap.h#1 branch .. //depot/projects/sack/amd64/include/tss.h#1 branch .. //depot/projects/sack/amd64/include/ucontext.h#1 branch .. //depot/projects/sack/amd64/include/varargs.h#1 branch .. //depot/projects/sack/amd64/include/vmparam.h#1 branch .. //depot/projects/sack/amd64/isa/atpic.c#1 branch .. //depot/projects/sack/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/sack/amd64/isa/clock.c#1 branch .. //depot/projects/sack/amd64/isa/elcr.c#1 branch .. //depot/projects/sack/amd64/isa/icu.h#1 branch .. //depot/projects/sack/amd64/isa/isa.c#1 branch .. //depot/projects/sack/amd64/isa/isa.h#1 branch .. //depot/projects/sack/amd64/isa/isa_dma.c#1 branch .. //depot/projects/sack/amd64/isa/isa_dma.h#1 branch .. //depot/projects/sack/amd64/isa/nmi.c#1 branch .. //depot/projects/sack/amd64/isa/timerreg.h#1 branch .. //depot/projects/sack/amd64/pci/pci_bus.c#1 branch .. //depot/projects/sack/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/sack/arm/arm/autoconf.c#1 branch .. //depot/projects/sack/arm/arm/bcopy_page.S#1 branch .. //depot/projects/sack/arm/arm/bcopyinout.S#1 branch .. //depot/projects/sack/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/sack/arm/arm/blockio.S#1 branch .. //depot/projects/sack/arm/arm/bootconfig.c#1 branch .. //depot/projects/sack/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/sack/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/sack/arm/arm/copystr.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc.c#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/sack/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/sack/arm/arm/critical.c#1 branch .. //depot/projects/sack/arm/arm/db_disasm.c#1 branch .. //depot/projects/sack/arm/arm/db_interface.c#1 branch .. //depot/projects/sack/arm/arm/db_trace.c#1 branch .. //depot/projects/sack/arm/arm/disassem.c#1 branch .. //depot/projects/sack/arm/arm/dump_machdep.c#1 branch .. //depot/projects/sack/arm/arm/elf_machdep.c#1 branch .. //depot/projects/sack/arm/arm/exception.S#1 branch .. //depot/projects/sack/arm/arm/fiq.c#1 branch .. //depot/projects/sack/arm/arm/fiq_subr.S#1 branch .. //depot/projects/sack/arm/arm/fusu.S#1 branch .. //depot/projects/sack/arm/arm/genassym.c#1 branch .. //depot/projects/sack/arm/arm/identcpu.c#1 branch .. //depot/projects/sack/arm/arm/in_cksum.c#1 branch .. //depot/projects/sack/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/sack/arm/arm/intr.c#1 branch .. //depot/projects/sack/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/sack/arm/arm/locore.S#1 branch .. //depot/projects/sack/arm/arm/machdep.c#1 branch .. //depot/projects/sack/arm/arm/nexus.c#1 branch .. //depot/projects/sack/arm/arm/nexus_io.c#1 branch .. //depot/projects/sack/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/sack/arm/arm/pmap.c#1 branch .. //depot/projects/sack/arm/arm/setcpsr.S#1 branch .. //depot/projects/sack/arm/arm/setstack.s#1 branch .. //depot/projects/sack/arm/arm/support.S#1 branch .. //depot/projects/sack/arm/arm/swtch.S#1 branch .. //depot/projects/sack/arm/arm/sys_machdep.c#1 branch .. //depot/projects/sack/arm/arm/trap.c#1 branch .. //depot/projects/sack/arm/arm/uio_machdep.c#1 branch .. //depot/projects/sack/arm/arm/undefined.c#1 branch .. //depot/projects/sack/arm/arm/vectors.S#1 branch .. //depot/projects/sack/arm/arm/vm_machdep.c#1 branch .. //depot/projects/sack/arm/compile/.cvsignore#1 branch .. //depot/projects/sack/arm/conf/SIMICS#1 branch .. //depot/projects/sack/arm/include/_inttypes.h#1 branch .. //depot/projects/sack/arm/include/_limits.h#1 branch .. //depot/projects/sack/arm/include/_stdint.h#1 branch .. //depot/projects/sack/arm/include/_types.h#1 branch .. //depot/projects/sack/arm/include/armreg.h#1 branch .. //depot/projects/sack/arm/include/asm.h#1 branch .. //depot/projects/sack/arm/include/asmacros.h#1 branch .. //depot/projects/sack/arm/include/atomic.h#1 branch .. //depot/projects/sack/arm/include/blockio.h#1 branch .. //depot/projects/sack/arm/include/bootconfig.h#1 branch .. //depot/projects/sack/arm/include/bus.h#1 branch .. //depot/projects/sack/arm/include/clock.h#1 branch .. //depot/projects/sack/arm/include/cpu.h#1 branch .. //depot/projects/sack/arm/include/cpuconf.h#1 branch .. //depot/projects/sack/arm/include/cpufunc.h#1 branch .. //depot/projects/sack/arm/include/critical.h#1 branch .. //depot/projects/sack/arm/include/db_machdep.h#1 branch .. //depot/projects/sack/arm/include/disassem.h#1 branch .. //depot/projects/sack/arm/include/elf.h#1 branch .. //depot/projects/sack/arm/include/endian.h#1 branch .. //depot/projects/sack/arm/include/exec.h#1 branch .. //depot/projects/sack/arm/include/fiq.h#1 branch .. //depot/projects/sack/arm/include/float.h#1 branch .. //depot/projects/sack/arm/include/floatingpoint.h#1 branch .. //depot/projects/sack/arm/include/fp.h#1 branch .. //depot/projects/sack/arm/include/frame.h#1 branch .. //depot/projects/sack/arm/include/ieee.h#1 branch .. //depot/projects/sack/arm/include/ieeefp.h#1 branch .. //depot/projects/sack/arm/include/in_cksum.h#1 branch .. //depot/projects/sack/arm/include/intr.h#1 branch .. //depot/projects/sack/arm/include/katelib.h#1 branch .. //depot/projects/sack/arm/include/limits.h#1 branch .. //depot/projects/sack/arm/include/machdep.h#1 branch .. //depot/projects/sack/arm/include/md_var.h#1 branch .. //depot/projects/sack/arm/include/metadata.h#1 branch .. //depot/projects/sack/arm/include/mutex.h#1 branch .. //depot/projects/sack/arm/include/param.h#1 branch .. //depot/projects/sack/arm/include/pcb.h#1 branch .. //depot/projects/sack/arm/include/pcpu.h#1 branch .. //depot/projects/sack/arm/include/pmap.h#1 branch .. //depot/projects/sack/arm/include/proc.h#1 branch .. //depot/projects/sack/arm/include/profile.h#1 branch .. //depot/projects/sack/arm/include/psl.h#1 branch .. //depot/projects/sack/arm/include/pte.h#1 branch .. //depot/projects/sack/arm/include/ptrace.h#1 branch .. //depot/projects/sack/arm/include/reg.h#1 branch .. //depot/projects/sack/arm/include/reloc.h#1 branch .. //depot/projects/sack/arm/include/resource.h#1 branch .. //depot/projects/sack/arm/include/runq.h#1 branch .. //depot/projects/sack/arm/include/setjmp.h#1 branch .. //depot/projects/sack/arm/include/sf_buf.h#1 branch .. //depot/projects/sack/arm/include/sigframe.h#1 branch .. //depot/projects/sack/arm/include/signal.h#1 branch .. //depot/projects/sack/arm/include/smp.h#1 branch .. //depot/projects/sack/arm/include/stdarg.h#1 branch .. //depot/projects/sack/arm/include/swi.h#1 branch .. //depot/projects/sack/arm/include/trap.h#1 branch .. //depot/projects/sack/arm/include/ucontext.h#1 branch .. //depot/projects/sack/arm/include/undefined.h#1 branch .. //depot/projects/sack/arm/include/utrap.h#1 branch .. //depot/projects/sack/arm/include/vmparam.h#1 branch .. //depot/projects/sack/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/sack/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/sack/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/sack/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/sack/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/sack/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/sack/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/sack/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/sack/boot/Makefile#1 branch .. //depot/projects/sack/boot/README#1 branch .. //depot/projects/sack/boot/alpha/Makefile#1 branch .. //depot/projects/sack/boot/alpha/Makefile.inc#1 branch .. //depot/projects/sack/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/sack/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/sack/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/sack/boot/alpha/cdboot/version#1 branch .. //depot/projects/sack/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/sack/boot/alpha/common/conf.c#1 branch .. //depot/projects/sack/boot/alpha/common/help.alpha#1 branch .. //depot/projects/sack/boot/alpha/common/main.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/sack/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/sack/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/sack/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/sack/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/sack/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/sack/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/sack/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/sack/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/sack/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/sack/boot/alpha/loader/Makefile#1 branch .. //depot/projects/sack/boot/alpha/loader/version#1 branch .. //depot/projects/sack/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/sack/boot/alpha/netboot/version#1 branch .. //depot/projects/sack/boot/arc/Makefile#1 branch .. //depot/projects/sack/boot/arc/Makefile.inc#1 branch .. //depot/projects/sack/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/sack/boot/arc/include/arctypes.h#1 branch .. //depot/projects/sack/boot/arc/include/libarc.h#1 branch .. //depot/projects/sack/boot/arc/lib/Makefile#1 branch .. //depot/projects/sack/boot/arc/lib/abort.c#1 branch .. //depot/projects/sack/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/sack/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/sack/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/sack/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/sack/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/sack/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/sack/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/sack/boot/arc/lib/delay.c#1 branch .. //depot/projects/sack/boot/arc/lib/devicename.c#1 branch .. //depot/projects/sack/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/sack/boot/arc/lib/module.c#1 branch .. //depot/projects/sack/boot/arc/lib/prom.c#1 branch .. //depot/projects/sack/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/sack/boot/arc/lib/time.c#1 branch .. //depot/projects/sack/boot/arc/loader/Makefile#1 branch .. //depot/projects/sack/boot/arc/loader/conf.c#1 branch .. //depot/projects/sack/boot/arc/loader/help.alpha#1 branch .. //depot/projects/sack/boot/arc/loader/main.c#1 branch .. //depot/projects/sack/boot/arc/loader/version#1 branch .. //depot/projects/sack/boot/common/Makefile.inc#1 branch .. //depot/projects/sack/boot/common/bcache.c#1 branch .. //depot/projects/sack/boot/common/boot.c#1 branch .. //depot/projects/sack/boot/common/bootstrap.h#1 branch .. //depot/projects/sack/boot/common/commands.c#1 branch .. //depot/projects/sack/boot/common/console.c#1 branch .. //depot/projects/sack/boot/common/dev_net.c#1 branch .. //depot/projects/sack/boot/common/dev_net.h#1 branch .. //depot/projects/sack/boot/common/devopen.c#1 branch .. //depot/projects/sack/boot/common/help.common#1 branch .. //depot/projects/sack/boot/common/interp.c#1 branch .. //depot/projects/sack/boot/common/interp_backslash.c#1 branch .. //depot/projects/sack/boot/common/interp_forth.c#1 branch .. //depot/projects/sack/boot/common/interp_parse.c#1 branch .. //depot/projects/sack/boot/common/isapnp.c#1 branch .. //depot/projects/sack/boot/common/isapnp.h#1 branch .. //depot/projects/sack/boot/common/load.c#1 branch .. //depot/projects/sack/boot/common/load_elf.c#1 branch .. //depot/projects/sack/boot/common/load_elf32.c#1 branch .. //depot/projects/sack/boot/common/load_elf64.c#1 branch .. //depot/projects/sack/boot/common/loader.8#1 branch .. //depot/projects/sack/boot/common/ls.c#1 branch .. //depot/projects/sack/boot/common/merge_help.awk#1 branch .. //depot/projects/sack/boot/common/misc.c#1 branch .. //depot/projects/sack/boot/common/module.c#1 branch .. //depot/projects/sack/boot/common/newvers.sh#1 branch .. //depot/projects/sack/boot/common/panic.c#1 branch .. //depot/projects/sack/boot/common/pnp.c#1 branch .. //depot/projects/sack/boot/common/pnpdata#1 branch .. //depot/projects/sack/boot/common/ufsread.c#1 branch .. //depot/projects/sack/boot/efi/Makefile#1 branch .. //depot/projects/sack/boot/efi/Makefile.inc#1 branch .. //depot/projects/sack/boot/efi/include/README#1 branch .. //depot/projects/sack/boot/efi/include/efi.h#1 branch .. //depot/projects/sack/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/sack/boot/efi/include/efiapi.h#1 branch .. //depot/projects/sack/boot/efi/include/eficon.h#1 branch .. //depot/projects/sack/boot/efi/include/efidebug.h#1 branch .. //depot/projects/sack/boot/efi/include/efidef.h#1 branch .. //depot/projects/sack/boot/efi/include/efidevp.h#1 branch .. //depot/projects/sack/boot/efi/include/efierr.h#1 branch .. //depot/projects/sack/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/sack/boot/efi/include/efifs.h#1 branch .. //depot/projects/sack/boot/efi/include/efilib.h#1 branch .. //depot/projects/sack/boot/efi/include/efinet.h#1 branch .. //depot/projects/sack/boot/efi/include/efipart.h#1 branch .. //depot/projects/sack/boot/efi/include/efiprot.h#1 branch .. //depot/projects/sack/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/sack/boot/efi/include/efiser.h#1 branch .. //depot/projects/sack/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/sack/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/sack/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/sack/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/sack/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/sack/boot/efi/libefi/Makefile#1 branch .. //depot/projects/sack/boot/efi/libefi/arch/ia64/ldscript.ia64#1 branch .. //depot/projects/sack/boot/efi/libefi/arch/ia64/start.S#1 branch .. //depot/projects/sack/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/sack/boot/efi/libefi/copy.c#1 branch .. //depot/projects/sack/boot/efi/libefi/delay.c#1 branch .. //depot/projects/sack/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/sack/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/sack/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/sack/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/sack/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/sack/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/sack/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/sack/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/sack/boot/efi/libefi/module.c#1 branch .. //depot/projects/sack/boot/efi/libefi/time.c#1 branch .. //depot/projects/sack/boot/efi/loader/Makefile#1 branch .. //depot/projects/sack/boot/efi/loader/conf.c#1 branch .. //depot/projects/sack/boot/efi/loader/main.c#1 branch .. //depot/projects/sack/boot/efi/loader/version#1 branch .. //depot/projects/sack/boot/ficl/Makefile#1 branch .. //depot/projects/sack/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/sack/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/sack/boot/ficl/dict.c#1 branch .. //depot/projects/sack/boot/ficl/ficl.c#1 branch .. //depot/projects/sack/boot/ficl/ficl.h#1 branch .. //depot/projects/sack/boot/ficl/fileaccess.c#1 branch .. //depot/projects/sack/boot/ficl/float.c#1 branch .. //depot/projects/sack/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/sack/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/sack/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/sack/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/sack/boot/ficl/loader.c#1 branch .. //depot/projects/sack/boot/ficl/math64.c#1 branch .. //depot/projects/sack/boot/ficl/math64.h#1 branch .. //depot/projects/sack/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/sack/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/sack/boot/ficl/prefix.c#1 branch .. //depot/projects/sack/boot/ficl/search.c#1 branch .. //depot/projects/sack/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/sack/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/sack/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/sack/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/sack/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/sack/boot/ficl/stack.c#1 branch .. //depot/projects/sack/boot/ficl/testmain.c#1 branch .. //depot/projects/sack/boot/ficl/tools.c#1 branch .. //depot/projects/sack/boot/ficl/unix.c#1 branch .. //depot/projects/sack/boot/ficl/vm.c#1 branch .. //depot/projects/sack/boot/ficl/words.c#1 branch .. //depot/projects/sack/boot/forth/beastie.4th#1 branch .. //depot/projects/sack/boot/forth/frames.4th#1 branch .. //depot/projects/sack/boot/forth/loader.4th#1 branch .. //depot/projects/sack/boot/forth/loader.4th.8#1 branch .. //depot/projects/sack/boot/forth/loader.conf#1 branch .. //depot/projects/sack/boot/forth/loader.conf.5#1 branch .. //depot/projects/sack/boot/forth/loader.rc#1 branch .. //depot/projects/sack/boot/forth/pnp.4th#1 branch .. //depot/projects/sack/boot/forth/screen.4th#1 branch .. //depot/projects/sack/boot/forth/support.4th#1 branch .. //depot/projects/sack/boot/i386/Makefile#1 branch .. //depot/projects/sack/boot/i386/Makefile.inc#1 branch .. //depot/projects/sack/boot/i386/boot0/Makefile#1 branch .. //depot/projects/sack/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/sack/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/sack/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/sack/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/sack/boot/i386/boot2/Makefile#1 branch .. //depot/projects/sack/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/sack/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/sack/boot/i386/boot2/lib.h#1 branch .. //depot/projects/sack/boot/i386/boot2/sio.S#1 branch .. //depot/projects/sack/boot/i386/btx/Makefile#1 branch .. //depot/projects/sack/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/sack/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/sack/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/sack/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/sack/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/sack/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/sack/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/sack/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/sack/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/sack/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/sack/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/sack/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/sack/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/sack/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/sack/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/sack/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/sack/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/sack/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/sack/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/sack/boot/i386/libi386/Makefile#1 branch .. //depot/projects/sack/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/sack/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/sack/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/sack/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/sack/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/sack/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/sack/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/sack/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/sack/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/sack/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/sack/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/sack/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/sack/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/sack/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/sack/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/sack/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/sack/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/sack/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/sack/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/sack/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/sack/boot/i386/libi386/pread.c#1 branch .. //depot/projects/sack/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/sack/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/sack/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/sack/boot/i386/libi386/time.c#1 branch .. //depot/projects/sack/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/sack/boot/i386/loader/Makefile#1 branch .. //depot/projects/sack/boot/i386/loader/conf.c#1 branch .. //depot/projects/sack/boot/i386/loader/help.i386#1 branch .. //depot/projects/sack/boot/i386/loader/loader.rc#1 branch .. //depot/projects/sack/boot/i386/loader/main.c#1 branch .. //depot/projects/sack/boot/i386/loader/version#1 branch .. //depot/projects/sack/boot/i386/mbr/Makefile#1 branch .. //depot/projects/sack/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/sack/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/sack/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/sack/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/sack/boot/ia64/Makefile#1 branch .. //depot/projects/sack/boot/ia64/Makefile.inc#1 branch .. //depot/projects/sack/boot/ia64/libski/Makefile#1 branch .. //depot/projects/sack/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/sack/boot/ia64/libski/bootinfo.c#1 branch .. //depot/projects/sack/boot/ia64/libski/copy.c#1 branch .. //depot/projects/sack/boot/ia64/libski/delay.c#1 branch .. //depot/projects/sack/boot/ia64/libski/devicename.c#1 branch .. //depot/projects/sack/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/sack/boot/ia64/libski/elf_freebsd.c#1 branch .. //depot/projects/sack/boot/ia64/libski/exit.c#1 branch .. //depot/projects/sack/boot/ia64/libski/libski.h#1 branch .. //depot/projects/sack/boot/ia64/libski/module.c#1 branch .. //depot/projects/sack/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/sack/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/sack/boot/ia64/libski/skiconsole.c#1 branch .. //depot/projects/sack/boot/ia64/libski/skifs.c#1 branch .. //depot/projects/sack/boot/ia64/libski/ssc.c#1 branch .. //depot/projects/sack/boot/ia64/libski/time.c#1 branch .. //depot/projects/sack/boot/ia64/skiload/Makefile#1 branch .. //depot/projects/sack/boot/ia64/skiload/conf.c#1 branch .. //depot/projects/sack/boot/ia64/skiload/ldscript.ia64#1 branch .. //depot/projects/sack/boot/ia64/skiload/main.c#1 branch .. //depot/projects/sack/boot/ia64/skiload/skiload.cmd#1 branch .. //depot/projects/sack/boot/ia64/skiload/start.S#1 branch .. //depot/projects/sack/boot/ia64/skiload/version#1 branch .. //depot/projects/sack/boot/ofw/Makefile#1 branch .. //depot/projects/sack/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/sack/boot/ofw/common/main.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/sack/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/sack/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/sack/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/sack/boot/pc98/Makefile#1 branch .. //depot/projects/sack/boot/pc98/Makefile.inc#1 branch .. //depot/projects/sack/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/sack/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/sack/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/sack/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/sack/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/sack/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/sack/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/sack/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/sack/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/sack/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/sack/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/sack/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/sack/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/sack/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/sack/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/sack/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/sack/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/sack/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/sack/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/sack/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/sack/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/sack/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/sack/boot/pc98/boot2/io.c#1 branch .. //depot/projects/sack/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/sack/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/sack/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/sack/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/sack/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/sack/boot/pc98/boot2/start.S#1 branch .. //depot/projects/sack/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/sack/boot/pc98/boot2/table.c#1 branch .. //depot/projects/sack/boot/pc98/btx/Makefile#1 branch .. //depot/projects/sack/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/sack/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/sack/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/sack/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/sack/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/sack/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/sack/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/sack/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/sack/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/sack/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/sack/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/sack/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/sack/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/sack/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/sack/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/sack/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/sack/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/sack/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/sack/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/sack/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/sack/boot/pc98/loader/Makefile#1 branch .. //depot/projects/sack/boot/pc98/loader/conf.c#1 branch .. //depot/projects/sack/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/sack/boot/pc98/loader/main.c#1 branch .. //depot/projects/sack/boot/powerpc/Makefile#1 branch .. //depot/projects/sack/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/sack/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/sack/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/sack/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/sack/boot/powerpc/loader/start.c#1 branch .. //depot/projects/sack/boot/powerpc/loader/version#1 branch .. //depot/projects/sack/boot/sparc64/Makefile#1 branch .. //depot/projects/sack/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/sack/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/sack/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/sack/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/sack/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/sack/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/sack/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/sack/boot/sparc64/loader/main.c#1 branch .. //depot/projects/sack/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/sack/boot/sparc64/loader/version#1 branch .. //depot/projects/sack/cam/cam.c#1 branch .. //depot/projects/sack/cam/cam.h#1 branch .. //depot/projects/sack/cam/cam_ccb.h#1 branch .. //depot/projects/sack/cam/cam_debug.h#1 branch .. //depot/projects/sack/cam/cam_periph.c#1 branch .. //depot/projects/sack/cam/cam_periph.h#1 branch .. //depot/projects/sack/cam/cam_queue.c#1 branch .. //depot/projects/sack/cam/cam_queue.h#1 branch .. //depot/projects/sack/cam/cam_sim.c#1 branch .. //depot/projects/sack/cam/cam_sim.h#1 branch .. //depot/projects/sack/cam/cam_xpt.c#1 branch .. //depot/projects/sack/cam/cam_xpt.h#1 branch .. //depot/projects/sack/cam/cam_xpt_periph.h#1 branch .. //depot/projects/sack/cam/cam_xpt_sim.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_all.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_all.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_da.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_da.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_low.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_low.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_message.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/sack/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_target.c#1 branch .. //depot/projects/sack/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/sack/coda/00READ#1 branch .. //depot/projects/sack/coda/README#1 branch .. //depot/projects/sack/coda/TODO#1 branch .. //depot/projects/sack/coda/cnode.h#1 branch .. //depot/projects/sack/coda/coda.h#1 branch .. //depot/projects/sack/coda/coda_fbsd.c#1 branch .. //depot/projects/sack/coda/coda_io.h#1 branch .. //depot/projects/sack/coda/coda_kernel.h#1 branch .. //depot/projects/sack/coda/coda_namecache.c#1 branch .. //depot/projects/sack/coda/coda_namecache.h#1 branch .. //depot/projects/sack/coda/coda_opstats.h#1 branch .. //depot/projects/sack/coda/coda_pioctl.h#1 branch .. //depot/projects/sack/coda/coda_psdev.c#1 branch .. //depot/projects/sack/coda/coda_psdev.h#1 branch .. //depot/projects/sack/coda/coda_subr.c#1 branch .. //depot/projects/sack/coda/coda_subr.h#1 branch .. //depot/projects/sack/coda/coda_venus.c#1 branch .. //depot/projects/sack/coda/coda_venus.h#1 branch .. //depot/projects/sack/coda/coda_vfsops.c#1 branch .. //depot/projects/sack/coda/coda_vfsops.h#1 branch .. //depot/projects/sack/coda/coda_vnops.c#1 branch .. //depot/projects/sack/coda/coda_vnops.h#1 branch .. //depot/projects/sack/compat/freebsd32/Makefile#1 branch .. //depot/projects/sack/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/sack/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/sack/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/sack/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/sack/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/sack/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/sack/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/sack/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/sack/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/sack/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/sack/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/sack/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/sack/compat/ia32/ia32_util.h#1 branch .. //depot/projects/sack/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/sack/compat/linux/linux_file.c#1 branch .. //depot/projects/sack/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/sack/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/sack/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/sack/compat/linux/linux_ipc.c#1 branch .. //depot/projects/sack/compat/linux/linux_ipc.h#1 branch .. //depot/projects/sack/compat/linux/linux_mib.c#1 branch .. //depot/projects/sack/compat/linux/linux_mib.h#1 branch .. //depot/projects/sack/compat/linux/linux_misc.c#1 branch .. //depot/projects/sack/compat/linux/linux_signal.c#1 branch .. //depot/projects/sack/compat/linux/linux_signal.h#1 branch .. //depot/projects/sack/compat/linux/linux_socket.c#1 branch .. //depot/projects/sack/compat/linux/linux_socket.h#1 branch .. //depot/projects/sack/compat/linux/linux_stats.c#1 branch .. //depot/projects/sack/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/sack/compat/linux/linux_uid16.c#1 branch .. //depot/projects/sack/compat/linux/linux_util.c#1 branch .. //depot/projects/sack/compat/linux/linux_util.h#1 branch .. //depot/projects/sack/compat/ndis/cfg_var.h#1 branch .. //depot/projects/sack/compat/ndis/hal_var.h#1 branch .. //depot/projects/sack/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/sack/compat/ndis/ndis_var.h#1 branch .. //depot/projects/sack/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/sack/compat/ndis/pe_var.h#1 branch .. //depot/projects/sack/compat/ndis/resource_var.h#1 branch .. //depot/projects/sack/compat/ndis/subr_hal.c#1 branch .. //depot/projects/sack/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/sack/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/sack/compat/ndis/subr_pe.c#1 branch .. //depot/projects/sack/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/sack/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/sack/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/sack/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/sack/compat/svr4/Makefile#1 branch .. //depot/projects/sack/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/sack/compat/svr4/svr4.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/sack/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/sack/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/sack/compat/svr4/svr4_ioctl.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 7 23:58:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B878B16A4D1; Mon, 7 Jun 2004 23:58:23 +0000 (GMT) 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 789F616A4CE for ; Mon, 7 Jun 2004 23:58:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7038A43D2D for ; Mon, 7 Jun 2004 23:58:23 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57NwCcD065765 for ; Mon, 7 Jun 2004 23:58:12 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57NwCsK065762 for perforce@freebsd.org; Mon, 7 Jun 2004 23:58:12 GMT (envelope-from ps@freebsd.org) Date: Mon, 7 Jun 2004 23:58:12 GMT Message-Id: <200406072358.i57NwCsK065762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Subject: PERFORCE change 54368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 23:58:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=54368 Change 54368 by ps@butter.corp on 2004/06/07 23:58:02 Commit the SACK work done at Yahoo! on RELENG_4 and ported to -current. The scoreboarding code was obtained from OpenBSD, and many of the remaining changes were inspired by OpenBSD, but not taken directly from there. Affected files ... .. //depot/projects/sack/conf/files#2 edit .. //depot/projects/sack/conf/options#2 edit .. //depot/projects/sack/netinet/tcp.h#2 edit .. //depot/projects/sack/netinet/tcp_input.c#2 edit .. //depot/projects/sack/netinet/tcp_output.c#2 edit .. //depot/projects/sack/netinet/tcp_sack.c#1 add .. //depot/projects/sack/netinet/tcp_seq.h#2 edit .. //depot/projects/sack/netinet/tcp_subr.c#2 edit .. //depot/projects/sack/netinet/tcp_syncache.c#2 edit .. //depot/projects/sack/netinet/tcp_timer.c#2 edit .. //depot/projects/sack/netinet/tcp_var.h#2 edit Differences ... ==== //depot/projects/sack/conf/files#2 (text+ko) ==== @@ -1450,6 +1450,7 @@ netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet netinet/tcp_output.c optional inet +netinet/tcp_sack.c optional inet netinet/tcp_subr.c optional inet netinet/tcp_syncache.c optional inet netinet/tcp_timer.c optional inet ==== //depot/projects/sack/conf/options#2 (text+ko) ==== @@ -346,6 +346,7 @@ SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h +TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h XBONEHACK ==== //depot/projects/sack/netinet/tcp.h#2 (text+ko) ==== @@ -85,14 +85,17 @@ #define TCPOPT_SACK_PERMITTED 4 /* Experimental */ #define TCPOLEN_SACK_PERMITTED 2 #define TCPOPT_SACK 5 /* Experimental */ +#define TCPOLEN_SACK 8 /* 2*sizeof(tcp_seq) */ #define TCPOPT_TIMESTAMP 8 #define TCPOLEN_TIMESTAMP 10 #define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ #define TCPOPT_TSTAMP_HDR \ (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) +#define MAX_TCPOPTLEN 40 /* Absolute maximum TCP options len */ + #define TCPOPT_CC 11 /* CC options: RFC-1644 */ -#define TCPOPT_CCNEW 12 +#define TCPOPT_CCNEW 12 #define TCPOPT_CCECHO 13 #define TCPOLEN_CC 6 #define TCPOLEN_CC_APPA (TCPOLEN_CC+2) @@ -101,6 +104,15 @@ #define TCPOPT_SIGNATURE 19 /* Keyed MD5: RFC 2385 */ #define TCPOLEN_SIGNATURE 18 +/* Option definitions */ +#define TCPOPT_SACK_PERMIT_HDR \ +(TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_SACK_PERMITTED<<8|TCPOLEN_SACK_PERMITTED) +#define TCPOPT_SACK_HDR (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_SACK<<8) +/* Miscellaneous constants */ +#define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at sender side */ +#define TCP_MAX_SACK 3 /* MAX # SACKs sent in any segment */ + + /* * Default maximum segment size for TCP. * With an IP MTU of 576, this is 536, ==== //depot/projects/sack/netinet/tcp_input.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include "opt_mac.h" #include "opt_tcpdebug.h" #include "opt_tcp_input.h" +#include "opt_tcp_sack.h" #include #include @@ -159,7 +160,9 @@ struct inpcbinfo tcbinfo; struct mtx *tcbinfo_mtx; -static void tcp_dooptions(struct tcpopt *, u_char *, int, int); +static void tcp_dooptions(struct tcpcb *, struct tcpopt *, u_char *, + int, int, struct tcphdr *); + static void tcp_pulloutofband(struct socket *, struct tcphdr *, struct mbuf *, int); static int tcp_reass(struct tcpcb *, struct tcphdr *, int *, @@ -721,7 +724,7 @@ * present in a SYN segment. See tcp_timewait(). */ if (thflags & TH_SYN) - tcp_dooptions(&to, optp, optlen, 1); + tcp_dooptions((struct tcpcb *)NULL, &to, optp, optlen, 1, th); if (tcp_timewait((struct tcptw *)inp->inp_ppcb, &to, th, m, tlen)) goto findpcb; @@ -934,7 +937,7 @@ tcp_trace(TA_INPUT, ostate, tp, (void *)tcp_saveipgen, &tcp_savetcp, 0); #endif - tcp_dooptions(&to, optp, optlen, 1); + tcp_dooptions(tp, &to, optp, optlen, 1, th); if (!syncache_add(&inc, &to, th, &so, m)) goto drop; if (so == NULL) { @@ -1050,7 +1053,7 @@ * for incoming connections is handled in tcp_syncache. * XXX this is traditional behavior, may need to be cleaned up. */ - tcp_dooptions(&to, optp, optlen, thflags & TH_SYN); + tcp_dooptions(tp,&to, optp, optlen, thflags & TH_SYN,th); if (thflags & TH_SYN) { if (to.to_flags & TOF_SCALE) { tp->t_flags |= TF_RCVD_SCALE; @@ -1065,8 +1068,22 @@ tp->t_flags |= TF_RCVD_CC; if (to.to_flags & TOF_MSS) tcp_mss(tp, to.to_mss); + if (tp->sack_enable) { + if (!(to.to_flags & TOF_SACK)) + tp->sack_enable = 0; + else + tp->t_flags |= TF_SACK_PERMIT; + } + } + if (tp->sack_enable) { + /* Delete stale (cumulatively acked) SACK holes */ + tcp_del_sackholes(tp, th); + tp->rcv_laststart = th->th_seq; /* last rec'vd segment*/ + tp->rcv_lastend = th->th_seq + tlen; + } + /* * Header prediction: check for the two common cases * of a uni-directional data xfer. If the packet has @@ -1116,9 +1133,10 @@ if (SEQ_GT(th->th_ack, tp->snd_una) && SEQ_LEQ(th->th_ack, tp->snd_max) && tp->snd_cwnd >= tp->snd_wnd && - ((!tcp_do_newreno && + ((!tcp_do_newreno && !tp->sack_enable && tp->t_dupacks < tcprexmtthresh) || - (tcp_do_newreno && !IN_FASTRECOVERY(tp)))) { + ((tcp_do_newreno || tp->sack_enable) && + !IN_FASTRECOVERY(tp)))) { KASSERT(headlocked, ("headlocked")); INP_INFO_WUNLOCK(&tcbinfo); /* @@ -1214,6 +1232,9 @@ * with nothing on the reassembly queue and * we have enough buffer space to take it. */ + /* Clean receiver SACK report if present */ + if (tp->sack_enable && tp->rcv_numsacks) + tcp_clean_sackreport(tp); ++tcpstat.tcps_preddat; tp->rcv_nxt += tlen; /* @@ -1892,7 +1913,7 @@ th->th_ack != tp->snd_una) tp->t_dupacks = 0; else if (++tp->t_dupacks > tcprexmtthresh || - (tcp_do_newreno && + ((tcp_do_newreno || tp->sack_enable) && IN_FASTRECOVERY(tp))) { tp->snd_cwnd += tp->t_maxseg; (void) tcp_output(tp); @@ -1900,7 +1921,8 @@ } else if (tp->t_dupacks == tcprexmtthresh) { tcp_seq onxt = tp->snd_nxt; u_int win; - if (tcp_do_newreno && + if ((tcp_do_newreno || + tp->sack_enable) && SEQ_LEQ(th->th_ack, tp->snd_recover)) { tp->t_dupacks = 0; @@ -1915,6 +1937,17 @@ tp->snd_recover = tp->snd_max; callout_stop(tp->tt_rexmt); tp->t_rtttime = 0; + if (tp->sack_enable) { + tcpstat.tcps_sack_recovery_episode++; + tp->snd_cwnd = + tp->t_maxseg * + tp->t_dupacks; + (void) tcp_output(tp); + tp->snd_cwnd = + tp->snd_ssthresh; + goto drop; + } + tp->snd_nxt = th->th_ack; tp->snd_cwnd = tp->t_maxseg; (void) tcp_output(tp); @@ -1965,12 +1998,16 @@ * If the congestion window was inflated to account * for the other side's cached packets, retract it. */ - if (tcp_do_newreno) { + if (tcp_do_newreno || tp->sack_enable) { if (IN_FASTRECOVERY(tp)) { if (SEQ_LT(th->th_ack, tp->snd_recover)) { - tcp_newreno_partial_ack(tp, th); + if (tp->sack_enable) + tcp_sack_partialack(tp, th); + else + tcp_newreno_partial_ack(tp, th); } else { /* + * Out of fast recovery. * Window inflation should have left us * with approximately snd_ssthresh * outstanding data. @@ -2092,7 +2129,8 @@ * Otherwise open linearly: maxseg per window * (maxseg^2 / cwnd per packet). */ - if (!tcp_do_newreno || !IN_FASTRECOVERY(tp)) { + if ((!tcp_do_newreno && !tp->sack_enable) || + !IN_FASTRECOVERY(tp)) { register u_int cw = tp->snd_cwnd; register u_int incr = tp->t_maxseg; if (cw > tp->snd_ssthresh) @@ -2110,14 +2148,20 @@ } sowwakeup(so); /* detect una wraparound */ - if (tcp_do_newreno && !IN_FASTRECOVERY(tp) && + if ((tcp_do_newreno || tp->sack_enable) && + !IN_FASTRECOVERY(tp) && SEQ_GT(tp->snd_una, tp->snd_recover) && SEQ_LEQ(th->th_ack, tp->snd_recover)) tp->snd_recover = th->th_ack - 1; - if (tcp_do_newreno && IN_FASTRECOVERY(tp) && + if ((tcp_do_newreno || tp->sack_enable) && + IN_FASTRECOVERY(tp) && SEQ_GEQ(th->th_ack, tp->snd_recover)) EXIT_FASTRECOVERY(tp); tp->snd_una = th->th_ack; + if (tp->sack_enable) { + if (SEQ_GT(tp->snd_una, tp->snd_recover)) + tp->snd_recover = tp->snd_una; + } if (SEQ_LT(tp->snd_nxt, tp->snd_una)) tp->snd_nxt = tp->snd_una; @@ -2318,7 +2362,8 @@ thflags = tcp_reass(tp, th, &tlen, m); tp->t_flags |= TF_ACKNOW; } - + if (tp->sack_enable) + tcp_update_sack_list(tp); /* * Note the amount of data that peer has sent into * our window, in order to estimate the sender's @@ -2521,11 +2566,13 @@ * Parse TCP options and place in tcpopt. */ static void -tcp_dooptions(to, cp, cnt, is_syn) +tcp_dooptions(tp, to, cp, cnt, is_syn, th) + struct tcpcb *tp; struct tcpopt *to; - u_char *cp; + u_char *cp; int cnt; int is_syn; + struct tcphdr *th; { int opt, optlen; @@ -2614,6 +2661,20 @@ to->to_flags |= (TOF_SIGNATURE | TOF_SIGLEN); break; #endif + case TCPOPT_SACK_PERMITTED: + if (!tcp_do_sack || + optlen != TCPOLEN_SACK_PERMITTED) + continue; + if (is_syn) { + /* MUST only be set on SYN */ + to->to_flags |= TOF_SACK; + } + break; + + case TCPOPT_SACK: + if (!tp || tcp_sack_option(tp, th, cp, optlen)) + continue; + break; default: continue; } ==== //depot/projects/sack/netinet/tcp_output.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ #include "opt_ipsec.h" #include "opt_mac.h" #include "opt_tcpdebug.h" +#include "opt_tcp_sack.h" #include #include @@ -122,6 +123,8 @@ u_char opt[TCP_MAXOLEN]; unsigned ipoptlen, optlen, hdrlen; int idle, sendalot; + int i, sack_rxmit; + struct sackhole *p; #if 0 int maxburst = TCP_MAXBURST; #endif @@ -171,6 +174,13 @@ } } again: + /* + * If we've recently taken a timeout, snd_max will be greater than + * snd_nxt. There may be SACK information that allows us to avoid + * resending already delivered data. Adjust snd_nxt accordingly. + */ + if (tp->sack_enable && SEQ_LT(tp->snd_nxt, tp->snd_max)) + tcp_sack_adjust(tp); sendalot = 0; off = tp->snd_nxt - tp->snd_una; sendwin = min(tp->snd_wnd, tp->snd_cwnd); @@ -178,6 +188,36 @@ flags = tcp_outflags[tp->t_state]; /* + * Send any SACK-generated retransmissions. If we're explicitly trying + * to send out new data (when sendalot is 1), bypass this function. + * If we retransmit in fast recovery mode, decrement snd_cwnd, since + * we're replacing a (future) new transmission with a retransmission + * now, and we previously incremented snd_cwnd in tcp_input(). + */ + /* + * Still in sack recovery , reset rxmit flag to zero. + */ + sack_rxmit = 0; + len = 0; + p = NULL; + if (tp->sack_enable && IN_FASTRECOVERY(tp) && + (p = tcp_sack_output(tp))) { + sack_rxmit = 1; + sendalot = 1; + off = p->rxmit - tp->snd_una; + KASSERT(tp->snd_cwnd >= 0,("%s: CWIN is negative: %ld", __func__, tp->snd_cwnd)); + /* Do not retransmit SACK segments beyond snd_recover */ + if (SEQ_GT(p->end, tp->snd_recover)) + len = min(tp->snd_cwnd, tp->snd_recover - p->rxmit); + else + len = min(tp->snd_cwnd, p->end - p->rxmit); + if (len > 0) { + tcpstat.tcps_sack_rexmits++; + tcpstat.tcps_sack_rexmit_bytes += + min(len, tp->t_maxseg); + } + } + /* * Get standard flags, and add SYN or FIN if requested by 'hidden' * state flags. */ @@ -230,9 +270,12 @@ * In the normal retransmit-FIN-only case, however, snd_nxt will * be set to snd_una, the offset will be 0, and the length may * wind up 0. + * + * If sack_rxmit is true we are retransmitting from the scoreboard + * in which case len is already set. */ - len = (long)ulmin(so->so_snd.sb_cc, sendwin) - off; - + if (!sack_rxmit) + len = ((long)ulmin(so->so_snd.sb_cc, sendwin) - off); /* * Lop off SYN bit if it has already been sent. However, if this @@ -331,6 +374,8 @@ goto send; if (SEQ_LT(tp->snd_nxt, tp->snd_max)) /* retransmit case */ goto send; + if (sack_rxmit) + goto send; } /* @@ -374,7 +419,18 @@ if (flags & TH_FIN && ((tp->t_flags & TF_SENTFIN) == 0 || tp->snd_nxt == tp->snd_una)) goto send; - + /* + * In SACK, it is possible for tcp_output to fail to send a segment + * after the retransmission timer has been turned off. Make sure + * that the retransmission timer is set. + */ + if (tp->sack_enable && SEQ_GT(tp->snd_max, tp->snd_una) && + !callout_active(tp->tt_rexmt) && + !callout_active(tp->tt_persist)) { + callout_reset(tp->tt_rexmt, tp->t_rxtcur, + tcp_timer_rexmt, tp); + return (0); + } /* * TCP window updates are not reliable, rather a polling protocol * using ``persist'' packets is used to insure receipt of window @@ -435,6 +491,19 @@ (void)memcpy(opt + 2, &mss, sizeof(mss)); optlen = TCPOLEN_MAXSEG; + /* + * If this is the first SYN of connection (not a SYN + * ACK), include SACK_PERMIT_HDR option. If this is a + * SYN ACK, include SACK_PERMIT_HDR option if peer has + * already done so. This is only for active connect, + * since the syncache takes care of the passive connect. + */ + if (tp->sack_enable && ((flags & TH_ACK) == 0 || + (tp->t_flags & TF_SACK_PERMIT))) { + *((u_int32_t *) (opt + optlen)) = + htonl(TCPOPT_SACK_PERMIT_HDR); + optlen += 4; + } if ((tp->t_flags & TF_REQ_SCALE) && ((flags & TH_ACK) == 0 || (tp->t_flags & TF_RCVD_SCALE))) { @@ -466,6 +535,32 @@ optlen += TCPOLEN_TSTAMP_APPA; } + /* + * Send SACKs if necessary. This should be the last option processed. + * Only as many SACKs are sent as are permitted by the maximum options + * size. No more than three SACKs are sent. + */ + if (tp->sack_enable && tp->t_state == TCPS_ESTABLISHED && + (tp->t_flags & (TF_SACK_PERMIT|TF_NOOPT)) == TF_SACK_PERMIT && + tp->rcv_numsacks) { + u_int32_t *lp = (u_int32_t *)(opt + optlen); + u_int32_t *olp = lp++; + int count = 0; /* actual number of SACKs inserted */ + int maxsack = (MAX_TCPOPTLEN - (optlen + 4))/TCPOLEN_SACK; + + tcpstat.tcps_sack_send_blocks++; + maxsack = min(maxsack, TCP_MAX_SACK); + for (i = 0; (i < tp->rcv_numsacks && count < maxsack); i++) { + struct sackblk sack = tp->sackblks[i]; + if (sack.start == 0 && sack.end == 0) + continue; + *lp++ = htonl(sack.start); + *lp++ = htonl(sack.end); + count++; + } + *olp = htonl(TCPOPT_SACK_HDR|(TCPOLEN_SACK*count+2)); + optlen += TCPOLEN_SACK*count + 4; /* including leading NOPs */ + } /* * Send `CC-family' options if our side wants to use them (TF_REQ_CC), * options are allowed (!TF_NOOPT) and it's not a RST. @@ -734,6 +829,10 @@ th->th_seq = htonl(tp->snd_nxt); else th->th_seq = htonl(tp->snd_max); + if (sack_rxmit) { + th->th_seq = htonl(p->rxmit); + p->rxmit += len; + } th->th_ack = htonl(tp->rcv_nxt); if (optlen) { bcopy(opt, th + 1, optlen); @@ -831,6 +930,8 @@ tp->t_flags |= TF_SENTFIN; } } + if (tp->sack_enable && sack_rxmit && (p->rxmit != tp->snd_nxt)) + goto timer; tp->snd_nxt += len; if (SEQ_GT(tp->snd_nxt, tp->snd_max)) { tp->snd_max = tp->snd_nxt; @@ -853,6 +954,17 @@ * Initialize shift counter which is used for backoff * of retransmit time. */ +timer: + if (tp->sack_enable && sack_rxmit && + !callout_active(tp->tt_rexmt) && + tp->snd_nxt != tp->snd_max) { + callout_reset(tp->tt_rexmt, tp->t_rxtcur, + tcp_timer_rexmt, tp); + if (callout_active(tp->tt_persist)) { + callout_stop(tp->tt_persist); + tp->t_rxtshift = 0; + } + } if (!callout_active(tp->tt_rexmt) && tp->snd_nxt != tp->snd_una) { if (callout_active(tp->tt_persist)) { ==== //depot/projects/sack/netinet/tcp_seq.h#2 (text+ko) ==== @@ -42,6 +42,9 @@ #define SEQ_GT(a,b) ((int)((a)-(b)) > 0) #define SEQ_GEQ(a,b) ((int)((a)-(b)) >= 0) +#define SEQ_MIN(a, b) ((SEQ_LT(a, b)) ? (a) : (b)) +#define SEQ_MAX(a, b) ((SEQ_GT(a, b)) ? (a) : (b)) + /* for modulo comparisons of timestamps */ #define TSTMP_LT(a,b) ((int)((a)-(b)) < 0) #define TSTMP_GEQ(a,b) ((int)((a)-(b)) >= 0) ==== //depot/projects/sack/netinet/tcp_subr.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ #include "opt_ipsec.h" #include "opt_mac.h" #include "opt_tcpdebug.h" +#include "opt_tcp_sack.h" #include #include @@ -201,6 +202,17 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, inflight_stab, CTLFLAG_RW, &tcp_inflight_stab, 0, "Inflight Algorithm Stabilization 20 = 2 packets"); + +int tcp_do_sack = 1; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_sack, CTLFLAG_RW, + &tcp_do_sack, 0, "Enable/Disable TCP SACK support"); + +int tcp_sackhole_limit = 10 * 1024; /* Arbitrarily set */ +SYSCTL_INT(_net_inet_tcp, OID_AUTO, sackhole_limit, CTLFLAG_RW, + &tcp_sackhole_limit, 0, "Limit on the total SACK scoreboard elements"); + +uma_zone_t sack_hole_zone; + static struct inpcb *tcp_notify(struct inpcb *, int); static void tcp_discardcb(struct tcpcb *); static void tcp_isn_tick(void *); @@ -292,6 +304,8 @@ tcp_isn_tick(NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, tcp_fini, NULL, SHUTDOWN_PRI_DEFAULT); + sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); } void @@ -599,6 +613,7 @@ tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP); if (tcp_do_rfc1644) tp->t_flags |= TF_REQ_CC; + tp->sack_enable = tcp_do_sack; tp->t_inpcb = inp; /* XXX */ /* * Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no @@ -732,6 +747,7 @@ tp->t_segqlen--; tcp_reass_qsize--; } + tcp_free_sackholes(tp); inp->inp_ppcb = NULL; tp->t_inpcb = NULL; uma_zfree(tcpcb_zone, tp); @@ -752,7 +768,6 @@ #ifdef INET6 struct socket *so = inp->inp_socket; #endif - tcp_discardcb(tp); #ifdef INET6 if (INP_CHECK_SOCKAF(so, AF_INET6)) ==== //depot/projects/sack/netinet/tcp_syncache.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_ipsec.h" #include "opt_mac.h" #include "opt_tcpdebug.h" +#include "opt_tcp_sack.h" #include #include @@ -702,7 +703,10 @@ if (sc->sc_flags & SCF_SIGNATURE) tp->t_flags |= TF_SIGNATURE; #endif - + if (sc->sc_flags & SCF_SACK) { + tp->sack_enable = 1; + tp->t_flags |= TF_SACK_PERMIT; + } /* * Set up MSS and get cached values from tcp_hostcache. * This might overwrite some of the defaults we just set. @@ -989,6 +993,9 @@ sc->sc_flags = SCF_SIGNATURE; #endif + if (to->to_flags & TOF_SACK) + sc->sc_flags |= SCF_SACK; + /* * XXX * We have the option here of not doing TAO (even if the segment @@ -1105,6 +1112,7 @@ optlen += (sc->sc_flags & SCF_SIGNATURE) ? TCPOLEN_SIGNATURE + 2 : 0; #endif + optlen += ((sc->sc_flags & SCF_SACK) ? 4 : 0); } tlen = hlen + sizeof(struct tcphdr) + optlen; @@ -1242,6 +1250,11 @@ optp += TCPOLEN_SIGNATURE + 2; } #endif /* TCP_SIGNATURE */ + + if (sc->sc_flags & SCF_SACK) { + *(u_int32_t *)optp = htonl(TCPOPT_SACK_PERMIT_HDR); + optp += 4; + } } #ifdef INET6 ==== //depot/projects/sack/netinet/tcp_timer.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include "opt_inet6.h" #include "opt_tcpdebug.h" +#include "opt_tcp_sack.h" #include #include @@ -217,6 +218,7 @@ return; } INP_LOCK(inp); + tcp_free_sackholes(tp); if (callout_pending(tp->tt_2msl) || !callout_active(tp->tt_2msl)) { INP_UNLOCK(tp->t_inpcb); INP_INFO_WUNLOCK(&tcbinfo); @@ -497,6 +499,7 @@ return; } callout_deactivate(tp->tt_rexmt); + tcp_free_sackholes(tp); /* * Retransmission timer went off. Message has not * been acked within retransmit interval. Back off ==== //depot/projects/sack/netinet/tcp_var.h#2 (text+ko) ==== @@ -52,6 +52,17 @@ extern int tcp_reass_qsize; extern struct uma_zone *tcp_reass_zone; +struct sackblk { + tcp_seq start; /* start seq no. of sack block */ + tcp_seq end; /* end seq no. */ +}; + +struct sackhole { + tcp_seq start; /* start seq no. of hole */ + tcp_seq end; /* end seq no. */ + tcp_seq rxmit; /* next seq. no in hole to be retransmitted */ + struct sackhole *next; /* next in list */ +}; struct tcptemp { u_char tt_ipgen[40]; /* the size must be of max ip header, now IPv6 */ struct tcphdr tt_t; @@ -179,6 +190,16 @@ u_long rcv_second; /* start of interval second */ u_long rcv_pps; /* received packets per second */ u_long rcv_byps; /* received bytes per second */ + /* SACK related state */ + int sack_enable; /* enable SACK for this connection */ + int snd_numholes; /* number of holes seen by sender */ + struct sackhole *snd_holes; /* linked list of holes (sorted) */ + + tcp_seq rcv_laststart; /* start of last segment recd. */ + tcp_seq rcv_lastend; /* end of ... */ + tcp_seq rcv_lastsack; /* last seq number(+1) sack'd by rcv'r*/ + int rcv_numsacks; /* # distinct sack blks present */ + struct sackblk sackblks[MAX_SACK_BLKS]; /* seq nos. of sack blocks */ }; #define IN_FASTRECOVERY(tp) (tp->t_flags & TF_FASTRECOVERY) @@ -216,6 +237,7 @@ #define TOF_SCALE 0x0020 #define TOF_SIGNATURE 0x0040 /* signature option present */ #define TOF_SIGLEN 0x0080 /* signature length valid (RFC2385) */ +#define TOF_SACK 0x0100 /* Peer sent SACK option */ u_int32_t to_tsval; u_int32_t to_tsecr; tcp_cc to_cc; /* holds CC or CCnew */ @@ -249,6 +271,7 @@ #define SCF_CC 0x08 /* negotiated CC */ #define SCF_UNREACH 0x10 /* icmp unreachable received */ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ +#define SCF_SACK 0x80 /* send SACK option */ TAILQ_ENTRY(syncache) sc_hash; TAILQ_ENTRY(syncache) sc_timerq; }; @@ -434,6 +457,13 @@ u_long tcps_hc_added; /* entry added to hostcache */ u_long tcps_hc_bucketoverflow; /* hostcache per bucket limit hit */ + + /* SACK related stats */ + u_long tcps_sack_recovery_episode; /* SACK recovery episodes */ + u_long tcps_sack_rexmits; /* SACK rexmit segments */ + u_long tcps_sack_rexmit_bytes; /* SACK rexmit bytes */ + u_long tcps_sack_rcv_blocks; /* SACK blocks (options) received */ + u_long tcps_sack_send_blocks; /* SACK blocks (options) sent */ }; /* @@ -467,7 +497,8 @@ #define TCPCTL_PCBLIST 11 /* list of all outstanding PCBs */ #define TCPCTL_DELACKTIME 12 /* time before sending delayed ACK */ #define TCPCTL_V6MSSDFLT 13 /* MSS default for IPv6 */ -#define TCPCTL_MAXID 14 +#define TCPCTL_SACK 14 /* Selective Acknowledgement,rfc 2018 */ +#define TCPCTL_MAXID 15 #define TCPCTL_NAMES { \ { 0, 0 }, \ @@ -505,6 +536,8 @@ extern int ss_fltsz; extern int ss_fltsz_local; +extern int tcp_do_sack; /* SACK enabled/disabled */ + void tcp_canceltimers(struct tcpcb *); struct tcpcb * tcp_close(struct tcpcb *); @@ -578,6 +611,23 @@ extern u_long tcp_recvspace; tcp_seq tcp_new_isn(struct tcpcb *); +int tcp_sack_option(struct tcpcb *,struct tcphdr *,u_char *,int); +void tcp_update_sack_list(struct tcpcb *tp); +void tcp_del_sackholes(struct tcpcb *, struct tcphdr *); +void tcp_clean_sackreport(struct tcpcb *tp); +void tcp_sack_adjust(struct tcpcb *tp); +struct sackhole *tcp_sack_output(struct tcpcb *tp); +void tcp_sack_partialack(struct tcpcb *, struct tcphdr *); +void tcp_free_sackholes(struct tcpcb *tp); +#ifdef DEBUG +void tcp_print_holes(struct tcpcb *tp); +#endif +int tcp_newreno(struct tcpcb *, struct tcphdr *); +u_long tcp_seq_subtract(u_long, u_long ); +#ifdef TCP_SACK_DEBUG +void tcp_print_holes(struct tcpcb *tp); +#endif /* TCP_SACK_DEBUG */ + #endif /* _KERNEL */ #endif /* _NETINET_TCP_VAR_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jun 7 23:59:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B12616A4D1; Mon, 7 Jun 2004 23:59:17 +0000 (GMT) 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 64B1916A4CE for ; Mon, 7 Jun 2004 23:59:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C01143D39 for ; Mon, 7 Jun 2004 23:59:17 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i57NxGLG065834 for ; Mon, 7 Jun 2004 23:59:16 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i57NxEZo065831 for perforce@freebsd.org; Mon, 7 Jun 2004 23:59:14 GMT (envelope-from peter@freebsd.org) Date: Mon, 7 Jun 2004 23:59:14 GMT Message-Id: <200406072359.i57NxEZo065831@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 23:59:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=54369 Change 54369 by peter@peter_hammer on 2004/06/07 23:58:36 IFC @54367 Affected files ... .. //depot/projects/hammer/UPDATING#39 integrate .. //depot/projects/hammer/bin/cp/utils.c#7 integrate .. //depot/projects/hammer/bin/df/df.c#17 integrate .. //depot/projects/hammer/bin/test/test.1#3 integrate .. //depot/projects/hammer/etc/bluetooth/hcsecd.conf#2 integrate .. //depot/projects/hammer/etc/csh.login#2 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#14 integrate .. //depot/projects/hammer/etc/devd.conf#10 integrate .. //depot/projects/hammer/etc/devfs.conf#2 integrate .. //depot/projects/hammer/etc/disktab#2 integrate .. //depot/projects/hammer/etc/gettytab#3 integrate .. //depot/projects/hammer/etc/hosts.allow#2 integrate .. //depot/projects/hammer/etc/inetd.conf#7 integrate .. //depot/projects/hammer/etc/isdn/isdnd.rates.D#2 integrate .. //depot/projects/hammer/etc/isdn/isdnd.rates.F#2 integrate .. //depot/projects/hammer/etc/isdn/isdnd.rates.L#2 integrate .. //depot/projects/hammer/etc/isdn/isdnd.rc.sample#2 integrate .. //depot/projects/hammer/etc/isdn/unknown_incoming#2 integrate .. //depot/projects/hammer/etc/login.access#2 integrate .. //depot/projects/hammer/etc/login.conf#2 integrate .. //depot/projects/hammer/etc/mail/Makefile#4 integrate .. //depot/projects/hammer/etc/namedb/named.conf#3 integrate .. //depot/projects/hammer/etc/namedb/named.root#4 integrate .. //depot/projects/hammer/etc/network.subr#5 integrate .. //depot/projects/hammer/etc/pam.d/README#3 integrate .. //depot/projects/hammer/etc/pam.d/convert.pl#2 integrate .. //depot/projects/hammer/etc/pccard_ether#10 integrate .. //depot/projects/hammer/etc/pf.os#2 integrate .. //depot/projects/hammer/etc/printcap#3 integrate .. //depot/projects/hammer/etc/profile#2 integrate .. //depot/projects/hammer/etc/rc#13 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#12 integrate .. //depot/projects/hammer/etc/rc.d/preseedrandom#2 integrate .. //depot/projects/hammer/etc/rc.shutdown#4 integrate .. //depot/projects/hammer/etc/rc.subr#15 integrate .. //depot/projects/hammer/etc/remote#5 integrate .. //depot/projects/hammer/etc/rpc#2 integrate .. //depot/projects/hammer/etc/termcap.small#2 integrate .. //depot/projects/hammer/gnu/usr.bin/tar/Makefile#5 integrate .. //depot/projects/hammer/include/wchar.h#14 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/signal.3#6 integrate .. //depot/projects/hammer/lib/libc/sys/sigaction.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/wait.2#3 integrate .. //depot/projects/hammer/lib/libdisk/write_alpha_disk.c#6 integrate .. //depot/projects/hammer/lib/libdisk/write_amd64_disk.c#4 integrate .. //depot/projects/hammer/lib/libdisk/write_i386_disk.c#7 integrate .. //depot/projects/hammer/lib/libdisk/write_pc98_disk.c#7 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/context.S#5 integrate .. //depot/projects/hammer/lib/msun/Makefile#9 integrate .. //depot/projects/hammer/lib/msun/alpha/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/alpha/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/amd64/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/amd64/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/arm/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/arm/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/i387/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/i387/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/ia64/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/ia64/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/man/feclearexcept.3#1 branch .. //depot/projects/hammer/lib/msun/man/fegetenv.3#1 branch .. //depot/projects/hammer/lib/msun/man/fegetround.3#1 branch .. //depot/projects/hammer/lib/msun/man/fenv.3#1 branch .. //depot/projects/hammer/lib/msun/man/round.3#1 branch .. //depot/projects/hammer/lib/msun/powerpc/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/powerpc/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/sparc64/fenv.c#1 branch .. //depot/projects/hammer/lib/msun/sparc64/fenv.h#1 branch .. //depot/projects/hammer/lib/msun/src/math.h#13 integrate .. //depot/projects/hammer/lib/msun/src/s_round.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_roundf.c#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#7 integrate .. //depot/projects/hammer/share/man/man3/Makefile#6 integrate .. //depot/projects/hammer/share/man/man3/fpgetround.3#3 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#23 integrate .. //depot/projects/hammer/share/man/man4/screen.4#2 integrate .. //depot/projects/hammer/share/man/man5/libmap.conf.5#6 integrate .. //depot/projects/hammer/share/man/man5/periodic.conf.5#6 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#6 integrate .. //depot/projects/hammer/share/man/man9/Makefile#35 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#12 integrate .. //depot/projects/hammer/share/termcap/termcap.src#12 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/support.s#6 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#8 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#8 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#8 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#8 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#75 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#18 integrate .. //depot/projects/hammer/sys/arm/arm/exception.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#2 integrate .. //depot/projects/hammer/sys/cam/cam_ccb.h#5 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#17 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#14 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#14 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#45 integrate .. //depot/projects/hammer/sys/conf/files#59 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#34 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#21 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#17 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#10 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#22 integrate .. //depot/projects/hammer/sys/dev/ciss/cissreg.h#8 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#4 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#4 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#26 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#11 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#9 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#8 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#9 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#12 integrate .. //depot/projects/hammer/sys/dev/si/si.c#7 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#32 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#10 integrate .. //depot/projects/hammer/sys/dev/sx/sx.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#35 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#34 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#34 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#8 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/geode.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#10 integrate .. //depot/projects/hammer/sys/i386/include/pc/bios.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#18 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#9 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_ext.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_hdr.h#5 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_sup.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_vtf.c#2 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#16 integrate .. //depot/projects/hammer/sys/ia64/ia64/ssc.c#6 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#9 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#1 branch .. //depot/projects/hammer/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#41 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#50 integrate .. //depot/projects/hammer/sys/kern/subr_blist.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#19 integrate .. //depot/projects/hammer/sys/kern/tty.c#14 integrate .. //depot/projects/hammer/sys/kern/tty_conf.c#4 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#12 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#26 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/net/if_sl.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#8 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#16 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#14 integrate .. //depot/projects/hammer/sys/pc98/pc98/mse.c#6 integrate .. //depot/projects/hammer/sys/pc98/pc98/olpt.c#6 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98gdc.c#8 integrate .. //depot/projects/hammer/sys/pc98/pc98/ppc.c#6 integrate .. //depot/projects/hammer/sys/pc98/pc98/scgdcrndr.c#2 integrate .. //depot/projects/hammer/sys/pc98/pc98/scterm-sck.c#2 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#21 integrate .. //depot/projects/hammer/sys/sparc64/include/asmacros.h#6 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#18 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_ebus.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_fhc.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom_sbus.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#6 integrate .. //depot/projects/hammer/sys/sys/blist.h#4 integrate .. //depot/projects/hammer/sys/sys/bus.h#11 integrate .. //depot/projects/hammer/sys/sys/conf.h#12 integrate .. //depot/projects/hammer/sys/sys/linedisc.h#1 branch .. //depot/projects/hammer/sys/sys/param.h#32 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#15 integrate .. //depot/projects/hammer/sys/sys/systm.h#17 integrate .. //depot/projects/hammer/sys/sys/tty.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#24 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#16 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#19 integrate .. //depot/projects/hammer/usr.bin/calendar/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/printf/printf.1#2 integrate .. //depot/projects/hammer/usr.bin/printf/printf.c#4 integrate .. //depot/projects/hammer/usr.bin/sed/main.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#6 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#9 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#6 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#6 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#5 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#8 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#6 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/IPXrouted.8#5 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.8#8 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/acpidb.8#2 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.8#3 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.8#9 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#6 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/bcmfw.8#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#5 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.8#4 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.1#4 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.5#4 integrate .. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#9 integrate .. //depot/projects/hammer/usr.sbin/faithd/faithd.8#3 integrate .. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.8#5 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#8 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.8#4 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.c#6 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#12 integrate .. //depot/projects/hammer/usr.sbin/lpr/lpr/printcap.5#5 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.8#5 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.8#7 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.c#7 integrate .. //depot/projects/hammer/usr.sbin/ndp/ndp.8#5 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#13 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/ptimes.c#3 integrate .. //depot/projects/hammer/usr.sbin/nghook/nghook.8#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#7 integrate .. //depot/projects/hammer/usr.sbin/setkey/setkey.8#7 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.8#10 integrate Differences ... ==== //depot/projects/hammer/UPDATING#39 (text+ko) ==== @@ -17,6 +17,15 @@ developers choose to disable these features on build machines to maximize performance. +20040607: + Splitting kern_thread.c into 2 files (adding kern_kse.c) + requires that you re-run config after updating your tree. + +20040601: + The MIDI drivers have been removed. Until the new module-friendly + ones are merged, remove or comment out midi and seq from your + kernel configuration. + 20040423: Due to a new option in ipfw (versrcreach) the ipfw(8) command needs to be recompiled. Normal accept/reject rules without @@ -1602,4 +1611,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.307 2004/04/23 14:33:30 andre Exp $ +$FreeBSD: src/UPDATING,v 1.309 2004/06/07 21:37:40 julian Exp $ ==== //depot/projects/hammer/bin/cp/utils.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.43 2004/04/06 20:06:44 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.44 2004/06/05 02:32:21 tjr Exp $"); #include #include @@ -88,6 +88,7 @@ if (nflag) { if (vflag) printf("%s not overwritten\n", to.p_path); + (void)close(from_fd); return (0); } else if (iflag) { (void)fprintf(stderr, "overwrite %s? %s", ==== //depot/projects/hammer/bin/df/df.c#17 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.61 2004/05/24 22:21:49 pjd Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.62 2004/06/04 09:30:51 das Exp $"); #include #include @@ -81,6 +81,7 @@ static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); static void prthumanval(int64_t); +static intmax_t fsbtoblk(int64_t, uint64_t, u_long); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); static void update_maxwidths(struct maxwidths *, const struct statfs *); @@ -345,10 +346,15 @@ * Convert statfs returned file system size into BLOCKSIZE units. * Attempts to avoid overflow for large file systems. */ -#define fsbtoblk(num, fsbs, bs) \ - (((fsbs) != 0 && (fsbs) < (bs)) ? \ - (num) / (intmax_t)((bs) / (fsbs)) : \ - (num) * (intmax_t)((fsbs) / (bs))) +static intmax_t +fsbtoblk(int64_t num, uint64_t fsbs, u_long bs) +{ + + if (fsbs != 0 && fsbs < bs) + return (num / (intmax_t)(bs / fsbs)); + else + return (num * (intmax_t)(fsbs / bs)); +} /* * Print out status about a file system. @@ -392,11 +398,10 @@ prthuman(sfsp, used); } else { (void)printf(" %*jd %*jd %*jd", - mwp->total, (intmax_t)fsbtoblk(sfsp->f_blocks, + mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, (intmax_t)fsbtoblk(used, sfsp->f_bsize, - blocksize), - mwp->avail, (intmax_t)fsbtoblk(sfsp->f_bavail, + mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", ==== //depot/projects/hammer/bin/test/test.1#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.18 2004/04/06 20:06:54 markm Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.20 2004/06/07 12:47:31 yar Exp $ .\" .Dd May 31, 1993 .Dt TEST 1 @@ -210,11 +210,6 @@ comes after .Ar \&s\&2 based on the ASCII value of their characters. -.It Ar \&s\&1 -True if -.Ar \&s\&1 -is not the null -string. .It Ar \&n\&1 Fl \&eq Ar \&n\&2 True if the integers .Ar \&n\&1 @@ -255,6 +250,17 @@ .Ar \&n\&2 . .El .Pp +If +.Ar file +is a symbolic link, +.Nm +will fully dereference it and then evaluate the expression +against the file referenced, except for the +.Fl h +and +.Fl L +primaries. +.Pp These primaries can be combined with the following operators: .Bl -tag -width Ar .It Cm \&! Ar expression @@ -315,7 +321,8 @@ .Sh SEE ALSO .Xr builtin 1 , .Xr expr 1 , -.Xr sh 1 +.Xr sh 1 , +.Xr symlink 7 .Sh STANDARDS The .Nm ==== //depot/projects/hammer/etc/bluetooth/hcsecd.conf#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $ -# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.1 2003/10/12 22:04:18 emax Exp $ +# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.2 2004/06/06 11:46:28 schweikh Exp $ # # HCI security daemon configuration file # @@ -24,14 +24,14 @@ # local device received the request. Everything is based on remote # device BD_ADDR. # -# "nokey" means that no link key has been defined and we should +# "nokey" means that no link key has been defined and we should # send Link_Key_Negative_Reply command to the device. # -# "nopin" means that no PIN code has been defined and we should +# "nopin" means that no PIN code has been defined and we should # send PIN_Code_Negative_Reply command to the device # -# Default entry is applied if no better match found +# Default entry is applied if no better match found # It MUST have 00:00:00:00:00:00 as bdaddr device { bdaddr 00:00:00:00:00:00; ==== //depot/projects/hammer/etc/csh.login#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/etc/csh.login,v 1.20 2000/07/27 11:39:33 asmodai Exp $ +# $FreeBSD: src/etc/csh.login,v 1.21 2004/06/06 11:46:27 schweikh Exp $ # # System-wide .login file for csh(1). -# Uncomment this to give you the default 4.2 behavior, where disk +# Uncomment this to give you the default 4.2 behavior, where disk # information is shown in K-Blocks # setenv BLOCKSIZE K -# +# # For the setting of languages and character sets please see # login.conf(5) and in particular the charset and lang options. # For full locales list check /usr/share/locale/* ==== //depot/projects/hammer/etc/defaults/pccard.conf#14 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.267 2004/04/09 17:15:18 rsm Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.269 2004/06/06 11:46:28 schweikh Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -243,7 +243,7 @@ card "PCMCIA" "CD-ROM" config 0x1 "ata" ? -# Novac DVD/CD Station +# Novac DVD/CD Station card "PCMCIA" "PnPIDE" config auto "ata" ? @@ -301,7 +301,7 @@ # Viking ATA Flash card card "/VIKING ATA/CF FLASH CARD */" "/TOR/AM */" config 0x2 "ata" ? - + ########## awi ########## # Generic AMD Am79c930 based card @@ -595,8 +595,8 @@ remove /etc/pccard_ether $device stop # Linksys Combo PCMCIA Ethernet Card -card "E-CARD" "E-CARD" - config auto "ed" ? +card "E-CARD" "E-CARD" + config auto "ed" ? logstr "Linksys Combo Ethernet Card" insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -610,7 +610,7 @@ # XXX Compex Net-A adapter, Telecom SuperSocket RE450T, # Apollo PCMCIA Ethernet Adapter, PLANEX ENW-3503-T and # Fiber line 10M Ethernet COMBO have same manufacturer and -# card version string. They should be distinguished by +# card version string. They should be distinguished by # other info. (such as additional information or OEM-ID/product-ID). # Note: There are several revisions of the card on the market. @@ -762,9 +762,9 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Linksys Combo PCMCIA EthernetCard (model EC2T on box) +# Linksys Combo PCMCIA EthernetCard (model EC2T on box) card "Linksys" "Combo PCMCIA EthernetCard (EC2T)" - config auto "ed" ? + config auto "ed" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -841,6 +841,7 @@ # MELCO LPC3-TX card "MELCO" "LPC3-TX" config auto "ed" ? 0x30000 + ether 0x1c8 insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -958,7 +959,7 @@ # GVC 10Mbps Ethernet Card card "PCMCIA" "Ethernet Card" config auto "ed" ? - logstr "Generic PCMCIA Ethernet Card" + logstr "Generic PCMCIA Ethernet Card" insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -1386,9 +1387,9 @@ card "ADVANTECH" "COMpad-32/85" config auto "sio" ? 0x330 -# Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. -card "AD PC_CARD" "RC288ACL" - config auto "sio" ? +# Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. +card "AD PC_CARD" "RC288ACL" + config auto "sio" ? # AIWA PV-JF288 card "AIWA CO.,LTD." "/PV-JF288 */" @@ -1505,7 +1506,7 @@ config 0x27 "sio" ? # config auto "sio" ? -# Motorola Montana +# Motorola Montana card "Motorola" "MONTANA 33.6 FAX/MODEM" config auto "sio" ? @@ -1588,7 +1589,7 @@ card "PCCardModem" "CardModem 56" config auto "sio" ? -# Eiger PCCARD modem +# Eiger PCCARD modem # Apparently this modem does not work unless the recommended # init string (AT&F&C1&D2) is supplied. card "/PCMCIA */" "/33\.6K Fax/Modem */" @@ -1702,7 +1703,7 @@ card "PC CARD" "56Kbps Fax Modem PC Card" config auto "sio" ? -# Zoom 56K modem +# Zoom 56K modem # Freezes your system entirely if you don't have the reset.. card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax" config auto "sio" ? @@ -1767,7 +1768,7 @@ # RATOC REX-5536AM, REX-9836A, ICM PSC-2401 SCSI # There's a buggy revision of this card which has broken CIS tupples. -# If you can't use this card, change config entry from `auto' to +# If you can't use this card, change config entry from `auto' to # `default' and try the point enabler. (for example, # type "pccardc enabler 0 stg0 -a 0x4140 -i 5" from root command prompt) card "PCMCIA SCSI MBH10404" "01" @@ -1844,7 +1845,7 @@ # Actiontec PRISM wireless card "ACTIONTEC" "PRISM Wireless LAN PC Card" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -1880,13 +1881,13 @@ # Belkin wireless card card "Belkin" "11Mbps Wireless Notebook Network Adapter" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop # Benq AWL100 wireless 11 Mbps pcmcia card card "BENQ" "AWL100 PCMCIA ADAPTER" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -2187,7 +2188,7 @@ card "T-Sinus" "130card" config auto "wi" ? insert /etc/pccard_ether $device start - remove /etc/pccard_ether $device stop + remove /etc/pccard_ether $device stop # TDK LAK-CD011WL card "TDK" "LAK-CD011WL for Wireless LAN" @@ -2322,9 +2323,9 @@ remove /etc/pccard_ether $device stop # ------------------------------------------------------------------- -# +# # "Wildcard" entries -# +# # ------------------------------------------------------------------- # GENERIC PCMCIA modem ==== //depot/projects/hammer/etc/devd.conf#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.12 2004/03/13 05:16:42 cperciva Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.13 2004/06/06 11:46:27 schweikh Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -17,7 +17,7 @@ pid-file "/var/run/devd.pid"; # Setup some shorthand for regex that we use later in the file. - set ethernet-nic-regex + set ethernet-nic-regex "(an|ar|ath|aue|awi|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|ep|\ ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\ sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+"; ==== //depot/projects/hammer/etc/devfs.conf#2 (text+ko) ==== @@ -1,7 +1,6 @@ - # Copyright (c) 2003 The FreeBSD Project # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -10,7 +9,7 @@ # 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 @@ -22,8 +21,8 @@ # 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/etc/devfs.conf,v 1.1 2003/05/06 01:10:33 dougb Exp $ +# +# $FreeBSD: src/etc/devfs.conf,v 1.2 2004/06/06 11:46:27 schweikh Exp $ # These are examples of how to configure devices using /etc/rc.d/devfs. # The first parameter is always the action to take, the second is always the @@ -44,4 +43,3 @@ # Allow members of group operator to cat things to the speaker #own speaker root:operator #perm speaker 0660 - ==== //depot/projects/hammer/etc/disktab#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/disktab,v 1.24 2003/04/02 20:16:02 ru Exp $ +# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $ # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # dt controller type # ty type of disk (fixed, removeable, simulated) @@ -122,7 +122,7 @@ :pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\ :pb#15748:ob#15748:tb=swap:\ :pc#288750:oc#0:\ - :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD: + :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD: cp3100|Connor Peripherals 100MB IDE:\ :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \ ==== //depot/projects/hammer/etc/gettytab#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/gettytab,v 1.21 2003/09/09 15:37:19 yar Exp $ +# $FreeBSD: src/etc/gettytab,v 1.22 2004/06/06 11:46:27 schweikh Exp $ # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 # # Most of the table entries here are just copies of the old getty table, @@ -205,7 +205,7 @@ autologin|al.9600:\ :al=root:tc=std.9600: -# +# # Entries for 3-wire serial terminals. These don't supply carrier, so # clocal needs to be set, and crtscts needs to be unset. # ==== //depot/projects/hammer/etc/hosts.allow#2 (text+ko) ==== @@ -1,18 +1,18 @@ # # hosts.allow access control file for "tcp wrapped" applications. -# $FreeBSD: src/etc/hosts.allow,v 1.16 2002/02/06 20:39:36 markm Exp $ +# $FreeBSD: src/etc/hosts.allow,v 1.17 2004/06/06 11:46:27 schweikh Exp $ # # NOTE: The hosts.deny file is deprecated. # Place both 'allow' and 'deny' rules in the hosts.allow file. # See hosts_options(5) for the format of this file. # hosts_access(5) no longer fully applies. -# _____ _ _ +# _____ _ _ # | ____| __ __ __ _ _ __ ___ _ __ | | ___ | | # | _| \ \/ / / _` | | '_ ` _ \ | '_ \ | | / _ \ | | # | |___ > < | (_| | | | | | | | | |_) | | | | __/ |_| # |_____| /_/\_\ \__,_| |_| |_| |_| | .__/ |_| \___| (_) -# |_| +# |_| # !!! This is an example! You will need to modify it for your specific # !!! requirements! @@ -24,7 +24,7 @@ # Wrapping sshd(8) is not normally a good idea, but if you # need to do it, here's how -#sshd : .evil.cracker.example.com : deny +#sshd : .evil.cracker.example.com : deny # Protect against simple DNS spoofing attacks by checking that the # forward and reverse records for the remote host match. If a mismatch ==== //depot/projects/hammer/etc/inetd.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.68 2004/04/03 17:52:29 mlaier Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.69 2004/06/06 11:46:27 schweikh Exp $ # # Internet server configuration database # @@ -67,7 +67,7 @@ #rstatd/1-3 dgram rpc/udp wait root /usr/libexec/rpc.rstatd rpc.rstatd #rusersd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.rusersd rpc.rusersd #walld/1 dgram rpc/udp wait root /usr/libexec/rpc.rwalld rpc.rwalld -#pcnfsd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.pcnfsd rpc.pcnfsd +#pcnfsd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.pcnfsd rpc.pcnfsd #rquotad/1 dgram rpc/udp wait root /usr/libexec/rpc.rquotad rpc.rquotad #sprayd/1 dgram rpc/udp wait root /usr/libexec/rpc.sprayd rpc.sprayd # ==== //depot/projects/hammer/etc/isdn/isdnd.rates.D#2 (text+ko) ==== @@ -3,7 +3,7 @@ # i4b - Deutsche Telekom charging rates config file # ------------------------------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.3 1999/08/27 23:23:58 peter Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Sun Jan 17 18:38:29 1999] # @@ -25,7 +25,7 @@ # #=================== T-ISDN City ============================================================= # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- --------------- ra0 0 00.00-05.00:240 05.00-21.00:150 21.00-24.00:240 ra0 1 00.00-05.00:240 05.00-09.00:150 09.00-18.00:90 18.00-21.00:150 21.00-24.00:240 @@ -37,7 +37,7 @@ # #=================== T-ISDN Deutschland ====================================================== # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- --------------- ra1 0 00.00-24.00:60 ra1 1 00.00-02.00:60 02.00-05.00:120 05.00-09.00:60 09.00-18.00:30 18.00-24.00:60 ==== //depot/projects/hammer/etc/isdn/isdnd.rates.F#2 (text+ko) ==== @@ -3,7 +3,7 @@ # i4b - Tarifs France Telecom # --------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.3 1999/08/27 23:23:58 peter Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Thu Mar 19 20:05:18 1998] # @@ -47,7 +47,7 @@ # #================== Zone 1 : < 25 km ================================== # -#rate-code Day rate1 rate2 rate3 +#rate-code Day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra1 0 00.00-24.00:222 ra1 1 00.00-08.00:222 08.00-19.00:111 19.00-24.00:222 @@ -61,8 +61,8 @@ # #================== Zone 2 : 25-30 km ================================= # -#rate-code Day rate1 rate2 rate3 -#--------- --- --------------- --------------- -------------- +#rate-code Day rate1 rate2 rate3 +#--------- --- --------------- --------------- -------------- ra2 0 00.00-24.00:148 ra2 1 00.00-08.00:148 08.00-19.00:74 19.00-24.00:148 ra2 2 00.00-08.00:148 08.00-19.00:74 19.00-24.00:148 @@ -73,7 +73,7 @@ # #=================== Zone 3 : 30-52 km ================================ # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra3 0 00.00-24.00:94 ra3 1 00.00-08.00:94 08.00-19.00:47 19.00-24.00:94 @@ -86,7 +86,7 @@ # #=================== Zone 4 : > 52 km ================================= # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra4 0 00.00-24.00:78 ra4 1 00.00-08.00:78 08.00-19.00:39 19.00-24.00:78 @@ -100,7 +100,7 @@ #=================== INTERNATIONAL : Allemagne ======================== # (pour appeler Hellmuth) # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra5 0 00.00-24.00:27 ra5 1 00.00-08.00:27 08.00-19.00:21 19.00-24.00:27 @@ -113,7 +113,7 @@ # #=================== INTERNATIONAL : Pays-Bas ========================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra6 0 00.00-24.00:25 ra6 1 00.00-08.00:25 08.00-19.00:20 19.00-24.00:25 @@ -126,7 +126,7 @@ # #=================== INTERNATIONAL : Portugal =========================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra7 0 00.00-24.00:22 ra7 1 00.00-08.00:22 08.00-19.00:18 19.00-24.00:22 @@ -139,7 +139,7 @@ # #=================== INTERNATIONAL : USA/Canada ======================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra8 0 00.00-24.00:25 ra8 1 00.00-13.00:25 13.00-19.00:20 19.00-24.00:25 ==== //depot/projects/hammer/etc/isdn/isdnd.rates.L#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # $Id: isdnd.rates.L,v 1.2 1999/12/13 21:25:24 hm Exp $ # -# $FreeBSD: src/etc/isdn/isdnd.rates.L,v 1.1 1999/12/14 21:14:28 hm Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.L,v 1.2 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Mon Dec 13 21:42:33 1999] # @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------------ # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- ---------------- ra0 0 00.00-24.00:960 ra0 1 00.00-06.00:960 06.00-08.00:480 08.00-19.00:240 19.00-23.00:480 23.00-24.00:960 ==== //depot/projects/hammer/etc/isdn/isdnd.rc.sample#2 (text+ko) ==== @@ -3,7 +3,7 @@ # example of a configuration file for the isdn daemon # --------------------------------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.3 2001/05/27 08:05:57 hm Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Sun May 27 09:33:59 2001] # @@ -35,14 +35,14 @@ monitor-allowed = no # global switch: monitor on/off monitor-port = 451 # default monitor TCP port -# Monitor rights are granted due to the most specific host/net spec, i.e. in +# Monitor rights are granted due to the most specific host/net spec, i.e. in # the example below host 192.168.1.2 will have the rights specified on that # line, even so it belongs to net 192.168.1.0/24 as well. # # A monitor specification may either be: # # - the name of a local (UNIX-domain) socket; this MUST start with a "/" -monitor = "/var/run/isdn-monitor" +monitor = "/var/run/isdn-monitor" monitor-access = fullcmd monitor-access = channelstate, logevents monitor-access = callin, callout @@ -92,7 +92,7 @@ #============================================================================== # entry section: IP over ISDN example - i call back the remote end #============================================================================== -entry +entry name = I4BIP # name for reference. This name will # be used in the logfile to identfy @@ -119,9 +119,9 @@ local-phone-dialout = 321 # this is my number remote-phone-dialout = 00123456789 # i call this remote number - # in case i have several remote - # telephone numbers specified, this - # is used to specify which one is + # in case i have several remote + # telephone numbers specified, this + # is used to specify which one is # used next on dial fail or retry: remdial-handling = first # first, last or next @@ -139,7 +139,7 @@ # specified for telephone answering b1protocol = hdlc # hdlc, raw - # shorthold mode and idle time + # shorthold mode and idle time # configuration: ratetype = 0 # ratesfile entry to use unitlength = 90 # unitlength to assume @@ -170,18 +170,18 @@ #============================================================================== # entry section: IP over ISDN example - i am called back by the remote end #============================================================================== -entry - +entry + name = I4BIP1 # name for reference - + usrdevicename = ipr # ipr, tel, rbch usrdeviceunit = 1 # unit number - + isdncontroller = 0 # controller to use or -1 to use any isdnchannel = -1 # channel (1/2) to use or 0 or -1 for any # numbers used to DIAL OUT -remote-phone-dialout = 00401234567 # remote number to dial +remote-phone-dialout = 00401234567 # remote number to dial local-phone-dialout = 38 # our number to tell remote # numbers used to verify at DIAL IN @@ -194,7 +194,7 @@ unitlength = 90 # default unit length earlyhangup = 5 # safety zone unitlengthsrc = aocd # none, rate, cmdl, conf, aocd - + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 8 00:07:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA5AC16A4D1; Tue, 8 Jun 2004 00:07:26 +0000 (GMT) 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 96DB416A4CE for ; Tue, 8 Jun 2004 00:07:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90A7043D2D for ; Tue, 8 Jun 2004 00:07:26 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5807QQL068794 for ; Tue, 8 Jun 2004 00:07:26 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5807QgR068791 for perforce@freebsd.org; Tue, 8 Jun 2004 00:07:26 GMT (envelope-from ps@freebsd.org) Date: Tue, 8 Jun 2004 00:07:26 GMT Message-Id: <200406080007.i5807QgR068791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Subject: PERFORCE change 54370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 00:07:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=54370 Change 54370 by ps@butter.corp on 2004/06/08 00:06:34 Whitespace fix (thought i found all of these.. bad jayanth) Affected files ... .. //depot/projects/sack/netinet/tcp_output.c#3 edit Differences ... ==== //depot/projects/sack/netinet/tcp_output.c#3 (text+ko) ==== @@ -829,10 +829,10 @@ th->th_seq = htonl(tp->snd_nxt); else th->th_seq = htonl(tp->snd_max); - if (sack_rxmit) { - th->th_seq = htonl(p->rxmit); - p->rxmit += len; - } + if (sack_rxmit) { + th->th_seq = htonl(p->rxmit); + p->rxmit += len; + } th->th_ack = htonl(tp->rcv_nxt); if (optlen) { bcopy(opt, th + 1, optlen); From owner-p4-projects@FreeBSD.ORG Tue Jun 8 00:35:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1681B16A4D1; Tue, 8 Jun 2004 00:35:06 +0000 (GMT) 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 E3E6616A4CE for ; Tue, 8 Jun 2004 00:35:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD2F543D5C for ; Tue, 8 Jun 2004 00:35:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i580Z39L074929 for ; Tue, 8 Jun 2004 00:35:03 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i580Z368074926 for perforce@freebsd.org; Tue, 8 Jun 2004 00:35:03 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Jun 2004 00:35:03 GMT Message-Id: <200406080035.i580Z368074926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 00:35:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=54373 Change 54373 by peter@peter_hammer on 2004/06/08 00:34:05 IFC @54372 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#76 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#35 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#76 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.462 2004/06/07 23:51:20 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.464 2004/06/08 00:29:41 peter Exp $"); /* * Manages physical address maps. @@ -1850,7 +1850,7 @@ if (pmap == NULL) return; - va &= (~(vm_paddr_t)PAGE_MASK); + va = trunc_page(va); #ifdef PMAP_DIAGNOSTIC if (va > VM_MAX_KERNEL_ADDRESS) panic("pmap_enter: toobig"); @@ -2779,7 +2779,7 @@ /* If we gave a direct map region in pmap_mapdev, do nothing */ if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) return; - base = va & (~(vm_paddr_t)PAGE_MASK); + base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) ==== //depot/projects/hammer/sys/amd64/include/pmap.h#35 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.115 2004/05/16 20:44:41 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.116 2004/06/08 00:29:42 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ From owner-p4-projects@FreeBSD.ORG Tue Jun 8 01:06:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0F6E16A4D1; Tue, 8 Jun 2004 01:06:53 +0000 (GMT) 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 9174B16A4CE for ; Tue, 8 Jun 2004 01:06:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 717CB43D2F for ; Tue, 8 Jun 2004 01:06:53 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5816kla088410 for ; Tue, 8 Jun 2004 01:06:46 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5816jiO088407 for perforce@freebsd.org; Tue, 8 Jun 2004 01:06:45 GMT (envelope-from ps@freebsd.org) Date: Tue, 8 Jun 2004 01:06:45 GMT Message-Id: <200406080106.i5816jiO088407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Subject: PERFORCE change 54377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 01:06:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=54377 Change 54377 by ps@butter.corp on 2004/06/08 01:06:17 Ugh.. one more whitespace change. Affected files ... .. //depot/projects/sack/netinet/tcp.h#3 edit Differences ... ==== //depot/projects/sack/netinet/tcp.h#3 (text+ko) ==== @@ -85,7 +85,7 @@ #define TCPOPT_SACK_PERMITTED 4 /* Experimental */ #define TCPOLEN_SACK_PERMITTED 2 #define TCPOPT_SACK 5 /* Experimental */ -#define TCPOLEN_SACK 8 /* 2*sizeof(tcp_seq) */ +#define TCPOLEN_SACK 8 /* 2*sizeof(tcp_seq) */ #define TCPOPT_TIMESTAMP 8 #define TCPOLEN_TIMESTAMP 10 #define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ From owner-p4-projects@FreeBSD.ORG Tue Jun 8 01:20:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85C8216A4D1; Tue, 8 Jun 2004 01:20:08 +0000 (GMT) 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 4452316A4CE for ; Tue, 8 Jun 2004 01:20:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AE6443D45 for ; Tue, 8 Jun 2004 01:20:08 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i581K4qM090608 for ; Tue, 8 Jun 2004 01:20:04 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i581K3nC090605 for perforce@freebsd.org; Tue, 8 Jun 2004 01:20:03 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Jun 2004 01:20:03 GMT Message-Id: <200406080120.i581K3nC090605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 01:20:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=54380 Change 54380 by peter@peter_hammer on 2004/06/08 01:19:04 IFC @54379 Affected files ... .. //depot/projects/hammer/lib/libarchive/archive_read.3#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#32 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#88 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#62 integrate .. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#77 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#27 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#36 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#16 integrate Differences ... ==== //depot/projects/hammer/lib/libarchive/archive_read.3#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.6 2004/06/02 08:14:43 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.7 2004/06/08 00:23:27 kientzle Exp $ .\" .Dd October 1, 2003 .Dt archive_read 3 @@ -288,7 +288,7 @@ archive_read_support_compression_all(a); archive_read_support_format_all(a); archive_read_open(a, mydata, myopen, myread, myclose); - while (archive_read_next_header(a, &entry) == ARCHIVE_READ_OK) { + while (archive_read_next_header(a, &entry) == ARCHIVE_OK) { printf("%s\\n",archive_entry_pathname(entry)); archive_read_data_skip(a); } @@ -327,16 +327,16 @@ .Sh RETURN VALUES Most functions return zero on success, non-zero on error. The possible return codes include: -.Cm ARCHIVE_READ_OK +.Cm ARCHIVE_OK (the operation succeeded) -.Cm ARCHIVE_READ_WARN +.Cm ARCHIVE_WARN (the operation succeeded but a non-critical error was encountered) -.Cm ARCHIVE_READ_EOF +.Cm ARCHIVE_EOF (end-of-archive was encountered), -.Cm ARCHIVE_READ_RETRY +.Cm ARCHIVE_RETRY (the operation failed but can be retried), and -.Cm ARCHIVE_READ_FATAL +.Cm ARCHIVE_FATAL (there was a fatal error; the archive should be closed immediately). Detailed error codes and textual descriptions are available from the .Fn archive_errno ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.151 2004/06/06 09:16:02 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.152 2004/06/08 01:14:39 peter Exp $"); #include #include @@ -73,6 +73,7 @@ #define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) +#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : "m" (r)) #define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") @@ -111,6 +112,7 @@ fpuinit(void) { register_t savecrit; + u_int mxcsr; u_short control; savecrit = intr_disable(); @@ -119,6 +121,8 @@ fninit(); control = __INITIAL_FPUCW__; fldcw(&control); + mxcsr = __INITIAL_MXCSR__; + ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); start_emulating(); fpu_cleanstate_ready = 1; ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#32 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.132 2004/06/03 20:18:15 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.133 2004/06/08 01:02:51 peter Exp $"); #include "opt_cpu.h" @@ -250,40 +250,40 @@ } if (amd_feature != 0) { printf("\n AMD Features=0x%b", amd_feature, - "\020" /* in hex */ - "\001FPU" /* Integral FPU */ - "\002VME" /* Extended VM86 mode support */ - "\003DE" /* Debug extensions */ - "\004PSE" /* 4MByte page tables */ - "\005TSC" /* Timestamp counter */ - "\006MSR" /* Machine specific registers */ - "\007PAE" /* Physical address extension */ - "\010MCE" /* Machine Check support */ - "\011CX8" /* CMPEXCH8 instruction */ - "\012APIC" /* SMP local APIC */ - "\013" - "\014SYSCALL" /* SYSENTER/SYSEXIT instructions */ - "\015MTRR" /* Memory Type Range Registers */ - "\016PGE" /* PG_G (global bit) support */ - "\017MCA" /* Machine Check Architecture */ - "\020CMOV" /* CMOV instruction */ - "\021PAT" /* Page attributes table */ - "\022PGE36" /* 36 bit address space support */ - "\023RSVD" /* Reserved, unknown */ - "\024MP" /* Multiprocessor Capable */ - "\025NX" /* Has EFER.NXE, NX (no execute pte bit) */ - "\026" - "\027MMX+" /* AMD MMX Instruction Extensions */ - "\030MMX" - "\031FXSAVE" /* FXSAVE/FXRSTOR */ - "\032" - "\033" - "\034" - "\035" - "\036LM" /* Long mode */ - "\0373DNow!+" /* AMD 3DNow! Instruction Extensions */ - "\0403DNow!" /* AMD 3DNow! Instructions */ - ); + "\020" /* in hex */ + "\001" /* Same */ + "\002" /* Same */ + "\003" /* Same */ + "\004" /* Same */ + "\005" /* Same */ + "\006" /* Same */ + "\007" /* Same */ + "\010" /* Same */ + "\011" /* Same */ + "\012" /* Same */ + "\013" /* Undefined */ + "\014SYSCALL" /* Have SYSCALL/SYSRET */ + "\015" /* Same */ + "\016" /* Same */ + "\017" /* Same */ + "\020" /* Same */ + "\021" /* Same */ + "\022" /* Same */ + "\023" /* Reserved, unknown */ + "\024MP" /* Multiprocessor Capable */ + "\025NX" /* Has EFER.NXE, NX */ + "\026" /* Undefined */ + "\027MMX+" /* AMD MMX Extensions */ + "\030" /* Same */ + "\031" /* Same */ + "\032" /* Undefined */ + "\033" /* Undefined */ + "\034" /* Undefined */ + "\035" /* Undefined */ + "\036LM" /* 64 bit long mode */ + "\0373DNow+" /* AMD 3DNow! Extensions */ + "\0403DNow" /* AMD 3DNow! */ + ); } /* ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.47 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.48 2004/06/08 01:02:51 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#88 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.607 2004/05/19 01:23:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.608 2004/06/08 01:02:51 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#62 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.237 2004/05/16 22:11:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.239 2004/06/08 01:07:51 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -429,12 +429,12 @@ /* set up CPU registers and state */ cpu_setregs(); + /* set up SSE/NX registers */ + initializecpu(); + /* set up FPU state on the AP */ fpuinit(); - /* set up SSE/NX registers */ - initializecpu(); - /* A quick check from sanity claus */ if (PCPU_GET(apic_id) != lapic_id()) { printf("SMP: cpuid = %d\n", PCPU_GET(cpuid)); ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#12 (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/amd64/amd64/mpboot.S,v 1.25 2004/02/25 23:12:39 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.26 2004/06/08 01:02:52 peter Exp $ */ #include /* miscellaneous asm macros */ ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#77 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.464 2004/06/08 00:29:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.465 2004/06/08 01:02:52 peter Exp $"); /* * Manages physical address maps. @@ -174,7 +174,7 @@ static int ndmpdp; static vm_paddr_t dmaplimit; vm_offset_t kernel_vm_end; -pt_entry_t pg_nx; +pt_entry_t pg_nx; static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ ==== //depot/projects/hammer/sys/amd64/include/md_var.h#27 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.73 2004/04/11 04:26:58 alc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.74 2004/06/08 01:02:52 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/hammer/sys/amd64/include/pmap.h#36 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.116 2004/06/08 00:29:42 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.117 2004/06/08 01:02:52 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#16 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.29 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.30 2004/06/08 01:02:52 peter Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ From owner-p4-projects@FreeBSD.ORG Tue Jun 8 01:26:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52EBA16A4D1; Tue, 8 Jun 2004 01:26:13 +0000 (GMT) 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 2B6DB16A4CE for ; Tue, 8 Jun 2004 01:26:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DB6543D1D for ; Tue, 8 Jun 2004 01:26:13 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i581QCrH092604 for ; Tue, 8 Jun 2004 01:26:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i581QCMb092601 for perforce@freebsd.org; Tue, 8 Jun 2004 01:26:12 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Jun 2004 01:26:12 GMT Message-Id: <200406080126.i581QCMb092601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 01:26:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=54382 Change 54382 by peter@peter_hammer on 2004/06/08 01:25:46 IFC @54381 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#33 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#33 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.133 2004/06/08 01:02:51 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.134 2004/06/08 01:20:37 peter Exp $"); #include "opt_cpu.h" From owner-p4-projects@FreeBSD.ORG Tue Jun 8 01:39:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D96EE16A4D1; Tue, 8 Jun 2004 01:39:35 +0000 (GMT) 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 AC5F416A4CE for ; Tue, 8 Jun 2004 01:39:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A555E43D5F for ; Tue, 8 Jun 2004 01:39:35 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i581dTGQ094748 for ; Tue, 8 Jun 2004 01:39:29 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i581dTgP094745 for perforce@freebsd.org; Tue, 8 Jun 2004 01:39:29 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Jun 2004 01:39:29 GMT Message-Id: <200406080139.i581dTgP094745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 01:39:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=54384 Change 54384 by peter@peter_hammer on 2004/06/08 01:39:19 IFC @54383 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#16 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.152 2004/06/08 01:14:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.153 2004/06/08 01:35:48 peter Exp $"); #include #include @@ -73,7 +73,7 @@ #define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) -#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : "m" (r)) +#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : : "m" (r)) #define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") From owner-p4-projects@FreeBSD.ORG Tue Jun 8 01:51:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFD7F16A4D2; Tue, 8 Jun 2004 01:51:45 +0000 (GMT) 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 BBBAF16A4CE for ; Tue, 8 Jun 2004 01:51:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95E5B43D46 for ; Tue, 8 Jun 2004 01:51:45 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i581pj5S097916 for ; Tue, 8 Jun 2004 01:51:45 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i581pjlT097907 for perforce@freebsd.org; Tue, 8 Jun 2004 01:51:45 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 01:51:45 GMT Message-Id: <200406080151.i581pjlT097907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 01:51:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=54385 Change 54385 by jmallett@jmallett_oingo on 2004/06/08 01:51:10 Set up compare, seems to make mips64emul fire interrupts. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/clock.c#6 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/clock.c#6 (text+ko) ==== @@ -66,6 +66,7 @@ panic("cannot init clock for type %d", mach_type); } tc_init(&sgimips_timecounter); + mips_wr_compare(mips_rd_count() + curcpu()->ci_cycles_per_hz); mips_wr_status(mips_rd_status() | MIPS_SR_INT_IE | MIPS_INT_MASK_5); } From owner-p4-projects@FreeBSD.ORG Tue Jun 8 03:01:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02CB216A4D1; Tue, 8 Jun 2004 03:01:18 +0000 (GMT) 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 B0FC916A4CE for ; Tue, 8 Jun 2004 03:01:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A90BD43D45 for ; Tue, 8 Jun 2004 03:01:17 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5831AxD012320 for ; Tue, 8 Jun 2004 03:01:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5831AXT012317 for perforce@freebsd.org; Tue, 8 Jun 2004 03:01:10 GMT (envelope-from peter@freebsd.org) Date: Tue, 8 Jun 2004 03:01:10 GMT Message-Id: <200406080301.i5831AXT012317@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 03:01:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=54388 Change 54388 by peter@peter_hammer on 2004/06/08 03:00:21 OK, thats the last straw! Teach sysctl subsystem about deci-Kelvins (the temperature units that acpi uses) hammer# sysctl hw.acpi.thermal.tz0 hw.acpi.thermal.tz0.temperature: 31.0C hw.acpi.thermal.tz0.active: -1 hw.acpi.thermal.tz0.thermal_flags: 0 hw.acpi.thermal.tz0._PSV: -1 hw.acpi.thermal.tz0._HOT: -1 hw.acpi.thermal.tz0._CRT: 75.0C hw.acpi.thermal.tz0._ACx: 50.0C -1 -1 -1 -1 -1 -1 -1 -1 -1 hammer# Affected files ... .. //depot/projects/hammer/sbin/sysctl/sysctl.c#12 edit .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#16 edit Differences ... ==== //depot/projects/hammer/sbin/sysctl/sysctl.c#12 (text+ko) ==== @@ -563,7 +563,12 @@ fputs(val, stdout); if(*fmt == 'U') printf(hflag ? "%'u" : "%u", *(unsigned int *)p); - else + else if (*fmt == 'K') { + if (*(int *)p < 0) + printf("%d", *(int *)p); + else + printf("%d.%dC", (*(int *)p - 2732) / 10, (*(int *)p - 2732) % 10); + } else printf(hflag ? "%'d" : "%d", *(int *)p); val = " "; len -= sizeof(int); @@ -580,7 +585,12 @@ fputs(val, stdout); if(*fmt == 'U') printf(hflag ? "%'lu" : "%lu", *(unsigned long *)p); - else + else if (*fmt == 'K') { + if (*(long *)p < 0) + printf("%ld", *(long *)p); + else + printf("%ld.%ldC", (*(long *)p - 2732) / 10, (*(long *)p - 2732) % 10); + } else printf(hflag ? "%'ld" : "%ld", *(long *)p); val = " "; len -= sizeof(long); ==== //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#16 (text+ko) ==== @@ -234,9 +234,9 @@ sc->tz_sysctl_tree = SYSCTL_ADD_NODE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(acpi_tz_sysctl_tree), OID_AUTO, oidname, CTLFLAG_RD, 0, ""); - SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), - OID_AUTO, "temperature", CTLFLAG_RD, - &sc->tz_temperature, 0, "current thermal zone temperature"); + SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), + OID_AUTO, "temperature", CTLFLAG_RD, &sc->tz_temperature, + sizeof(sc->tz_temperature), "IK", "current thermal zone temperature"); SYSCTL_ADD_PROC(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), OID_AUTO, "active", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_tz_active_sysctl, "I", ""); @@ -247,15 +247,15 @@ SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), OID_AUTO, "_PSV", CTLFLAG_RD, &sc->tz_zone.psv, 0, ""); - SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), - OID_AUTO, "_HOT", CTLFLAG_RD, - &sc->tz_zone.hot, 0, ""); - SYSCTL_ADD_INT(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), - OID_AUTO, "_CRT", CTLFLAG_RD, - &sc->tz_zone.crt, 0, ""); + SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), + OID_AUTO, "_HOT", CTLFLAG_RD, &sc->tz_zone.hot, + sizeof(sc->tz_zone.hot), "IK", ""); + SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), + OID_AUTO, "_CRT", CTLFLAG_RD, &sc->tz_zone.crt, + sizeof(sc->tz_zone.crt), "IK", ""); SYSCTL_ADD_OPAQUE(&sc->tz_sysctl_ctx, SYSCTL_CHILDREN(sc->tz_sysctl_tree), OID_AUTO, "_ACx", CTLFLAG_RD, &sc->tz_zone.ac, - sizeof(sc->tz_zone.ac), "I", ""); + sizeof(sc->tz_zone.ac), "IK", ""); /* * Register our power profile event handler, and flag it for a manual From owner-p4-projects@FreeBSD.ORG Tue Jun 8 03:16:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6513616A4D1; Tue, 8 Jun 2004 03:16:30 +0000 (GMT) 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 3C86916A4CE for ; Tue, 8 Jun 2004 03:16:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EC3243D2F for ; Tue, 8 Jun 2004 03:16:30 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i583GTR6017285 for ; Tue, 8 Jun 2004 03:16:29 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i583GT5I017282 for perforce@freebsd.org; Tue, 8 Jun 2004 03:16:29 GMT (envelope-from scottl@freebsd.org) Date: Tue, 8 Jun 2004 03:16:29 GMT Message-Id: <200406080316.i583GT5I017282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 03:16:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=54389 Change 54389 by scottl@scottl-esp-sparc64 on 2004/06/08 03:16:23 For some unpleasant reason, giving an alignment arg of '8' to uma_zcreate() results in uma_zalloc() getting unaligned chunks. Add a basic implementation of XPT_PATH_INQ. The driver can now somewhat play with CAM. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#13 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#13 (text+ko) ==== @@ -102,7 +102,7 @@ #include #include -int ncr53c9x_debug = NCR_SHOWMISC; /*NCR_SHOWPHASE|NCR_SHOWMISC|NCR_SHOWTRAC|NCR_SHOWCMDS;*/ +int ncr53c9x_debug = NCR_SHOWMISC|NCR_SHOWPHASE|NCR_SHOWMISC|NCR_SHOWTRAC|NCR_SHOWCMDS; #ifdef DEBUG int ncr53c9x_notag = 0; #endif @@ -439,7 +439,7 @@ /* All instances share this zone */ ecb_zone = uma_zcreate("ncr53c9x ecb zone", sizeof(struct ncr53c9x_ecb), NULL, NULL, - NULL, NULL, 8, M_NOWAIT); + NULL, NULL, 0, 0); ecb_zone_initialized = 1; } @@ -794,7 +794,7 @@ ecb = (struct ncr53c9x_ecb *)uma_zalloc(ecb_zone, M_NOWAIT); if (ecb) { - memset(ecb, 0, sizeof(*ecb)); + bzero(ecb, sizeof(struct ncr53c9x_ecb)); ecb->flags |= ECB_ALLOC; ecb->sc = sc; } @@ -817,12 +817,45 @@ struct ncr53c9x_softc *sc; struct ncr53c9x_ecb *ecb; - NCR_TRACE(("[ncr53c9x_action] ")); + NCR_TRACE(("[ncr53c9x_action %d]", ccb->ccb_h.func_code)); sc = cam_sim_softc(sim); mtx_lock(&sc->sc_lock); switch (ccb->ccb_h.func_code) { + case XPT_RESET_DEV: + break; + case XPT_CALC_GEOMETRY: + break; + case XPT_PATH_INQ: + { + struct ccb_pathinq *cpi = &ccb->cpi; + + cpi->version_num = 1; + cpi->hba_inquiry = PI_WIDE_16; + cpi->target_sprt = 0; + cpi->hba_misc = 0; + cpi->hba_eng_cnt = 0; + cpi->max_target = 15; + cpi->max_lun = 8; + cpi->initiator_id = 7; + cpi->bus_id = 0; + cpi->base_transfer_speed = 3300; + strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); + strncpy(cpi->hba_vid, "Sun", HBA_IDLEN); + strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); + cpi->unit_number = cam_sim_unit(sim); + ccb->ccb_h.status = CAM_REQ_CMP; + mtx_unlock(&sc->sc_lock); + xpt_done(ccb); + return; + } + case XPT_GET_TRAN_SETTINGS: + break; + case XPT_ABORT: + break; + case XPT_TERM_IO: + break; case XPT_SCSI_IO: case XPT_RESET_BUS: { @@ -929,7 +962,12 @@ break; #endif default: - break; + printf("%s: Unhandled function code %d\n", sc->dv_name, + ccb->ccb_h.func_code); + ccb->ccb_h.status = CAM_PROVIDE_FAIL; + mtx_unlock(&sc->sc_lock); + xpt_done(ccb); + return; } mtx_unlock(&sc->sc_lock); From owner-p4-projects@FreeBSD.ORG Tue Jun 8 03:40:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D28AA16A4D1; Tue, 8 Jun 2004 03:39:59 +0000 (GMT) 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 AC90E16A4CE for ; Tue, 8 Jun 2004 03:39:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FC7A43D46 for ; Tue, 8 Jun 2004 03:39:59 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i583dx3u021430 for ; Tue, 8 Jun 2004 03:39:59 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i583dxbC021427 for perforce@freebsd.org; Tue, 8 Jun 2004 03:39:59 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 03:39:59 GMT Message-Id: <200406080339.i583dxbC021427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 03:40:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=54391 Change 54391 by jmallett@jmallett_oingo on 2004/06/08 03:39:20 Simplify the clock logic for the greater good for now. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#30 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#30 (text+ko) ==== @@ -168,31 +168,21 @@ void platform_intr(struct trapframe *tf) { - static u_register_t next, last; register_t cause; cause = mips_rd_cause(); if (cause & MIPS_INT_MASK_5) { struct clockframe cf; - u_register_t now; /* * Set next clock edge. */ - if (next == 0) - next = mips_rd_count(); - last = next; - next += curcpu()->ci_cycles_per_hz; - now = mips_rd_count(); - if (last < next) { - while (now > next) - next += curcpu()->ci_cycles_per_hz; - } - mips_wr_compare(next); cf.sr = tf->tf_regs[TF_SR]; cf.pc = tf->tf_regs[TF_EPC]; hardclock(&cf); + mips_wr_compare(mips_rd_count() + + curcpu()->ci_cycles_per_hz); } else { printf("stray intr cause %lx\n", cause); } From owner-p4-projects@FreeBSD.ORG Tue Jun 8 03:40:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7075F16A4D9; Tue, 8 Jun 2004 03:40:00 +0000 (GMT) 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 348C016A4FD for ; Tue, 8 Jun 2004 03:40:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1202143D46 for ; Tue, 8 Jun 2004 03:40:00 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i583dxKE021437 for ; Tue, 8 Jun 2004 03:39:59 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i583dx0s021433 for perforce@freebsd.org; Tue, 8 Jun 2004 03:39:59 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 03:39:59 GMT Message-Id: <200406080339.i583dx0s021433@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 03:40:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=54392 Change 54392 by jmallett@jmallett_oingo on 2004/06/08 03:39:47 Enable interrupts in configure() Affected files ... .. //depot/projects/mips/sys/mips/mips/autoconf.c#3 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/autoconf.c#3 (text+ko) ==== @@ -43,4 +43,8 @@ nexusdev = device_add_child(root_bus, "nexus", 0); platform_configure(); root_bus_configure(); + + /* Enable interrupts. */ + cold = 0; + mips_wr_status(mips_rd_status() | MIPS_SR_INT_IE); } From owner-p4-projects@FreeBSD.ORG Tue Jun 8 03:41:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5049016A4D1; Tue, 8 Jun 2004 03:41:02 +0000 (GMT) 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 2B39F16A4CE for ; Tue, 8 Jun 2004 03:41:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C9FA43D1D for ; Tue, 8 Jun 2004 03:41:02 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i583f1As021554 for ; Tue, 8 Jun 2004 03:41:01 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i583f11q021551 for perforce@freebsd.org; Tue, 8 Jun 2004 03:41:01 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 03:41:01 GMT Message-Id: <200406080341.i583f11q021551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 03:41:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=54393 Change 54393 by jmallett@jmallett_oingo on 2004/06/08 03:40:05 Just enable our interrupt, configure() will do IE. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/clock.c#7 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/clock.c#7 (text+ko) ==== @@ -67,7 +67,8 @@ } tc_init(&sgimips_timecounter); mips_wr_compare(mips_rd_count() + curcpu()->ci_cycles_per_hz); - mips_wr_status(mips_rd_status() | MIPS_SR_INT_IE | MIPS_INT_MASK_5); + /* XXX intr_establish? */ + mips_wr_status(mips_rd_status() | MIPS_INT_MASK_5); } void From owner-p4-projects@FreeBSD.ORG Tue Jun 8 05:39:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38CDA16A4D1; Tue, 8 Jun 2004 05:39:25 +0000 (GMT) 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 124BE16A4CE for ; Tue, 8 Jun 2004 05:39:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8F8443D46 for ; Tue, 8 Jun 2004 05:39:24 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i585dO3H053452 for ; Tue, 8 Jun 2004 05:39:24 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i585dOxm053449 for perforce@freebsd.org; Tue, 8 Jun 2004 05:39:24 GMT (envelope-from scottl@freebsd.org) Date: Tue, 8 Jun 2004 05:39:24 GMT Message-Id: <200406080539.i585dOxm053449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 05:39:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=54394 Change 54394 by scottl@scottl-esp-sparc64 on 2004/06/08 05:39:06 Turn off debugging in esp_sbus Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#14 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#14 (text+ko) ==== @@ -64,7 +64,7 @@ #include #include -#define ESP_SBUS_DEBUG +/* #define ESP_SBUS_DEBUG */ struct esp_softc { struct ncr53c9x_softc sc_ncr53c9x; /* glue to MI code */ From owner-p4-projects@FreeBSD.ORG Tue Jun 8 05:40:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C9F016A507; Tue, 8 Jun 2004 05:40:27 +0000 (GMT) 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 C0FC416A504 for ; Tue, 8 Jun 2004 05:40:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2F6E43D45 for ; Tue, 8 Jun 2004 05:40:26 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i585eQ1l053530 for ; Tue, 8 Jun 2004 05:40:26 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i585eQmf053527 for perforce@freebsd.org; Tue, 8 Jun 2004 05:40:26 GMT (envelope-from scottl@freebsd.org) Date: Tue, 8 Jun 2004 05:40:26 GMT Message-Id: <200406080540.i585eQmf053527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 05:40:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=54395 Change 54395 by scottl@scottl-esp-sparc64 on 2004/06/08 05:40:09 Turn off debugging in ncr53c9xvar.h Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#10 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#10 (text+ko) ==== @@ -72,7 +72,7 @@ #include /* Set this to 1 for normal debug, or 2 for per-target tracing. */ -#define NCR53C9X_DEBUG 2 +/* #define NCR53C9X_DEBUG 2 */ /* Wide or differential can have 16 targets */ #define NCR_NLUN 8 From owner-p4-projects@FreeBSD.ORG Tue Jun 8 05:43:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4970316A4D1; Tue, 8 Jun 2004 05:43:31 +0000 (GMT) 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 1E9DE16A4CE for ; Tue, 8 Jun 2004 05:43:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00C2043D53 for ; Tue, 8 Jun 2004 05:43:31 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i585hUgQ055375 for ; Tue, 8 Jun 2004 05:43:30 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i585hUZO055372 for perforce@freebsd.org; Tue, 8 Jun 2004 05:43:30 GMT (envelope-from scottl@freebsd.org) Date: Tue, 8 Jun 2004 05:43:30 GMT Message-Id: <200406080543.i585hUZO055372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 05:43:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=54396 Change 54396 by scottl@scottl-esp-sparc64 on 2004/06/08 05:42:46 De-hackify XPT_PATH_INQ and add a somewhat correct implementation for XPT_CALC_GEOMETRY and XPT_GET_TRANS_SETTINGS. Add default stubs for other ops. Set the CCB status to CAM_REQ_CMP when a command completes successfully from the phase engine. This allows the driver to start doing i/o, though it is only at async-narrow. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#14 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#14 (text+ko) ==== @@ -824,21 +824,28 @@ switch (ccb->ccb_h.func_code) { case XPT_RESET_DEV: - break; + ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; + mtx_unlock(&sc->sc_lock); + xpt_done(ccb); + return; case XPT_CALC_GEOMETRY: - break; + mtx_unlock(&sc->sc_lock); + cam_calc_geometry(&ccb->ccg, 0); /* XXX Extended? */ + xpt_done(ccb); + return; case XPT_PATH_INQ: { struct ccb_pathinq *cpi = &ccb->cpi; cpi->version_num = 1; - cpi->hba_inquiry = PI_WIDE_16; + cpi->hba_inquiry = + (sc->sc_rev == NCR_VARIANT_FAS366) ? PI_WIDE_16 : 0; cpi->target_sprt = 0; cpi->hba_misc = 0; cpi->hba_eng_cnt = 0; - cpi->max_target = 15; + cpi->max_target = sc->sc_ntarg - 1; cpi->max_lun = 8; - cpi->initiator_id = 7; + cpi->initiator_id = sc->sc_id; cpi->bus_id = 0; cpi->base_transfer_speed = 3300; strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); @@ -851,11 +858,36 @@ return; } case XPT_GET_TRAN_SETTINGS: - break; + { + struct ccb_trans_settings *cts = &ccb->cts; + struct ncr53c9x_tinfo *ti; + + ti = &sc->sc_tinfo[ccb->ccb_h.target_id]; + + cts->sync_period = ti->period; + cts->sync_offset = ti->offset; + cts->bus_width = ti->width; + cts->flags &= ~(CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB); + cts->valid = CCB_TRANS_BUS_WIDTH_VALID | + CCB_TRANS_SYNC_RATE_VALID | + CCB_TRANS_SYNC_OFFSET_VALID | + CCB_TRANS_DISC_VALID | + CCB_TRANS_TQ_VALID; + ccb->ccb_h.status = CAM_REQ_CMP; + mtx_unlock(&sc->sc_lock); + xpt_done(ccb); + return; + } case XPT_ABORT: - break; + ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; + mtx_unlock(&sc->sc_lock); + xpt_done(ccb); + return; case XPT_TERM_IO: - break; + ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; + mtx_unlock(&sc->sc_lock); + xpt_done(ccb); + return; case XPT_SCSI_IO: case XPT_RESET_BUS: { @@ -917,6 +949,11 @@ break; } + case XPT_SET_TRAN_SETTINGS: + ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; + mtx_unlock(&sc->sc_lock); + xpt_done(ccb); + return; #if 0 case XPT_SET_TRAN_SETTINGS: { @@ -2321,6 +2358,7 @@ goto sched; case NCR_CMDCOMPLETE: + ecb->ccb->ccb_h.status = CAM_REQ_CMP; goto finish; } } From owner-p4-projects@FreeBSD.ORG Tue Jun 8 05:45:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E5E016A4D2; Tue, 8 Jun 2004 05:45:34 +0000 (GMT) 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 360C116A4D0 for ; Tue, 8 Jun 2004 05:45:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E58D43D31 for ; Tue, 8 Jun 2004 05:45:34 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i585jYii055609 for ; Tue, 8 Jun 2004 05:45:34 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i585jXP5055606 for perforce@freebsd.org; Tue, 8 Jun 2004 05:45:33 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 05:45:33 GMT Message-Id: <200406080545.i585jXP5055606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 05:45:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=54397 Change 54397 by jmallett@jmallett_oingo on 2004/06/08 05:44:38 Stop trying to be cute. Set up RA and S0 (translated silently to A0) instead of trying a stupid savectx trick. Affected files ... .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#15 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#15 (text+ko) ==== @@ -126,9 +126,8 @@ void cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) { - if (savectx(td->td_pcb)) { - (*func)(arg); - } + td->td_pcb->pcb_regs[10] = (register_t)func; + td->td_pcb->pcb_regs[0] = (register_t)arg; } void From owner-p4-projects@FreeBSD.ORG Tue Jun 8 05:46:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B85BA16A4D2; Tue, 8 Jun 2004 05:46:39 +0000 (GMT) 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 915E316A4CE for ; Tue, 8 Jun 2004 05:46:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 715D543D39 for ; Tue, 8 Jun 2004 05:46:39 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i585kZdt055786 for ; Tue, 8 Jun 2004 05:46:35 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i585kZt0055783 for perforce@freebsd.org; Tue, 8 Jun 2004 05:46:35 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 05:46:35 GMT Message-Id: <200406080546.i585kZt0055783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 05:46:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=54398 Change 54398 by jmallett@jmallett_oingo on 2004/06/08 05:45:35 Get rid of one more bogus indirection. Affected files ... .. //depot/projects/mips/sys/mips/include/pcb.h#6 edit .. //depot/projects/mips/sys/mips/include/reg.h#7 edit .. //depot/projects/mips/sys/mips/mips/genassym.c#12 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pcb.h#6 (text+ko) ==== @@ -37,6 +37,8 @@ __register_t pcb_regs[12]; }; +typedef struct pcb label_t; + #ifdef _KERNEL #define PCB_FSR(pcb) (0) ==== //depot/projects/mips/sys/mips/include/reg.h#7 (text+ko) ==== @@ -41,10 +41,6 @@ long long r_regs[33]; }; -typedef struct cswx { - __register_t val[12]; -} label_t; - /* * Registers for a debugger by way of procfs or ptrace. */ ==== //depot/projects/mips/sys/mips/mips/genassym.c#12 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include +#include #include ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); @@ -167,18 +168,18 @@ ASSYM(TF_PPL, offsetof(struct trapframe, tf_ppl)); ASSYM(CTXSWFRAME_SIZ, sizeof(label_t)); -ASSYM(SF_REG_SR, offsetof(label_t, val[11])); -ASSYM(SF_REG_RA, offsetof(label_t, val[10])); -ASSYM(SF_REG_S0, offsetof(label_t, val[0])); -ASSYM(SF_REG_S1, offsetof(label_t, val[1])); -ASSYM(SF_REG_S2, offsetof(label_t, val[2])); -ASSYM(SF_REG_S3, offsetof(label_t, val[3])); -ASSYM(SF_REG_S4, offsetof(label_t, val[4])); -ASSYM(SF_REG_S5, offsetof(label_t, val[5])); -ASSYM(SF_REG_S6, offsetof(label_t, val[6])); -ASSYM(SF_REG_S7, offsetof(label_t, val[7])); -ASSYM(SF_REG_SP, offsetof(label_t, val[8])); -ASSYM(SF_REG_S8, offsetof(label_t, val[9])); +ASSYM(SF_REG_SR, offsetof(label_t, pcb_regs[11])); +ASSYM(SF_REG_RA, offsetof(label_t, pcb_regs[10])); +ASSYM(SF_REG_S0, offsetof(label_t, pcb_regs[0])); +ASSYM(SF_REG_S1, offsetof(label_t, pcb_regs[1])); +ASSYM(SF_REG_S2, offsetof(label_t, pcb_regs[2])); +ASSYM(SF_REG_S3, offsetof(label_t, pcb_regs[3])); +ASSYM(SF_REG_S4, offsetof(label_t, pcb_regs[4])); +ASSYM(SF_REG_S5, offsetof(label_t, pcb_regs[5])); +ASSYM(SF_REG_S6, offsetof(label_t, pcb_regs[6])); +ASSYM(SF_REG_S7, offsetof(label_t, pcb_regs[7])); +ASSYM(SF_REG_SP, offsetof(label_t, pcb_regs[8])); +ASSYM(SF_REG_S8, offsetof(label_t, pcb_regs[9])); ASSYM(VM_MIN_ADDRESS, VM_MIN_ADDRESS); ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS); From owner-p4-projects@FreeBSD.ORG Tue Jun 8 05:46:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E13CC16A4EA; Tue, 8 Jun 2004 05:46:39 +0000 (GMT) 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 99E9D16A4D1 for ; Tue, 8 Jun 2004 05:46:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F67D43D41 for ; Tue, 8 Jun 2004 05:46:39 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i585ka6X055792 for ; Tue, 8 Jun 2004 05:46:36 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i585kaa4055789 for perforce@freebsd.org; Tue, 8 Jun 2004 05:46:36 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 05:46:36 GMT Message-Id: <200406080546.i585kaa4055789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 05:46:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=54399 Change 54399 by jmallett@jmallett_oingo on 2004/06/08 05:46:09 Notes to self on lessons not to be learned from Alpha. Affected files ... .. //depot/projects/mips/sys/mips/mips/trap.c#19 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/trap.c#19 (text+ko) ==== @@ -117,9 +117,16 @@ return (tf); case TrInt: platform_trap_exit(); - atomic_add_int(&curthread->td_intr_nesting_level, 1); +#if 0 + /* + * It looks like these break interrupt preemption. + */ + critical_enter(); +#endif platform_intr(tf); - atomic_subtract_int(&curthread->td_intr_nesting_level, 1); +#if 0 + critical_exit(); +#endif if (curthread) tf = curthread->td_frame; return (tf); From owner-p4-projects@FreeBSD.ORG Tue Jun 8 05:52:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C640B16A4D1; Tue, 8 Jun 2004 05:52:44 +0000 (GMT) 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 A0E3116A4CE for ; Tue, 8 Jun 2004 05:52:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98EBD43D39 for ; Tue, 8 Jun 2004 05:52:44 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i585qirO057682 for ; Tue, 8 Jun 2004 05:52:44 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i585qi9k057679 for perforce@freebsd.org; Tue, 8 Jun 2004 05:52:44 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 05:52:44 GMT Message-Id: <200406080552.i585qi9k057679@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 05:52:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=54400 Change 54400 by jmallett@jmallett_oingo on 2004/06/08 05:51:56 Kick SYSINIT debugging to the curb, I don't need it always right now, and it uglies up my dmesg. Affected files ... .. //depot/projects/mips/sys/kern/init_main.c#18 edit Differences ... ==== //depot/projects/mips/sys/kern/init_main.c#18 (text+ko) ==== @@ -208,9 +208,6 @@ if ((*sipp)->subsystem == SI_SUB_DONE) continue; - if (bootverbose) - printf("SYSINIT[%08x] order %08x = (func %p %p)\n", (*sipp)->subsystem, (*sipp)->order, (*sipp)->func, (*sipp)->udata); - /* Call function */ (*((*sipp)->func))((*sipp)->udata); From owner-p4-projects@FreeBSD.ORG Tue Jun 8 05:57:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B87116A4D1; Tue, 8 Jun 2004 05:57:54 +0000 (GMT) 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 2450016A4CE for ; Tue, 8 Jun 2004 05:57:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B08343D31 for ; Tue, 8 Jun 2004 05:57:54 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i585vqgI057840 for ; Tue, 8 Jun 2004 05:57:52 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i585voa4057837 for perforce@freebsd.org; Tue, 8 Jun 2004 05:57:50 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 05:57:50 GMT Message-Id: <200406080557.i585voa4057837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 05:57:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=54401 Change 54401 by jmallett@jmallett_oingo on 2004/06/08 05:57:30 IFC. Affected files ... .. //depot/projects/mips/UPDATING#19 integrate .. //depot/projects/mips/bin/test/test.1#3 integrate .. //depot/projects/mips/etc/bluetooth/hcsecd.conf#2 integrate .. //depot/projects/mips/etc/csh.login#2 integrate .. //depot/projects/mips/etc/defaults/pccard.conf#9 integrate .. //depot/projects/mips/etc/devd.conf#8 integrate .. //depot/projects/mips/etc/devfs.conf#2 integrate .. //depot/projects/mips/etc/disktab#2 integrate .. //depot/projects/mips/etc/gettytab#3 integrate .. //depot/projects/mips/etc/hosts.allow#2 integrate .. //depot/projects/mips/etc/inetd.conf#8 integrate .. //depot/projects/mips/etc/isdn/isdnd.rates.D#2 integrate .. //depot/projects/mips/etc/isdn/isdnd.rates.F#2 integrate .. //depot/projects/mips/etc/isdn/isdnd.rates.L#2 integrate .. //depot/projects/mips/etc/isdn/isdnd.rc.sample#2 integrate .. //depot/projects/mips/etc/isdn/unknown_incoming#2 integrate .. //depot/projects/mips/etc/login.access#2 integrate .. //depot/projects/mips/etc/login.conf#2 integrate .. //depot/projects/mips/etc/mail/Makefile#4 integrate .. //depot/projects/mips/etc/namedb/named.conf#4 integrate .. //depot/projects/mips/etc/namedb/named.root#4 integrate .. //depot/projects/mips/etc/network.subr#4 integrate .. //depot/projects/mips/etc/pam.d/README#3 integrate .. //depot/projects/mips/etc/pam.d/convert.pl#2 integrate .. //depot/projects/mips/etc/pccard_ether#7 integrate .. //depot/projects/mips/etc/pf.os#2 integrate .. //depot/projects/mips/etc/printcap#3 integrate .. //depot/projects/mips/etc/profile#2 integrate .. //depot/projects/mips/etc/rc#9 integrate .. //depot/projects/mips/etc/rc.d/initdiskless#8 integrate .. //depot/projects/mips/etc/rc.d/preseedrandom#2 integrate .. //depot/projects/mips/etc/rc.shutdown#3 integrate .. //depot/projects/mips/etc/rc.subr#12 integrate .. //depot/projects/mips/etc/remote#5 integrate .. //depot/projects/mips/etc/rpc#2 integrate .. //depot/projects/mips/etc/termcap.small#2 integrate .. //depot/projects/mips/include/wchar.h#7 integrate .. //depot/projects/mips/lib/libarchive/archive.h#6 integrate .. //depot/projects/mips/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/mips/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/mips/lib/libc/gen/signal.3#6 integrate .. //depot/projects/mips/lib/libc/sys/sigaction.2#8 integrate .. //depot/projects/mips/lib/libc/sys/wait.2#3 integrate .. //depot/projects/mips/lib/libpthread/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/mips/lib/msun/Makefile#4 integrate .. //depot/projects/mips/lib/msun/alpha/fenv.c#1 branch .. //depot/projects/mips/lib/msun/alpha/fenv.h#1 branch .. //depot/projects/mips/lib/msun/amd64/fenv.c#1 branch .. //depot/projects/mips/lib/msun/amd64/fenv.h#1 branch .. //depot/projects/mips/lib/msun/arm/fenv.c#1 branch .. //depot/projects/mips/lib/msun/arm/fenv.h#1 branch .. //depot/projects/mips/lib/msun/i387/fenv.c#1 branch .. //depot/projects/mips/lib/msun/i387/fenv.h#1 branch .. //depot/projects/mips/lib/msun/ia64/fenv.c#1 branch .. //depot/projects/mips/lib/msun/ia64/fenv.h#1 branch .. //depot/projects/mips/lib/msun/man/feclearexcept.3#1 branch .. //depot/projects/mips/lib/msun/man/fegetenv.3#1 branch .. //depot/projects/mips/lib/msun/man/fegetround.3#1 branch .. //depot/projects/mips/lib/msun/man/fenv.3#1 branch .. //depot/projects/mips/lib/msun/man/round.3#1 branch .. //depot/projects/mips/lib/msun/powerpc/fenv.c#1 branch .. //depot/projects/mips/lib/msun/powerpc/fenv.h#1 branch .. //depot/projects/mips/lib/msun/sparc64/fenv.c#1 branch .. //depot/projects/mips/lib/msun/sparc64/fenv.h#1 branch .. //depot/projects/mips/lib/msun/src/math.h#12 integrate .. //depot/projects/mips/lib/msun/src/s_round.c#1 branch .. //depot/projects/mips/lib/msun/src/s_roundf.c#1 branch .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/install.sgml#8 integrate .. //depot/projects/mips/share/man/man3/fpgetround.3#3 integrate .. //depot/projects/mips/share/man/man4/acpi.4#13 integrate .. //depot/projects/mips/share/man/man7/tuning.7#7 integrate .. //depot/projects/mips/share/man/man9/Makefile#21 integrate .. //depot/projects/mips/share/man/man9/ifnet.9#8 integrate .. //depot/projects/mips/share/termcap/termcap.src#8 integrate .. //depot/projects/mips/sys/alpha/alpha/support.s#5 integrate .. //depot/projects/mips/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/mips/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/mips/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/mips/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/mips/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/mips/sys/amd64/amd64/mpboot.S#3 integrate .. //depot/projects/mips/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/mips/sys/amd64/include/md_var.h#7 integrate .. //depot/projects/mips/sys/amd64/include/param.h#4 integrate .. //depot/projects/mips/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/mips/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/mips/sys/arm/arm/exception.S#2 integrate .. //depot/projects/mips/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/mips/sys/arm/arm/locore.S#2 integrate .. //depot/projects/mips/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/mips/sys/conf/NOTES#27 integrate .. //depot/projects/mips/sys/conf/files#31 integrate .. //depot/projects/mips/sys/dev/acpica/acpi.c#20 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pci.c#6 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pcib.c#8 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_powerres.c#7 integrate .. //depot/projects/mips/sys/dev/ciss/ciss.c#17 integrate .. //depot/projects/mips/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/mips/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/mips/sys/dev/sio/sio_pci.c#7 integrate .. //depot/projects/mips/sys/dev/sound/pcm/sound.c#11 integrate .. //depot/projects/mips/sys/dev/usb/uftdi.c#11 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#24 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#23 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#23 integrate .. //depot/projects/mips/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/mips/sys/i386/i386/swtch.s#8 integrate .. //depot/projects/mips/sys/i386/isa/npx.c#11 integrate .. //depot/projects/mips/sys/kern/kern_intr.c#16 integrate .. //depot/projects/mips/sys/kern/kern_kse.c#1 branch .. //depot/projects/mips/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#21 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#21 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#26 integrate .. //depot/projects/mips/sys/kern/subr_bus.c#14 integrate .. //depot/projects/mips/sys/kern/tty.c#15 integrate .. //depot/projects/mips/sys/kern/tty_conf.c#4 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/mips/sys/kern/vfs_syscalls.c#19 integrate .. //depot/projects/mips/sys/net/if_sl.c#11 integrate .. //depot/projects/mips/sys/netgraph/ng_message.h#6 integrate .. //depot/projects/mips/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/mips/sys/pc98/pc98/clock.c#10 integrate .. //depot/projects/mips/sys/pc98/pc98/mse.c#7 integrate .. //depot/projects/mips/sys/pc98/pc98/olpt.c#7 integrate .. //depot/projects/mips/sys/pc98/pc98/pc98gdc.c#7 integrate .. //depot/projects/mips/sys/pc98/pc98/ppc.c#5 integrate .. //depot/projects/mips/sys/sparc64/include/asmacros.h#5 integrate .. //depot/projects/mips/sys/sys/linedisc.h#2 integrate .. //depot/projects/mips/sys/sys/systm.h#13 integrate .. //depot/projects/mips/sys/vm/vm_page.h#11 integrate .. //depot/projects/mips/sys/vm/vm_pageq.c#6 integrate .. //depot/projects/mips/tools/tools/tinderbox/tbmaster.pl#11 integrate .. //depot/projects/mips/usr.bin/printf/printf.1#2 integrate .. //depot/projects/mips/usr.bin/printf/printf.c#3 integrate .. //depot/projects/mips/usr.bin/tar/bsdtar.1#2 integrate .. //depot/projects/mips/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/mips/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/mips/usr.bin/tar/read.c#2 integrate .. //depot/projects/mips/usr.bin/tar/write.c#2 integrate .. //depot/projects/mips/usr.bin/top/machine.c#4 integrate .. //depot/projects/mips/usr.sbin/IPXrouted/IPXrouted.8#5 integrate .. //depot/projects/mips/usr.sbin/acpi/acpidb/acpidb.8#2 integrate .. //depot/projects/mips/usr.sbin/adduser/adduser.8#10 integrate .. //depot/projects/mips/usr.sbin/adduser/adduser.sh#10 integrate .. //depot/projects/mips/usr.sbin/crunch/crunchide/exec_elf32.c#8 integrate .. //depot/projects/mips/usr.sbin/jail/jail.8#11 integrate .. //depot/projects/mips/usr.sbin/lpr/lpr/printcap.5#5 integrate .. //depot/projects/mips/usr.sbin/ndp/ndp.8#6 integrate .. //depot/projects/mips/usr.sbin/newsyslog/newsyslog.c#10 integrate .. //depot/projects/mips/usr.sbin/newsyslog/ptimes.c#2 integrate .. //depot/projects/mips/usr.sbin/nghook/nghook.8#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/add/pkg_add.1#6 integrate .. //depot/projects/mips/usr.sbin/setkey/setkey.8#6 integrate .. //depot/projects/mips/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/mips/usr.sbin/wicontrol/wicontrol.8#11 integrate Differences ... ==== //depot/projects/mips/UPDATING#19 (text+ko) ==== @@ -17,6 +17,10 @@ developers choose to disable these features on build machines to maximize performance. +20040607: + Splitting kern_thread.c into 2 files (adding kern_kse.c) + requires that you re-run config after updating your tree. + 20040601: The MIDI drivers have been removed. Until the new module-friendly ones are merged, remove or comment out midi and seq from your @@ -1607,4 +1611,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.308 2004/06/04 15:24:12 tanimura Exp $ +$FreeBSD: src/UPDATING,v 1.309 2004/06/07 21:37:40 julian Exp $ ==== //depot/projects/mips/bin/test/test.1#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.18 2004/04/06 20:06:54 markm Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.20 2004/06/07 12:47:31 yar Exp $ .\" .Dd May 31, 1993 .Dt TEST 1 @@ -210,11 +210,6 @@ comes after .Ar \&s\&2 based on the ASCII value of their characters. -.It Ar \&s\&1 -True if -.Ar \&s\&1 -is not the null -string. .It Ar \&n\&1 Fl \&eq Ar \&n\&2 True if the integers .Ar \&n\&1 @@ -255,6 +250,17 @@ .Ar \&n\&2 . .El .Pp +If +.Ar file +is a symbolic link, +.Nm +will fully dereference it and then evaluate the expression +against the file referenced, except for the +.Fl h +and +.Fl L +primaries. +.Pp These primaries can be combined with the following operators: .Bl -tag -width Ar .It Cm \&! Ar expression @@ -315,7 +321,8 @@ .Sh SEE ALSO .Xr builtin 1 , .Xr expr 1 , -.Xr sh 1 +.Xr sh 1 , +.Xr symlink 7 .Sh STANDARDS The .Nm ==== //depot/projects/mips/etc/bluetooth/hcsecd.conf#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $ -# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.1 2003/10/12 22:04:18 emax Exp $ +# $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.2 2004/06/06 11:46:28 schweikh Exp $ # # HCI security daemon configuration file # @@ -24,14 +24,14 @@ # local device received the request. Everything is based on remote # device BD_ADDR. # -# "nokey" means that no link key has been defined and we should +# "nokey" means that no link key has been defined and we should # send Link_Key_Negative_Reply command to the device. # -# "nopin" means that no PIN code has been defined and we should +# "nopin" means that no PIN code has been defined and we should # send PIN_Code_Negative_Reply command to the device # -# Default entry is applied if no better match found +# Default entry is applied if no better match found # It MUST have 00:00:00:00:00:00 as bdaddr device { bdaddr 00:00:00:00:00:00; ==== //depot/projects/mips/etc/csh.login#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/etc/csh.login,v 1.20 2000/07/27 11:39:33 asmodai Exp $ +# $FreeBSD: src/etc/csh.login,v 1.21 2004/06/06 11:46:27 schweikh Exp $ # # System-wide .login file for csh(1). -# Uncomment this to give you the default 4.2 behavior, where disk +# Uncomment this to give you the default 4.2 behavior, where disk # information is shown in K-Blocks # setenv BLOCKSIZE K -# +# # For the setting of languages and character sets please see # login.conf(5) and in particular the charset and lang options. # For full locales list check /usr/share/locale/* ==== //depot/projects/mips/etc/defaults/pccard.conf#9 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.268 2004/06/05 06:11:54 sanpei Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.269 2004/06/06 11:46:28 schweikh Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -243,7 +243,7 @@ card "PCMCIA" "CD-ROM" config 0x1 "ata" ? -# Novac DVD/CD Station +# Novac DVD/CD Station card "PCMCIA" "PnPIDE" config auto "ata" ? @@ -301,7 +301,7 @@ # Viking ATA Flash card card "/VIKING ATA/CF FLASH CARD */" "/TOR/AM */" config 0x2 "ata" ? - + ########## awi ########## # Generic AMD Am79c930 based card @@ -595,8 +595,8 @@ remove /etc/pccard_ether $device stop # Linksys Combo PCMCIA Ethernet Card -card "E-CARD" "E-CARD" - config auto "ed" ? +card "E-CARD" "E-CARD" + config auto "ed" ? logstr "Linksys Combo Ethernet Card" insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -610,7 +610,7 @@ # XXX Compex Net-A adapter, Telecom SuperSocket RE450T, # Apollo PCMCIA Ethernet Adapter, PLANEX ENW-3503-T and # Fiber line 10M Ethernet COMBO have same manufacturer and -# card version string. They should be distinguished by +# card version string. They should be distinguished by # other info. (such as additional information or OEM-ID/product-ID). # Note: There are several revisions of the card on the market. @@ -762,9 +762,9 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop -# Linksys Combo PCMCIA EthernetCard (model EC2T on box) +# Linksys Combo PCMCIA EthernetCard (model EC2T on box) card "Linksys" "Combo PCMCIA EthernetCard (EC2T)" - config auto "ed" ? + config auto "ed" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -959,7 +959,7 @@ # GVC 10Mbps Ethernet Card card "PCMCIA" "Ethernet Card" config auto "ed" ? - logstr "Generic PCMCIA Ethernet Card" + logstr "Generic PCMCIA Ethernet Card" insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -1387,9 +1387,9 @@ card "ADVANTECH" "COMpad-32/85" config auto "sio" ? 0x330 -# Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. -card "AD PC_CARD" "RC288ACL" - config auto "sio" ? +# Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. +card "AD PC_CARD" "RC288ACL" + config auto "sio" ? # AIWA PV-JF288 card "AIWA CO.,LTD." "/PV-JF288 */" @@ -1506,7 +1506,7 @@ config 0x27 "sio" ? # config auto "sio" ? -# Motorola Montana +# Motorola Montana card "Motorola" "MONTANA 33.6 FAX/MODEM" config auto "sio" ? @@ -1589,7 +1589,7 @@ card "PCCardModem" "CardModem 56" config auto "sio" ? -# Eiger PCCARD modem +# Eiger PCCARD modem # Apparently this modem does not work unless the recommended # init string (AT&F&C1&D2) is supplied. card "/PCMCIA */" "/33\.6K Fax/Modem */" @@ -1703,7 +1703,7 @@ card "PC CARD" "56Kbps Fax Modem PC Card" config auto "sio" ? -# Zoom 56K modem +# Zoom 56K modem # Freezes your system entirely if you don't have the reset.. card "Zoom Telephonics, Inc." "PCMCIA 56K LT DataFax" config auto "sio" ? @@ -1768,7 +1768,7 @@ # RATOC REX-5536AM, REX-9836A, ICM PSC-2401 SCSI # There's a buggy revision of this card which has broken CIS tupples. -# If you can't use this card, change config entry from `auto' to +# If you can't use this card, change config entry from `auto' to # `default' and try the point enabler. (for example, # type "pccardc enabler 0 stg0 -a 0x4140 -i 5" from root command prompt) card "PCMCIA SCSI MBH10404" "01" @@ -1845,7 +1845,7 @@ # Actiontec PRISM wireless card "ACTIONTEC" "PRISM Wireless LAN PC Card" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -1881,13 +1881,13 @@ # Belkin wireless card card "Belkin" "11Mbps Wireless Notebook Network Adapter" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop # Benq AWL100 wireless 11 Mbps pcmcia card card "BENQ" "AWL100 PCMCIA ADAPTER" - config auto "wi" ? + config auto "wi" ? insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop @@ -2188,7 +2188,7 @@ card "T-Sinus" "130card" config auto "wi" ? insert /etc/pccard_ether $device start - remove /etc/pccard_ether $device stop + remove /etc/pccard_ether $device stop # TDK LAK-CD011WL card "TDK" "LAK-CD011WL for Wireless LAN" @@ -2323,9 +2323,9 @@ remove /etc/pccard_ether $device stop # ------------------------------------------------------------------- -# +# # "Wildcard" entries -# +# # ------------------------------------------------------------------- # GENERIC PCMCIA modem ==== //depot/projects/mips/etc/devd.conf#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.12 2004/03/13 05:16:42 cperciva Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.13 2004/06/06 11:46:27 schweikh Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -17,7 +17,7 @@ pid-file "/var/run/devd.pid"; # Setup some shorthand for regex that we use later in the file. - set ethernet-nic-regex + set ethernet-nic-regex "(an|ar|ath|aue|awi|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|ep|\ ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\ sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+"; ==== //depot/projects/mips/etc/devfs.conf#2 (text+ko) ==== @@ -1,7 +1,6 @@ - # Copyright (c) 2003 The FreeBSD Project # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -10,7 +9,7 @@ # 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 @@ -22,8 +21,8 @@ # 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/etc/devfs.conf,v 1.1 2003/05/06 01:10:33 dougb Exp $ +# +# $FreeBSD: src/etc/devfs.conf,v 1.2 2004/06/06 11:46:27 schweikh Exp $ # These are examples of how to configure devices using /etc/rc.d/devfs. # The first parameter is always the action to take, the second is always the @@ -44,4 +43,3 @@ # Allow members of group operator to cat things to the speaker #own speaker root:operator #perm speaker 0660 - ==== //depot/projects/mips/etc/disktab#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/disktab,v 1.24 2003/04/02 20:16:02 ru Exp $ +# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $ # -# Disk geometry and partition layout tables. +# Disk geometry and partition layout tables. # Key: # dt controller type # ty type of disk (fixed, removeable, simulated) @@ -122,7 +122,7 @@ :pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\ :pb#15748:ob#15748:tb=swap:\ :pc#288750:oc#0:\ - :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD: + :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD: cp3100|Connor Peripherals 100MB IDE:\ :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \ ==== //depot/projects/mips/etc/gettytab#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/gettytab,v 1.21 2003/09/09 15:37:19 yar Exp $ +# $FreeBSD: src/etc/gettytab,v 1.22 2004/06/06 11:46:27 schweikh Exp $ # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 # # Most of the table entries here are just copies of the old getty table, @@ -205,7 +205,7 @@ autologin|al.9600:\ :al=root:tc=std.9600: -# +# # Entries for 3-wire serial terminals. These don't supply carrier, so # clocal needs to be set, and crtscts needs to be unset. # ==== //depot/projects/mips/etc/hosts.allow#2 (text+ko) ==== @@ -1,18 +1,18 @@ # # hosts.allow access control file for "tcp wrapped" applications. -# $FreeBSD: src/etc/hosts.allow,v 1.16 2002/02/06 20:39:36 markm Exp $ +# $FreeBSD: src/etc/hosts.allow,v 1.17 2004/06/06 11:46:27 schweikh Exp $ # # NOTE: The hosts.deny file is deprecated. # Place both 'allow' and 'deny' rules in the hosts.allow file. # See hosts_options(5) for the format of this file. # hosts_access(5) no longer fully applies. -# _____ _ _ +# _____ _ _ # | ____| __ __ __ _ _ __ ___ _ __ | | ___ | | # | _| \ \/ / / _` | | '_ ` _ \ | '_ \ | | / _ \ | | # | |___ > < | (_| | | | | | | | | |_) | | | | __/ |_| # |_____| /_/\_\ \__,_| |_| |_| |_| | .__/ |_| \___| (_) -# |_| +# |_| # !!! This is an example! You will need to modify it for your specific # !!! requirements! @@ -24,7 +24,7 @@ # Wrapping sshd(8) is not normally a good idea, but if you # need to do it, here's how -#sshd : .evil.cracker.example.com : deny +#sshd : .evil.cracker.example.com : deny # Protect against simple DNS spoofing attacks by checking that the # forward and reverse records for the remote host match. If a mismatch ==== //depot/projects/mips/etc/inetd.conf#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.68 2004/04/03 17:52:29 mlaier Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.69 2004/06/06 11:46:27 schweikh Exp $ # # Internet server configuration database # @@ -67,7 +67,7 @@ #rstatd/1-3 dgram rpc/udp wait root /usr/libexec/rpc.rstatd rpc.rstatd #rusersd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.rusersd rpc.rusersd #walld/1 dgram rpc/udp wait root /usr/libexec/rpc.rwalld rpc.rwalld -#pcnfsd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.pcnfsd rpc.pcnfsd +#pcnfsd/1-2 dgram rpc/udp wait root /usr/libexec/rpc.pcnfsd rpc.pcnfsd #rquotad/1 dgram rpc/udp wait root /usr/libexec/rpc.rquotad rpc.rquotad #sprayd/1 dgram rpc/udp wait root /usr/libexec/rpc.sprayd rpc.sprayd # ==== //depot/projects/mips/etc/isdn/isdnd.rates.D#2 (text+ko) ==== @@ -3,7 +3,7 @@ # i4b - Deutsche Telekom charging rates config file # ------------------------------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.3 1999/08/27 23:23:58 peter Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.D,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Sun Jan 17 18:38:29 1999] # @@ -25,7 +25,7 @@ # #=================== T-ISDN City ============================================================= # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- --------------- ra0 0 00.00-05.00:240 05.00-21.00:150 21.00-24.00:240 ra0 1 00.00-05.00:240 05.00-09.00:150 09.00-18.00:90 18.00-21.00:150 21.00-24.00:240 @@ -37,7 +37,7 @@ # #=================== T-ISDN Deutschland ====================================================== # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- --------------- ra1 0 00.00-24.00:60 ra1 1 00.00-02.00:60 02.00-05.00:120 05.00-09.00:60 09.00-18.00:30 18.00-24.00:60 ==== //depot/projects/mips/etc/isdn/isdnd.rates.F#2 (text+ko) ==== @@ -3,7 +3,7 @@ # i4b - Tarifs France Telecom # --------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.3 1999/08/27 23:23:58 peter Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.F,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Thu Mar 19 20:05:18 1998] # @@ -47,7 +47,7 @@ # #================== Zone 1 : < 25 km ================================== # -#rate-code Day rate1 rate2 rate3 +#rate-code Day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra1 0 00.00-24.00:222 ra1 1 00.00-08.00:222 08.00-19.00:111 19.00-24.00:222 @@ -61,8 +61,8 @@ # #================== Zone 2 : 25-30 km ================================= # -#rate-code Day rate1 rate2 rate3 -#--------- --- --------------- --------------- -------------- +#rate-code Day rate1 rate2 rate3 +#--------- --- --------------- --------------- -------------- ra2 0 00.00-24.00:148 ra2 1 00.00-08.00:148 08.00-19.00:74 19.00-24.00:148 ra2 2 00.00-08.00:148 08.00-19.00:74 19.00-24.00:148 @@ -73,7 +73,7 @@ # #=================== Zone 3 : 30-52 km ================================ # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra3 0 00.00-24.00:94 ra3 1 00.00-08.00:94 08.00-19.00:47 19.00-24.00:94 @@ -86,7 +86,7 @@ # #=================== Zone 4 : > 52 km ================================= # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra4 0 00.00-24.00:78 ra4 1 00.00-08.00:78 08.00-19.00:39 19.00-24.00:78 @@ -100,7 +100,7 @@ #=================== INTERNATIONAL : Allemagne ======================== # (pour appeler Hellmuth) # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra5 0 00.00-24.00:27 ra5 1 00.00-08.00:27 08.00-19.00:21 19.00-24.00:27 @@ -113,7 +113,7 @@ # #=================== INTERNATIONAL : Pays-Bas ========================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra6 0 00.00-24.00:25 ra6 1 00.00-08.00:25 08.00-19.00:20 19.00-24.00:25 @@ -126,7 +126,7 @@ # #=================== INTERNATIONAL : Portugal =========================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra7 0 00.00-24.00:22 ra7 1 00.00-08.00:22 08.00-19.00:18 19.00-24.00:22 @@ -139,7 +139,7 @@ # #=================== INTERNATIONAL : USA/Canada ======================== # -#rate-code day rate1 rate2 rate3 +#rate-code day rate1 rate2 rate3 #--------- --- --------------- --------------- --------------- ra8 0 00.00-24.00:25 ra8 1 00.00-13.00:25 13.00-19.00:20 19.00-24.00:25 ==== //depot/projects/mips/etc/isdn/isdnd.rates.L#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # $Id: isdnd.rates.L,v 1.2 1999/12/13 21:25:24 hm Exp $ # -# $FreeBSD: src/etc/isdn/isdnd.rates.L,v 1.1 1999/12/14 21:14:28 hm Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rates.L,v 1.2 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Mon Dec 13 21:42:33 1999] # @@ -26,7 +26,7 @@ # #------------------------------------------------------------------------------ # -#rate-code Day rate1 rate2 rate3 rate4 rate5 +#rate-code Day rate1 rate2 rate3 rate4 rate5 #--------- --- --------------- --------------- --------------- --------------- ---------------- ra0 0 00.00-24.00:960 ra0 1 00.00-06.00:960 06.00-08.00:480 08.00-19.00:240 19.00-23.00:480 23.00-24.00:960 ==== //depot/projects/mips/etc/isdn/isdnd.rc.sample#2 (text+ko) ==== @@ -3,7 +3,7 @@ # example of a configuration file for the isdn daemon # --------------------------------------------------- # -# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.3 2001/05/27 08:05:57 hm Exp $ +# $FreeBSD: src/etc/isdn/isdnd.rc.sample,v 1.4 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Sun May 27 09:33:59 2001] # @@ -35,14 +35,14 @@ monitor-allowed = no # global switch: monitor on/off monitor-port = 451 # default monitor TCP port -# Monitor rights are granted due to the most specific host/net spec, i.e. in +# Monitor rights are granted due to the most specific host/net spec, i.e. in # the example below host 192.168.1.2 will have the rights specified on that # line, even so it belongs to net 192.168.1.0/24 as well. # # A monitor specification may either be: # # - the name of a local (UNIX-domain) socket; this MUST start with a "/" -monitor = "/var/run/isdn-monitor" +monitor = "/var/run/isdn-monitor" monitor-access = fullcmd monitor-access = channelstate, logevents monitor-access = callin, callout @@ -92,7 +92,7 @@ #============================================================================== # entry section: IP over ISDN example - i call back the remote end #============================================================================== -entry +entry name = I4BIP # name for reference. This name will # be used in the logfile to identfy @@ -119,9 +119,9 @@ local-phone-dialout = 321 # this is my number remote-phone-dialout = 00123456789 # i call this remote number - # in case i have several remote - # telephone numbers specified, this - # is used to specify which one is + # in case i have several remote + # telephone numbers specified, this + # is used to specify which one is # used next on dial fail or retry: remdial-handling = first # first, last or next @@ -139,7 +139,7 @@ # specified for telephone answering b1protocol = hdlc # hdlc, raw - # shorthold mode and idle time + # shorthold mode and idle time # configuration: ratetype = 0 # ratesfile entry to use unitlength = 90 # unitlength to assume @@ -170,18 +170,18 @@ #============================================================================== # entry section: IP over ISDN example - i am called back by the remote end #============================================================================== -entry - +entry + name = I4BIP1 # name for reference - + usrdevicename = ipr # ipr, tel, rbch usrdeviceunit = 1 # unit number - + isdncontroller = 0 # controller to use or -1 to use any isdnchannel = -1 # channel (1/2) to use or 0 or -1 for any # numbers used to DIAL OUT -remote-phone-dialout = 00401234567 # remote number to dial +remote-phone-dialout = 00401234567 # remote number to dial local-phone-dialout = 38 # our number to tell remote # numbers used to verify at DIAL IN @@ -194,7 +194,7 @@ unitlength = 90 # default unit length earlyhangup = 5 # safety zone unitlengthsrc = aocd # none, rate, cmdl, conf, aocd - + dialin-reaction = accept # accept, reject, ignore, anwer, callback dialout-type = calledback # normal or calledback @@ -214,19 +214,19 @@ #============================================================================== # entry section: answering machine example #============================================================================== -entry +entry name = I4BTEL # name for reference usrdevicename = tel # ipr, tel, rbch usrdeviceunit = 0 # unit number - + isdncontroller = 0 # controller to use or -1 to use any isdnchannel = -1 # channel (1/2) to use or 0 or -1 for any # numbers used to verify at DIAL IN local-phone-incoming = 456 # this is my number remote-phone-incoming = * # anyone can call in - + dialin-reaction = answer # accept, reject, ignore, answer answerprog = answer # program to run @@ -238,15 +238,15 @@ #============================================================================== # kernel PPP (with budget handling) - Sunday & Holidays, we call back #============================================================================== -entry +entry valid = "0,7" # sundays & holidays name = KPPPs # name for reference - + usrdevicename = isp # ipr, tel, rbch usrdeviceunit = 0 # unit number - + isdncontroller = 1 # controller to use or -1 to use any isdnchannel = -1 # channel (1/2) to use or 0 or -1 for any @@ -259,7 +259,7 @@ remote-phone-dialout = 00401234567 # i call this number remdial-handling = first # first, last or next - + dialin-reaction = callback # accept, reject, ignore, answer, callback dialout-type = normal # normal / calledback @@ -295,15 +295,15 @@ #============================================================================== # kernel PPP (with budget handling) - Monday-Saturday, 9:00-18:00: we call back #============================================================================== -entry +entry valid = "1,2,3,4,5,6,9:00-18:00" # Monday-Saturday, day name = KPPPd # name for reference - + usrdevicename = isp # ipr, tel, rbch usrdeviceunit = 0 # unit number - + isdncontroller = 1 # controller to use or -1 to use any isdnchannel = -1 # channel (1/2) to use or 0 or -1 for any @@ -316,7 +316,7 @@ remote-phone-dialout = 00401234567 # i call this number remdial-handling = first # first, last or next - + dialin-reaction = callback # accept, reject, ignore, answer, callback dialout-type = normal # normal / calledback @@ -352,15 +352,15 @@ #============================================================================== # kernel PPP (with budget handling) - Monday-Saturday: we call back #============================================================================== -entry +entry valid = "1,2,3,4,5,6,18:00-9:00" # Monday-Saturday, night name = KPPPn # name for reference - + usrdevicename = isp # ipr, tel, rbch usrdeviceunit = 0 # unit number - + isdncontroller = 1 # controller to use or -1 to use any isdnchannel = -1 # channel (1/2) to use or 0 or -1 for any @@ -373,7 +373,7 @@ remote-phone-dialout = 00401234567 # i call this number remdial-handling = first # first, last or next - + dialin-reaction = callback # accept, reject, ignore, answer, callback dialout-type = normal # normal / calledback ==== //depot/projects/mips/etc/isdn/unknown_incoming#2 (text+ko) ==== @@ -4,12 +4,12 @@ # unknown_incoming - script for isdnd # ----------------------------------- # -# $FreeBSD: src/etc/isdn/unknown_incoming,v 1.2 2001/01/10 12:41:55 hm Exp $ +# $FreeBSD: src/etc/isdn/unknown_incoming,v 1.3 2004/06/06 11:46:28 schweikh Exp $ # # last edit-date: [Wed Jan 10 13:40:36 2001] # -# This script may be configured to be called by isdnd when an -# unknown incoming call is received. In case the destination +# This script may be configured to be called by isdnd when an +# unknown incoming call is received. In case the destination # telephone number is available, it sends mail with the time, # source and destination numbers to a configurable address. # @@ -75,5 +75,5 @@ the isdnd on $mach ENDOFDATA - + exit 0 ==== //depot/projects/mips/etc/login.access#2 (text+ko) ==== @@ -1,18 +1,18 @@ -# $FreeBSD: src/etc/login.access,v 1.3 1999/08/27 23:23:42 peter Exp $ +# $FreeBSD: src/etc/login.access,v 1.4 2004/06/06 11:46:27 schweikh Exp $ # # Login access control table. -# +# # When someone logs in, the table is scanned for the first entry that # matches the (user, host) combination, or, in case of non-networked # logins, the first entry that matches the (user, tty) combination. The -# permissions field of that table entry determines whether the login will +# permissions field of that table entry determines whether the login will # be accepted or refused. -# +# # Format of the login access control table is three fields separated by a # ":" character: -# +# # permission : users : origins -# +# # The first field should be a "+" (access granted) or "-" (access denied) # character. The second field should be a list of one or more login names, # group names, or ALL (always matches). The third field should be a list @@ -29,7 +29,7 @@ # listed: the program does not look at a user's primary group id value. # ############################################################################## -# +# # Disallow console logins to all but a few accounts. # #-:ALL EXCEPT wheel shutdown sync:console ==== //depot/projects/mips/etc/login.conf#2 (text+ko) ==== @@ -7,7 +7,7 @@ # This file controls resource limits, accounting limits and >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 8 06:35:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5991716A4D1; Tue, 8 Jun 2004 06:35:38 +0000 (GMT) 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 35CB016A4CE for ; Tue, 8 Jun 2004 06:35:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F06A43D2D for ; Tue, 8 Jun 2004 06:35:38 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i586ZbPN067023 for ; Tue, 8 Jun 2004 06:35:37 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i586ZbMP067020 for perforce@freebsd.org; Tue, 8 Jun 2004 06:35:37 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 06:35:37 GMT Message-Id: <200406080635.i586ZbMP067020@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 06:35:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=54402 Change 54402 by jmallett@jmallett_oingo on 2004/06/08 06:34:56 Catch up with de-PHKification. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#27 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#27 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#26 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#27 $ */ #include "opt_ddb.h" @@ -155,11 +155,9 @@ LEAF(CacheVector) .set noat - dla k0, __panic - li a0, 0 - li a1, 0 + dla k0, panic dmtc0 k0, MIPS_COP_0_EXC_PC - dla a2, 1f + dla a0, 1f eret .set at VEND(CacheVector) @@ -169,11 +167,9 @@ LEAF(TLBMissVector) .set noat - dla k0, __panic - li a0, 0 - li a1, 0 + dla k0, panic dmtc0 k0, MIPS_COP_0_EXC_PC - dla a2, 1f + dla a0, 1f eret .set at VEND(TLBMissVector) From owner-p4-projects@FreeBSD.ORG Tue Jun 8 07:02:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2473316A4D1; Tue, 8 Jun 2004 07:02:13 +0000 (GMT) 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 F0B6E16A4CE for ; Tue, 8 Jun 2004 07:02:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D60EF43D4C for ; Tue, 8 Jun 2004 07:02:12 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5872CCj072390 for ; Tue, 8 Jun 2004 07:02:12 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5872CCX072381 for perforce@freebsd.org; Tue, 8 Jun 2004 07:02:12 GMT (envelope-from scottl@freebsd.org) Date: Tue, 8 Jun 2004 07:02:12 GMT Message-Id: <200406080702.i5872CCX072381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 07:02:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=54405 Change 54405 by scottl@scottl-esp-sparc64 on 2004/06/08 07:01:17 Make XPT_SET_TRAN_SETTINGS work. The only thing left unconverted is ncr53c9x_update_xfer_mode(), and that seems to only involve doing an async callback back into the scsi layer. It's not clear to me if FreeBSD needs this. With this I can do sync transfers, but it's only at 6.25MHz, narrow, and untagged. It's unclear to me if this is normal given my existing hardware. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#15 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#15 (text+ko) ==== @@ -102,7 +102,7 @@ #include #include -int ncr53c9x_debug = NCR_SHOWMISC|NCR_SHOWPHASE|NCR_SHOWMISC|NCR_SHOWTRAC|NCR_SHOWCMDS; +int ncr53c9x_debug = NCR_SHOWMISC /* |NCR_SHOWPHASE|NCR_SHOWMISC|NCR_SHOWTRAC|NCR_SHOWCMDS */; #ifdef DEBUG int ncr53c9x_notag = 0; #endif @@ -867,7 +867,7 @@ cts->sync_period = ti->period; cts->sync_offset = ti->offset; cts->bus_width = ti->width; - cts->flags &= ~(CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB); + cts->flags |= CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB; cts->valid = CCB_TRANS_BUS_WIDTH_VALID | CCB_TRANS_SYNC_RATE_VALID | CCB_TRANS_SYNC_OFFSET_VALID | @@ -935,69 +935,70 @@ if (sc->sc_state == NCR_IDLE) ncr53c9x_sched(sc); -#if 0 - if ((flags & XS_CTL_POLL) == 0) - break; - - /* Not allowed to use interrupts, use polling instead */ - if (ncr53c9x_poll(sc, xs, ecb->timeout)) { - ncr53c9x_timeout(ecb); - if (ncr53c9x_poll(sc, xs, ecb->timeout)) - ncr53c9x_timeout(ecb); - } -#endif break; } case XPT_SET_TRAN_SETTINGS: - ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; - mtx_unlock(&sc->sc_lock); - xpt_done(ccb); - return; -#if 0 - case XPT_SET_TRAN_SETTINGS: { struct ncr53c9x_tinfo *ti; - struct scsipi_xfer_mode *xm = arg; + struct ccb_trans_settings *cts = &ccb->cts; + int target = ccb->ccb_h.target_id; - ti = &sc->sc_tinfo[xm->xm_target]; + ti = &sc->sc_tinfo[target]; ti->flags &= ~(T_NEGOTIATE|T_SYNCMODE); ti->period = 0; ti->offset = 0; - if ((sc->sc_cfflags & (1<<((xm->xm_target&7)+16))) == 0 && - (xm->xm_mode & PERIPH_CAP_TQING)) { - NCR_MISC(("%s: target %d: tagged queuing\n", - sc->dv_name, xm->xm_target)); - ti->flags |= T_TAG; - } else - ti->flags &= ~T_TAG; + if ((cts->valid & CCB_TRANS_TQ_VALID) != 0) { + if ((sc->sc_cfflags & (1<<((target & 7) + 16))) == 0 && + (cts->flags & CCB_TRANS_TAG_ENB)) { + NCR_MISC(("%s: target %d: tagged queuing\n", + sc->dv_name, target)); + ti->flags |= T_TAG; + } else + ti->flags &= ~T_TAG; + } - if ((xm->xm_mode & PERIPH_CAP_WIDE16) != 0) { - NCR_MISC(("%s: target %d: wide scsi negotiation\n", - sc->dv_name, xm->xm_target)); - if (sc->sc_rev == NCR_VARIANT_FAS366) { - ti->flags |= T_WIDE; - ti->width = 1; + if ((cts->valid & CCB_TRANS_BUS_WIDTH_VALID) != 0) { + if (cts->bus_width != 0) { + NCR_MISC(("%s: target %d: wide negotiation\n", + sc->dv_name, target)); + if (sc->sc_rev == NCR_VARIANT_FAS366) { + ti->flags |= T_WIDE; + ti->width = 1; + } + } else { + ti->flags &= ~T_WIDE; + ti->width = 0; } } - if ((xm->xm_mode & PERIPH_CAP_SYNC) != 0 && - (ti->flags & T_SYNCHOFF) == 0 && sc->sc_minsync != 0) { - NCR_MISC(("%s: target %d: sync negotiation\n", - sc->dv_name, xm->xm_target)); + if ((cts->valid & CCB_TRANS_SYNC_RATE_VALID) != 0) { + NCR_MISC(("%s: target %d: sync period negotiation\n", + sc->dv_name, target)); + ti->flags |= T_NEGOTIATE; + ti->period = cts->sync_period; + } + + if ((cts->valid & CCB_TRANS_SYNC_OFFSET_VALID) != 0) { + NCR_MISC(("%s: target %d: sync offset negotiation\n", + sc->dv_name, target)); ti->flags |= T_NEGOTIATE; - ti->period = sc->sc_minsync; + ti->period = cts->sync_offset; } /* * If we're not going to negotiate, send the notification * now, since it won't happen later. */ if ((ti->flags & T_NEGOTIATE) == 0) - ncr53c9x_update_xfer_mode(sc, xm->xm_target); - } - break; -#endif + ncr53c9x_update_xfer_mode(sc, target); + + mtx_unlock(&sc->sc_lock); + ccb->ccb_h.status = CAM_REQ_CMP; + xpt_done(ccb); + return; + } + default: printf("%s: Unhandled function code %d\n", sc->dv_name, ccb->ccb_h.func_code); @@ -1095,7 +1096,7 @@ else if ((ecb->flags & ECB_SENSE) != 0) tag = 0; else - tag = ecb->ccb->csio.tag_id; + tag = ecb->ccb->csio.tag_action; li = TINFO_LUN(ti, lun); if (li == NULL) { From owner-p4-projects@FreeBSD.ORG Tue Jun 8 07:57:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5881D16A4D1; Tue, 8 Jun 2004 07:57:31 +0000 (GMT) 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 DFCFE16A4CE for ; Tue, 8 Jun 2004 07:57:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8A9943D45 for ; Tue, 8 Jun 2004 07:57:30 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i587vKF5084197 for ; Tue, 8 Jun 2004 07:57:20 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i587vKGA084191 for perforce@freebsd.org; Tue, 8 Jun 2004 07:57:20 GMT (envelope-from scottl@freebsd.org) Date: Tue, 8 Jun 2004 07:57:20 GMT Message-Id: <200406080757.i587vKGA084191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 07:57:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=54406 Change 54406 by scottl@scottl-esp-sparc64 on 2004/06/08 07:56:22 Axe the NetBSD DDB hooks. It's unlikely that I'll ever port them. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#15 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#15 (text+ko) ==== @@ -559,60 +559,3 @@ return (DMA_ISACTIVE(esc->sc_dma)); } - -#include "opt_ddb.h" -#ifdef DDB -#include -#include - -void db_esp(db_expr_t, int, db_expr_t, char*); - -void -db_esp(addr, have_addr, count, modif) - db_expr_t addr; - int have_addr; - db_expr_t count; - char *modif; -{ - struct ncr53c9x_softc *sc; - struct ncr53c9x_ecb *ecb; - struct ncr53c9x_linfo *li; - int u, t, i; - - for (u=0; u<10; u++) { - sc = (struct ncr53c9x_softc *) - getdevunit("esp", u); - if (!sc) continue; - - db_printf("esp%d: nexus %p phase %x prev %x dp %p dleft %lx ify %x\n", - u, sc->sc_nexus, sc->sc_phase, sc->sc_prevphase, - sc->sc_dp, sc->sc_dleft, sc->sc_msgify); - db_printf("\tmsgout %x msgpriq %x msgin %x:%x:%x:%x:%x\n", - sc->sc_msgout, sc->sc_msgpriq, sc->sc_imess[0], - sc->sc_imess[1], sc->sc_imess[2], sc->sc_imess[3], - sc->sc_imess[0]); - db_printf("ready: "); - for (ecb = sc->ready_list.tqh_first; ecb; ecb = ecb->chain.tqe_next) { - db_printf("ecb %p ", ecb); - if (ecb == ecb->chain.tqe_next) { - db_printf("\nWARNING: tailq loop on ecb %p", ecb); - break; - } - } - db_printf("\n"); - - for (t=0; tsc_ntarg; t++) { - LIST_FOREACH(li, &sc->sc_tinfo[t].luns, link) { - db_printf("t%d lun %d untagged %p busy %d used %x\n", - t, (int)li->lun, li->untagged, li->busy, - li->used); - for (i=0; i<256; i++) - if ((ecb = li->queued[i])) { - db_printf("ecb %p tag %x\n", ecb, i); - } - } - } - } -} -#endif - From owner-p4-projects@FreeBSD.ORG Tue Jun 8 07:58:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3BB516A4D1; Tue, 8 Jun 2004 07:58:35 +0000 (GMT) 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 CD47816A4CE for ; Tue, 8 Jun 2004 07:58:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C76F843D5A for ; Tue, 8 Jun 2004 07:58:35 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i587wNNd084250 for ; Tue, 8 Jun 2004 07:58:23 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i587wNEH084247 for perforce@freebsd.org; Tue, 8 Jun 2004 07:58:23 GMT (envelope-from scottl@freebsd.org) Date: Tue, 8 Jun 2004 07:58:23 GMT Message-Id: <200406080758.i587wNEH084247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 07:58:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=54407 Change 54407 by scottl@scottl-esp-sparc64 on 2004/06/08 07:58:23 Fix a mistake with XPT_BUS_RESET and XPT_DEVICE_RESET being switched. Hook ncr53c9x_scsi_reset() up to XPT_BUS_RESET. It might need a mandatory delay of some sort. Sanity check the incoming target number as CAM seems to like to send an id of '-1' on bootup. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#16 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#16 (text+ko) ==== @@ -823,8 +823,9 @@ mtx_lock(&sc->sc_lock); switch (ccb->ccb_h.func_code) { - case XPT_RESET_DEV: - ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; + case XPT_RESET_BUS: + ncr53c9x_scsi_reset(sc); + ccb->ccb_h.status = CAM_REQ_CMP; mtx_unlock(&sc->sc_lock); xpt_done(ccb); return; @@ -889,10 +890,17 @@ xpt_done(ccb); return; case XPT_SCSI_IO: - case XPT_RESET_BUS: + case XPT_RESET_DEV: { struct ccb_scsiio *csio; + if (ccb->ccb_h.target_id < 0 || + ccb->ccb_h.target_id >= sc->sc_ntarg) { + ccb->ccb_h.status = CAM_PATH_INVALID; + mtx_unlock(&sc->sc_lock); + xpt_done(ccb); + return; + } /* Get an ECB to use. */ ecb = ncr53c9x_get_ecb(sc); /* From owner-p4-projects@FreeBSD.ORG Tue Jun 8 07:59:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C894A16A4D1; Tue, 8 Jun 2004 07:59:26 +0000 (GMT) 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 A282A16A4CE for ; Tue, 8 Jun 2004 07:59:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D0A643D5F for ; Tue, 8 Jun 2004 07:59:26 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i587xPpM084310 for ; Tue, 8 Jun 2004 07:59:25 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i587xPBU084307 for perforce@freebsd.org; Tue, 8 Jun 2004 07:59:25 GMT (envelope-from scottl@freebsd.org) Date: Tue, 8 Jun 2004 07:59:25 GMT Message-Id: <200406080759.i587xPBU084307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 07:59:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=54408 Change 54408 by scottl@scottl-esp-sparc64 on 2004/06/08 07:59:01 Add the plumbing so the driver can be compiled into the kernel. Affected files ... .. //depot/projects/scottl-esp/src/sys/conf/NOTES#3 edit .. //depot/projects/scottl-esp/src/sys/conf/files#3 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/conf/NOTES#3 (text+ko) ==== @@ -1239,6 +1239,7 @@ device ahc device ahd device amd +device esp device isp hint.isp.0.disable="1" hint.isp.0.role="3" ==== //depot/projects/scottl-esp/src/sys/conf/files#3 (text+ko) ==== @@ -428,6 +428,9 @@ dev/ep/if_ep_mca.c optional ep mca dev/ep/if_ep_pccard.c optional ep card dev/ep/if_ep_pccard.c optional ep pccard +dev/esp/esp_sbus.c optional esp sbus +dev/esp/lsi64854.c optional esp +dev/esp/ncr53c9x.c optional esp dev/ex/if_ex.c optional ex dev/ex/if_ex_isa.c optional ex isa dev/ex/if_ex_pccard.c optional ex card From owner-p4-projects@FreeBSD.ORG Tue Jun 8 09:43:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6339A16A4D1; Tue, 8 Jun 2004 09:43:33 +0000 (GMT) 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 3E25616A4CE for ; Tue, 8 Jun 2004 09:43:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 399BD43D5A for ; Tue, 8 Jun 2004 09:43:33 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i589hXRF015212 for ; Tue, 8 Jun 2004 09:43:33 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i589hWt2015209 for perforce@freebsd.org; Tue, 8 Jun 2004 09:43:32 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 09:43:32 GMT Message-Id: <200406080943.i589hWt2015209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 09:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=54411 Change 54411 by jmallett@jmallett_oingo on 2004/06/08 09:43:13 mumble... this is a hack... well, half of it. the other half is correct and because I didn't understand when cpu_set_thread_fork_monkeys would be called (monkeys!!!) Affected files ... .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#16 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#16 (text+ko) ==== @@ -121,13 +121,14 @@ td->td_pcb = (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *)td->td_pcb - 1; + td->td_pcb->pcb_regs[11] = MIPS_SR_KX | MIPS_SR_INT_IE; } void cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) { - td->td_pcb->pcb_regs[10] = (register_t)func; - td->td_pcb->pcb_regs[0] = (register_t)arg; + td->td_pcb->pcb_regs[0] = (register_t)func; + td->td_pcb->pcb_regs[1] = (register_t)arg; } void From owner-p4-projects@FreeBSD.ORG Tue Jun 8 09:44:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AA2B16A4D1; Tue, 8 Jun 2004 09:44:35 +0000 (GMT) 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 1604F16A4CE for ; Tue, 8 Jun 2004 09:44:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11FD143D48 for ; Tue, 8 Jun 2004 09:44:35 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i589iY88015272 for ; Tue, 8 Jun 2004 09:44:34 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i589iYK1015269 for perforce@freebsd.org; Tue, 8 Jun 2004 09:44:34 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 09:44:34 GMT Message-Id: <200406080944.i589iYK1015269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 09:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=54412 Change 54412 by jmallett@jmallett_oingo on 2004/06/08 09:43:42 I'm not sure this is right, but nobody's telling me it's not. (except the voices in my head.) Affected files ... .. //depot/projects/mips/sys/mips/mips/critical.c#3 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/critical.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/critical.c#2 $ + * $P4: //depot/projects/mips/sys/mips/mips/critical.c#3 $ */ #include @@ -38,5 +38,8 @@ void cpu_critical_fork_exit(void) { - panic("%s", __func__); + struct thread *td; + + td = curthread; + td->td_md.md_savecrit = mips_rd_status() | MIPS_SR_INT_IE; } From owner-p4-projects@FreeBSD.ORG Tue Jun 8 09:46:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66C9F16A4D1; Tue, 8 Jun 2004 09:46:38 +0000 (GMT) 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 4103316A4CE for ; Tue, 8 Jun 2004 09:46:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25EF443D45 for ; Tue, 8 Jun 2004 09:46:38 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i589kbah015361 for ; Tue, 8 Jun 2004 09:46:38 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i589kbg2015358 for perforce@freebsd.org; Tue, 8 Jun 2004 09:46:37 GMT (envelope-from jmallett@freebsd.org) Date: Tue, 8 Jun 2004 09:46:37 GMT Message-Id: <200406080946.i589kbg2015358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2004 09:46:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=54413 Change 54413 by jmallett@jmallett_oingo on 2004/06/08 09:45:48 Be kind to the next poor fool. Affected files ... .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#17 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#17 (text+ko) ==== @@ -124,6 +124,10 @@ td->td_pcb->pcb_regs[11] = MIPS_SR_KX | MIPS_SR_INT_IE; } +/* + * This is called after cpu_fork() to make a thread return into + * something other than fork_return. + */ void cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) { From owner-p4-projects@FreeBSD.ORG Wed Jun 9 02:35:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 445E616A4D1; Wed, 9 Jun 2004 02:35:09 +0000 (GMT) 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 1D4B516A4CE for ; Wed, 9 Jun 2004 02:35:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 157ED43D55 for ; Wed, 9 Jun 2004 02:35:09 +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.12.11/8.12.11) with ESMTP id i592Z9Db061759 for ; Wed, 9 Jun 2004 02:35:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i592Z7bc061756 for perforce@freebsd.org; Wed, 9 Jun 2004 02:35:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 9 Jun 2004 02:35:07 GMT Message-Id: <200406090235.i592Z7bc061756@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 Subject: PERFORCE change 54438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 02:35:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=54438 Change 54438 by rwatson@rwatson_tislabs on 2004/06/09 02:34:14 Integrate netperf_socket: - tty abstraction work. - panic line numbers backed out. - linux_wait4 becomes MPSAFE. - amd64 vm optimization, cleanup, and related notions. - kern_kse broken out from kern_thread. - ACPI shutdown fixes. - More NDIS evil. - The normal plethora of PCI, USB IDs, etc. - Loop back of const sockaddr argument to sbappendaddr(), const sun_noname addr for unix domain sockets. - Loop back of slipped reference fix for non-blocking accept() calls that fail. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/support.s#3 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#5 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#5 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#5 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mpboot.S#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/netperf_socket/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/netperf_socket/sys/amd64/include/param.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/netperf_socket/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/exception.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/locore.S#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#15 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#13 integrate .. //depot/projects/netperf_socket/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#18 integrate .. //depot/projects/netperf_socket/sys/conf/files#24 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#20 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_powerres.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#12 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#12 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_ext.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_hdr.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_sup.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_vtf.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/ssc.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/kern_intr.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#1 branch .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/subr_blist.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/tty_conf.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/modules/ipfilter/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/net/if_sl.c#4 integrate .. //depot/projects/netperf_socket/sys/netatm/atm_ioctl.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_message.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#7 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#5 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/mse.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/olpt.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/pc98gdc.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/ppc.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/scgdcrndr.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/scterm-sck.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#8 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/asmacros.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_ebus.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_fhc.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_sbus.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/netperf_socket/sys/sys/blist.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/bus.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/linedisc.h#1 branch .. //depot/projects/netperf_socket/sys/sys/param.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/vmmeter.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#5 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.h#6 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageq.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.37 2004/06/01 13:49:25 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.38 2004/06/04 16:02:48 phk Exp $"); #include #include @@ -124,7 +124,7 @@ splx(s); - error = (*linesw[tp->t_line].l_open)(dev, tp); + error = ttyld_open(tp, dev); if (error == 0 && setuptimeout) { polltime = hz / PROM_POLL_HZ; @@ -148,7 +148,7 @@ return ENXIO; untimeout(promtimeout, tp, promtimeouthandle); - (*linesw[tp->t_line].l_close)(tp, flag); + ttyld_close(tp, flag); ttyclose(tp); return 0; } @@ -211,7 +211,7 @@ while ((c = promcncheckc(NULL)) != -1) { if (tp->t_state & TS_ISOPEN) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); } promtimeouthandle = timeout(promtimeout, tp, polltime); } ==== //depot/projects/netperf_socket/sys/alpha/alpha/support.s#3 (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/alpha/alpha/support.s,v 1.16 2004/01/19 21:27:10 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.17 2004/06/06 21:26:47 phk Exp $ */ /* @@ -680,10 +680,8 @@ longjmp_botch: lda a0, longjmp_botchmsg - mov 0, a1 - mov 0, a2 - mov ra, a3 - CALL(__panic) + mov ra, a1 + CALL(panic) call_pal PAL_bugchk .data ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.17 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.18 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.15 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.16 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.15 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.16 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #include "opt_compat.h" @@ -382,7 +382,7 @@ { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer }, /* 362 = linux_setitimer */ { AS(linux_utimes_args), (sy_call_t *)linux_utimes }, /* 363 = linux_utimes */ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage }, /* 364 = getrusage */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */ { 0, (sy_call_t *)linux_adjtimex }, /* 366 = linux_adjtimex */ { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd }, /* 367 = linux_getcwd */ { 0, (sy_call_t *)linux_capget }, /* 368 = linux_capget */ ==== //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.57 2004/03/29 02:19:43 bms Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -445,7 +445,7 @@ struct l_itimerval *oitv); } 363 STD { int linux_utimes(char *fname, struct l_timeval *times); } 364 MNOPROTO { int getrusage(int who, struct rusage *rusage); } -365 STD { int linux_wait4(l_pid_t pid, l_uint *status, l_int options, \ +365 MSTD { int linux_wait4(l_pid_t pid, l_uint *status, l_int options, \ struct l_rusage *rusage); } 366 STD { int linux_adjtimex(void); } 367 STD { int linux_getcwd(char *buf, l_ulong bufsize); } ==== //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.43 2004/06/01 13:49:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.44 2004/06/04 16:02:48 phk Exp $"); #include "opt_ddb.h" @@ -291,7 +291,7 @@ splx(s); - error = (*linesw[tp->t_line].l_open)(dev, tp); + error = ttyld_open(tp, dev); if (error == 0 && setuptimeout) { zspolltime = hz / 50; @@ -318,7 +318,7 @@ s = spltty(); untimeout(zs_poll_intr, sc, sc->zst); - (*linesw[tp->t_line].l_close)(tp, flag); + ttyld_close(tp, flag); ttyclose(tp); splx(s); @@ -502,7 +502,7 @@ Debugger("manual escape to debugger"); #endif if (tp && (tp->t_state & TS_ISOPEN)) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); DELAY(5); } } @@ -517,7 +517,7 @@ Debugger("manual escape to debugger"); #endif if (tp && (tp->t_state & TS_ISOPEN)) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); DELAY(5); } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.149 2004/04/05 21:25:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.153 2004/06/08 01:35:48 peter Exp $"); #include #include @@ -73,6 +73,7 @@ #define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) +#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : : "m" (r)) #define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") @@ -111,6 +112,7 @@ fpuinit(void) { register_t savecrit; + u_int mxcsr; u_short control; savecrit = intr_disable(); @@ -119,6 +121,8 @@ fninit(); control = __INITIAL_FPUCW__; fldcw(&control); + mxcsr = __INITIAL_MXCSR__; + ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); start_emulating(); fpu_cleanstate_ready = 1; ==== //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.132 2004/06/03 20:18:15 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.134 2004/06/08 01:20:37 peter Exp $"); #include "opt_cpu.h" @@ -69,13 +69,10 @@ void earlysetcpuclass(void); void panicifcpuunsupported(void); -static void print_AMD_features(void); static void print_AMD_info(void); static void print_AMD_assoc(int i); -int cpu_feature2; /* XXX change cpu_feature to long? */ int cpu_class; -u_int cpu_exthigh; /* Highest arg to extended CPUID */ char machine[] = "amd64"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); @@ -109,26 +106,18 @@ strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model)); /* Check for extended CPUID information and a processor name. */ - if (cpu_high > 0 && - (strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0)) { - do_cpuid(0x80000000, regs); - if (regs[0] >= 0x80000000) { - cpu_exthigh = regs[0]; - if (cpu_exthigh >= 0x80000004) { - brand = cpu_brand; - for (i = 0x80000002; i < 0x80000005; i++) { - do_cpuid(i, regs); - memcpy(brand, regs, sizeof(regs)); - brand += sizeof(regs); - } - } + if (cpu_exthigh >= 0x80000004) { + brand = cpu_brand; + for (i = 0x80000002; i < 0x80000005; i++) { + do_cpuid(i, regs); + memcpy(brand, regs, sizeof(regs)); + brand += sizeof(regs); } } if (strcmp(cpu_vendor, "GenuineIntel") == 0) { - /* Better late than never I suppose.. */ - strcat(cpu_model, "IA-32e"); + /* Please make up your mind folks! */ + strcat(cpu_model, "EM64T"); } else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { /* * Values taken from AMD Processor Recognition @@ -259,6 +248,43 @@ "\040" ); } + if (amd_feature != 0) { + printf("\n AMD Features=0x%b", amd_feature, + "\020" /* in hex */ + "\001" /* Same */ + "\002" /* Same */ + "\003" /* Same */ + "\004" /* Same */ + "\005" /* Same */ + "\006" /* Same */ + "\007" /* Same */ + "\010" /* Same */ + "\011" /* Same */ + "\012" /* Same */ + "\013" /* Undefined */ + "\014SYSCALL" /* Have SYSCALL/SYSRET */ + "\015" /* Same */ + "\016" /* Same */ + "\017" /* Same */ + "\020" /* Same */ + "\021" /* Same */ + "\022" /* Same */ + "\023" /* Reserved, unknown */ + "\024MP" /* Multiprocessor Capable */ + "\025NX" /* Has EFER.NXE, NX */ + "\026" /* Undefined */ + "\027MMX+" /* AMD MMX Extensions */ + "\030" /* Same */ + "\031" /* Same */ + "\032" /* Undefined */ + "\033" /* Undefined */ + "\034" /* Undefined */ + "\035" /* Undefined */ + "\036LM" /* 64 bit long mode */ + "\0373DNow+" /* AMD 3DNow! Extensions */ + "\0403DNow" /* AMD 3DNow! */ + ); + } /* * If this CPU supports hyperthreading then mention @@ -269,8 +295,6 @@ printf("\n Hyperthreading: %d logical CPUs", (cpu_procinfo & CPUID_HTT_CORES) >> 16); } - if (cpu_exthigh >= 0x80000001) - print_AMD_features(); } /* Avoid ugly blank lines: only print newline when we have to. */ if (*cpu_vendor || cpu_id) @@ -327,6 +351,16 @@ cpu_feature = regs[3]; cpu_feature2 = regs[2]; + if (strcmp(cpu_vendor, "GenuineIntel") == 0 || + strcmp(cpu_vendor, "AuthenticAMD") == 0) { + do_cpuid(0x80000000, regs); + cpu_exthigh = regs[0]; + } + if (cpu_exthigh >= 0x80000001) { + do_cpuid(0x80000001, regs); + amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff); + } + /* XXX */ cpu = CPU_CLAWHAMMER; } @@ -358,111 +392,64 @@ static void print_AMD_info(void) { + u_int regs[4]; - if (cpu_exthigh >= 0x80000005) { - u_int regs[4]; + if (cpu_exthigh < 0x80000005) + return; - do_cpuid(0x80000005, regs); - printf("L1 2MB data TLB: %d entries", (regs[0] >> 16) & 0xff); - print_AMD_assoc(regs[0] >> 24); + do_cpuid(0x80000005, regs); + printf("L1 2MB data TLB: %d entries", (regs[0] >> 16) & 0xff); + print_AMD_assoc(regs[0] >> 24); - printf("L1 2MB instruction TLB: %d entries", regs[0] & 0xff); - print_AMD_assoc((regs[0] >> 8) & 0xff); + printf("L1 2MB instruction TLB: %d entries", regs[0] & 0xff); + print_AMD_assoc((regs[0] >> 8) & 0xff); - printf("L1 4KB data TLB: %d entries", (regs[1] >> 16) & 0xff); - print_AMD_assoc(regs[1] >> 24); + printf("L1 4KB data TLB: %d entries", (regs[1] >> 16) & 0xff); + print_AMD_assoc(regs[1] >> 24); - printf("L1 4KB instruction TLB: %d entries", regs[1] & 0xff); - print_AMD_assoc((regs[1] >> 8) & 0xff); + printf("L1 4KB instruction TLB: %d entries", regs[1] & 0xff); + print_AMD_assoc((regs[1] >> 8) & 0xff); - printf("L1 data cache: %d kbytes", regs[2] >> 24); - printf(", %d bytes/line", regs[2] & 0xff); - printf(", %d lines/tag", (regs[2] >> 8) & 0xff); - print_AMD_assoc((regs[2] >> 16) & 0xff); + printf("L1 data cache: %d kbytes", regs[2] >> 24); + printf(", %d bytes/line", regs[2] & 0xff); + printf(", %d lines/tag", (regs[2] >> 8) & 0xff); + print_AMD_assoc((regs[2] >> 16) & 0xff); - printf("L1 instruction cache: %d kbytes", regs[3] >> 24); - printf(", %d bytes/line", regs[3] & 0xff); - printf(", %d lines/tag", (regs[3] >> 8) & 0xff); - print_AMD_assoc((regs[3] >> 16) & 0xff); + printf("L1 instruction cache: %d kbytes", regs[3] >> 24); + printf(", %d bytes/line", regs[3] & 0xff); + printf(", %d lines/tag", (regs[3] >> 8) & 0xff); + print_AMD_assoc((regs[3] >> 16) & 0xff); - if (cpu_exthigh >= 0x80000006) { - do_cpuid(0x80000006, regs); - if ((regs[0] >> 16) != 0) { - printf("L2 2MB data TLB: %d entries", - (regs[0] >> 16) & 0xfff); - print_AMD_l2_assoc(regs[0] >> 28); - printf("L2 2MB instruction TLB: %d entries", - regs[0] & 0xfff); - print_AMD_l2_assoc((regs[0] >> 28) & 0xf); - } else { - printf("L2 2MB unified TLB: %d entries", - regs[0] & 0xfff); - print_AMD_l2_assoc((regs[0] >> 28) & 0xf); - } - if ((regs[1] >> 16) != 0) { - printf("L2 4KB data TLB: %d entries", - (regs[1] >> 16) & 0xfff); - print_AMD_l2_assoc(regs[1] >> 28); + if (cpu_exthigh >= 0x80000006) { + do_cpuid(0x80000006, regs); + if ((regs[0] >> 16) != 0) { + printf("L2 2MB data TLB: %d entries", + (regs[0] >> 16) & 0xfff); + print_AMD_l2_assoc(regs[0] >> 28); + printf("L2 2MB instruction TLB: %d entries", + regs[0] & 0xfff); + print_AMD_l2_assoc((regs[0] >> 28) & 0xf); + } else { + printf("L2 2MB unified TLB: %d entries", + regs[0] & 0xfff); + print_AMD_l2_assoc((regs[0] >> 28) & 0xf); + } + if ((regs[1] >> 16) != 0) { + printf("L2 4KB data TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc(regs[1] >> 28); - printf("L2 4KB instruction TLB: %d entries", - (regs[1] >> 16) & 0xfff); - print_AMD_l2_assoc((regs[1] >> 28) & 0xf); - } else { - printf("L2 4KB unified TLB: %d entries", - (regs[1] >> 16) & 0xfff); - print_AMD_l2_assoc((regs[1] >> 28) & 0xf); - } - printf("L2 unified cache: %d kbytes", regs[2] >> 16); - printf(", %d bytes/line", regs[2] & 0xff); - printf(", %d lines/tag", (regs[2] >> 8) & 0x0f); - print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); + printf("L2 4KB instruction TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc((regs[1] >> 28) & 0xf); + } else { + printf("L2 4KB unified TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc((regs[1] >> 28) & 0xf); } + printf("L2 unified cache: %d kbytes", regs[2] >> 16); + printf(", %d bytes/line", regs[2] & 0xff); + printf(", %d lines/tag", (regs[2] >> 8) & 0x0f); + print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } - -static void -print_AMD_features(void) -{ - u_int regs[4]; - - /* - * Values taken from AMD Processor Recognition - * http://www.amd.com/products/cpg/athlon/techdocs/pdf/20734.pdf - */ - do_cpuid(0x80000001, regs); - printf("\n AMD Features=0x%b", regs[3] & ~(cpu_feature & 0x0183f3ff), - "\020" /* in hex */ - "\001FPU" /* Integral FPU */ - "\002VME" /* Extended VM86 mode support */ - "\003DE" /* Debug extensions */ - "\004PSE" /* 4MByte page tables */ - "\005TSC" /* Timestamp counter */ - "\006MSR" /* Machine specific registers */ - "\007PAE" /* Physical address extension */ - "\010MCE" /* Machine Check support */ - "\011CX8" /* CMPEXCH8 instruction */ - "\012APIC" /* SMP local APIC */ - "\013" - "\014SYSCALL" /* SYSENTER/SYSEXIT instructions */ - "\015MTRR" /* Memory Type Range Registers */ - "\016PGE" /* PG_G (global bit) support */ - "\017MCA" /* Machine Check Architecture */ - "\020CMOV" /* CMOV instruction */ - "\021PAT" /* Page attributes table */ - "\022PGE36" /* 36 bit address space support */ - "\023RSVD" /* Reserved, unknown */ - "\024MP" /* Multiprocessor Capable */ - "\025NX" /* Has EFER.NXE, NX (no execute pte bit) */ - "\026" - "\027MMX+" /* AMD MMX Instruction Extensions */ - "\030MMX" - "\031FXSAVE" /* FXSAVE/FXRSTOR */ - "\032" - "\033" - "\034" - "\035" - "\036LM" /* Long mode */ - "\0373DNow!+" /* AMD 3DNow! Instruction Extensions */ - "\0403DNow!" /* AMD 3DNow! Instructions */ - ); -} ==== //depot/projects/netperf_socket/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.47 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.48 2004/06/08 01:02:51 peter Exp $"); #include "opt_cpu.h" @@ -41,7 +41,8 @@ #include #include -void initializecpu(void); +#include +#include static int hw_instruction_sse; SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD, @@ -49,31 +50,30 @@ int cpu; /* Are we 386, 386sx, 486, etc? */ u_int cpu_feature; /* Feature flags */ +u_int cpu_feature2; /* Feature flags */ +u_int amd_feature; /* Feature flags */ u_int cpu_high; /* Highest arg to CPUID */ +u_int cpu_exthigh; /* Highest arg to extended CPUID */ u_int cpu_id; /* Stepping ID */ u_int cpu_procinfo; /* HyperThreading Info / Brand Index / CLFUSH */ char cpu_vendor[20]; /* CPU Origin code */ u_int cpu_fxsr; /* SSE enabled */ /* - * Initialize CR4 (Control register 4) to enable SSE instructions. + * Initialize CPU control registers */ void -enable_sse(void) +initializecpu(void) { + uint64_t msr; + if ((cpu_feature & CPUID_XMM) && (cpu_feature & CPUID_FXSR)) { load_cr4(rcr4() | CR4_FXSR | CR4_XMM); cpu_fxsr = hw_instruction_sse = 1; } -} - -void -initializecpu(void) -{ - - switch (cpu) { - default: - break; + if ((amd_feature & AMDID_NX) != 0) { + msr = rdmsr(MSR_EFER) | EFER_NXE; + wrmsr(MSR_EFER, msr); + pg_nx = PG_NX; } - enable_sse(); } ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.607 2004/05/19 01:23:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.608 2004/06/08 01:02:51 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -130,7 +130,6 @@ extern void printcpuinfo(void); /* XXX header file */ extern void identify_cpu(void); extern void panicifcpuunsupported(void); -extern void initializecpu(void); #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) @@ -1108,12 +1107,6 @@ #error "have you forgotten the isa device?"; #endif -#if 0 /* Not till we test the features bit */ - /* Turn on PTE NX (no execute) bit */ - msr = rdmsr(MSR_EFER) | EFER_NXE; - wrmsr(MSR_EFER, msr); -#endif - proc0.p_uarea = (struct user *)(physfree + KERNBASE); bzero(proc0.p_uarea, UAREA_PAGES * PAGE_SIZE); physfree += UAREA_PAGES * PAGE_SIZE; ==== //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.237 2004/05/16 22:11:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.239 2004/06/08 01:07:51 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -429,12 +429,12 @@ /* set up CPU registers and state */ cpu_setregs(); + /* set up SSE/NX registers */ + initializecpu(); + /* set up FPU state on the AP */ fpuinit(); - /* set up SSE registers */ - enable_sse(); - /* A quick check from sanity claus */ if (PCPU_GET(apic_id) != lapic_id()) { printf("SMP: cpuid = %d\n", PCPU_GET(cpuid)); ==== //depot/projects/netperf_socket/sys/amd64/amd64/mpboot.S#3 (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/amd64/amd64/mpboot.S,v 1.25 2004/02/25 23:12:39 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.26 2004/06/08 01:02:52 peter Exp $ */ #include /* miscellaneous asm macros */ @@ -102,11 +102,7 @@ */ movl $MSR_EFER, %ecx rdmsr -#if 0 /* not till we test the NX cpuid bits */ - orl $EFER_LME | EFER_SCE | EFER_NXE, %eax -#else orl $EFER_LME | EFER_SCE, %eax -#endif wrmsr /* ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.461 2004/05/28 19:42:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.466 2004/06/08 02:20:40 peter Exp $"); /* * Manages physical address maps. @@ -174,6 +174,7 @@ static int ndmpdp; static vm_paddr_t dmaplimit; vm_offset_t kernel_vm_end; +pt_entry_t pg_nx; static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ @@ -971,7 +972,7 @@ /* We just released a PT, unhold the matching PD */ vm_page_t pdpg; - pdpg = PHYS_TO_VM_PAGE(*pmap_pdpe(pmap, va)); + pdpg = PHYS_TO_VM_PAGE(*pmap_pdpe(pmap, va) & PG_FRAME); vm_page_unhold(pdpg); if (pdpg->hold_count == 0) _pmap_unwire_pte_hold(pmap, va, pdpg); @@ -980,7 +981,7 @@ /* We just released a PD, unhold the matching PDP */ vm_page_t pdppg; - pdppg = PHYS_TO_VM_PAGE(*pmap_pml4e(pmap, va)); + pdppg = PHYS_TO_VM_PAGE(*pmap_pml4e(pmap, va) & PG_FRAME); vm_page_unhold(pdppg); if (pdppg->hold_count == 0) _pmap_unwire_pte_hold(pmap, va, pdppg); @@ -1162,7 +1163,7 @@ } } else { /* Add reference to pdp page */ - pdppg = PHYS_TO_VM_PAGE(*pml4); + pdppg = PHYS_TO_VM_PAGE(*pml4 & PG_FRAME); pdppg->hold_count++; } pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME); @@ -1209,7 +1210,7 @@ } } else { /* Add reference to the pd page */ - pdpg = PHYS_TO_VM_PAGE(*pdp); + pdpg = PHYS_TO_VM_PAGE(*pdp & PG_FRAME); pdpg->hold_count++; } } @@ -1259,7 +1260,7 @@ * hold count, and activate it. */ if (pd != 0 && (*pd & PG_V) != 0) { - m = PHYS_TO_VM_PAGE(*pd); + m = PHYS_TO_VM_PAGE(*pd & PG_FRAME); m->hold_count++; } else { /* @@ -1296,7 +1297,7 @@ LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); - m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I]); + m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I] & PG_FRAME); pmap->pm_pml4[KPML4I] = 0; /* KVA */ pmap->pm_pml4[DMPML4I] = 0; /* Direct Map */ @@ -1516,7 +1517,7 @@ pmap_invalidate_page(kernel_pmap, va); pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { - m = PHYS_TO_VM_PAGE(oldpte); + m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); if (oldpte & PG_M) { #if defined(PMAP_DIAGNOSTIC) if (pmap_nw_modified((pt_entry_t) oldpte)) { @@ -1532,7 +1533,7 @@ vm_page_flag_set(m, PG_REFERENCED); return pmap_remove_entry(pmap, m, va); } else { - mpte = PHYS_TO_VM_PAGE(*pmap_pde(pmap, va)); + mpte = PHYS_TO_VM_PAGE(*pmap_pde(pmap, va) & PG_FRAME); return pmap_unuse_pt(pmap, va, mpte); } } @@ -1561,7 +1562,9 @@ void pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - vm_offset_t pdnxt; + vm_offset_t va_next; + pml4_entry_t *pml4e; + pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; pt_entry_t *pte; int anyvalid; @@ -1587,15 +1590,27 @@ anyvalid = 0; - for (; sva < eva; sva = pdnxt) { + for (; sva < eva; sva = va_next) { if (pmap->pm_stats.resident_count == 0) break; + pml4e = pmap_pml4e(pmap, sva); + if (pml4e == 0) { + va_next = (sva + NBPML4) & ~PML4MASK; + continue; + } + + pdpe = pmap_pdpe(pmap, sva); + if (pdpe == 0) { + va_next = (sva + NBPDP) & ~PDPMASK; + continue; + } + /* * Calculate index for next page table. */ - pdnxt = (sva + NBPDR) & ~PDRMASK; + va_next = (sva + NBPDR) & ~PDRMASK; pde = pmap_pde(pmap, sva); if (pde == 0) @@ -1624,10 +1639,10 @@ * by the current page table page, or to the end of the * range being removed. */ - if (pdnxt > eva) - pdnxt = eva; + if (va_next > eva) + va_next = eva; - for (; sva != pdnxt; sva += PAGE_SIZE) { + for (; sva != va_next; sva += PAGE_SIZE) { pte = pmap_pte(pmap, sva); if (pte == NULL || *pte == 0) continue; @@ -1713,7 +1728,9 @@ void pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) { - vm_offset_t pdnxt; + vm_offset_t va_next; + pml4_entry_t *pml4e; + pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; int anychanged; @@ -1730,9 +1747,21 @@ anychanged = 0; - for (; sva < eva; sva = pdnxt) { + for (; sva < eva; sva = va_next) { + + pml4e = pmap_pml4e(pmap, sva); + if (pml4e == 0) { + va_next = (sva + NBPML4) & ~PML4MASK; + continue; + } + + pdpe = pmap_pdpe(pmap, sva); + if (pdpe == 0) { + va_next = (sva + NBPDP) & ~PDPMASK; + continue; + } - pdnxt = (sva + NBPDR) & ~PDRMASK; + va_next = (sva + NBPDR) & ~PDRMASK; pde = pmap_pde(pmap, sva); if (pde == NULL) @@ -1756,10 +1785,10 @@ continue; } - if (pdnxt > eva) - pdnxt = eva; + if (va_next > eva) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 9 03:06:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F19816A4D2; Wed, 9 Jun 2004 03:06:51 +0000 (GMT) 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 522AC16A4CE for ; Wed, 9 Jun 2004 03:06:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4623A43D49 for ; Wed, 9 Jun 2004 03:06:51 +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.12.11/8.12.11) with ESMTP id i5936poZ069283 for ; Wed, 9 Jun 2004 03:06:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5936oqC069280 for perforce@freebsd.org; Wed, 9 Jun 2004 03:06:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 9 Jun 2004 03:06:50 GMT Message-Id: <200406090306.i5936oqC069280@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 Subject: PERFORCE change 54442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 03:06:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=54442 Change 54442 by rwatson@rwatson_tislabs on 2004/06/09 03:05:57 Integrate netperf_socket: Loop back rtsock+netisr changes so that rt_dispatch() defers delivering to raw sockets via a netisr avoiding lock order and recursion issues. Affected files ... .. //depot/projects/netperf_socket/sys/net/netisr.h#3 integrate .. //depot/projects/netperf_socket/sys/net/rtsock.c#9 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#12 integrate Differences ... ==== //depot/projects/netperf_socket/sys/net/netisr.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)netisr.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/netisr.h,v 1.31 2004/04/07 20:46:11 imp Exp $ + * $FreeBSD: src/sys/net/netisr.h,v 1.32 2004/06/09 02:48:23 rwatson Exp $ */ #ifndef _NET_NETISR_H_ @@ -50,6 +50,7 @@ */ #define NETISR_POLL 0 /* polling callback, must be first */ #define NETISR_IP 2 /* same as AF_INET */ +#define NETISR_ROUTE 14 /* routing socket */ #define NETISR_AARP 15 /* Appletalk ARP */ #define NETISR_ATALK2 16 /* Appletalk phase 2 */ #define NETISR_ATALK1 17 /* Appletalk phase 1 */ ==== //depot/projects/netperf_socket/sys/net/rtsock.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 - * $FreeBSD: src/sys/net/rtsock.c,v 1.110 2004/05/10 15:07:23 csjp Exp $ + * $FreeBSD: src/sys/net/rtsock.c,v 1.111 2004/06/09 02:48:23 rwatson Exp $ */ #include @@ -45,6 +45,7 @@ #include #include +#include #include #include @@ -71,6 +72,8 @@ #define RTSOCK_UNLOCK() mtx_unlock(&rtsock_mtx) #define RTSOCK_LOCK_ASSERT() mtx_assert(&rtsock_mtx, MA_OWNED) +static struct ifqueue rtsintrq; + struct walkarg { int w_tmemsize; int w_op, w_arg; @@ -78,6 +81,7 @@ struct sysctl_req *w_req; }; +static void rts_input(struct mbuf *m); static struct mbuf *rt_msg1(int type, struct rt_addrinfo *rtinfo); static int rt_msg2(int type, struct rt_addrinfo *rtinfo, caddr_t cp, struct walkarg *w); @@ -93,6 +97,35 @@ struct rt_metrics *out); static void rt_dispatch(struct mbuf *, const struct sockaddr *); +static void +rts_init(void) +{ + + rtsintrq.ifq_maxlen = IFQ_MAXLEN; + mtx_init(&rtsintrq.ifq_mtx, "rts_inq", NULL, MTX_DEF); + netisr_register(NETISR_ROUTE, rts_input, &rtsintrq, NETISR_MPSAFE); +} +SYSINIT(rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rts_init, 0) + +static void +rts_input(struct mbuf *m) +{ + struct sockproto route_proto; + unsigned short *family; + struct m_tag *tag; + + route_proto.sp_family = PF_ROUTE; + tag = m_tag_find(m, PACKET_TAG_RTSOCKFAM, NULL); + if (tag != NULL) { + family = (unsigned short *)(tag + 1); + route_proto.sp_protocol = *family; + m_tag_delete(m, tag); + } else + route_proto.sp_protocol = 0; + + raw_input(m, &route_proto, &route_src, &route_dst); +} + /* * It really doesn't make any sense at all for this code to share much * with raw_usrreq.c, since its functionality is so restricted. XXX @@ -919,11 +952,26 @@ static void rt_dispatch(struct mbuf *m, const struct sockaddr *sa) { - struct sockproto route_proto; + unsigned short *family; + struct m_tag *tag; - route_proto.sp_family = PF_ROUTE; - route_proto.sp_protocol = sa ? sa->sa_family : 0; - raw_input(m, &route_proto, &route_src, &route_dst); + /* + * Preserve the family from the sockaddr, if any, in an m_tag for + * use when injecting the mbuf into the routing socket buffer from + * the netisr. + */ + if (sa != NULL) { + tag = m_tag_get(PACKET_TAG_RTSOCKFAM, sizeof(unsigned short), + M_NOWAIT); + if (tag == NULL) { + m_freem(m); + return; + } + family = (unsigned short *)(tag + 1); + *family = sa ? sa->sa_family : 0; + m_tag_prepend(m, tag); + } + netisr_queue(NETISR_ROUTE, m); } /* ==== //depot/projects/netperf_socket/sys/sys/mbuf.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.148 2004/05/31 21:46:05 bmilekic Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.149 2004/06/09 02:48:23 rwatson Exp $ */ #ifndef _SYS_MBUF_H_ @@ -631,6 +631,7 @@ #define PACKET_TAG_PF_FRAGCACHE 22 /* PF fragment cached */ #define PACKET_TAG_PF_QID 23 /* PF ALTQ queue id */ #define PACKET_TAG_PF_TAG 24 /* PF tagged */ +#define PACKET_TAG_RTSOCKFAM 25 /* rtsock sa family */ /* Packet tag routines. */ struct m_tag *m_tag_alloc(u_int32_t, int, int, int); From owner-p4-projects@FreeBSD.ORG Wed Jun 9 06:13:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B0216A4D2; Wed, 9 Jun 2004 06:13:40 +0000 (GMT) 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 6C95516A4CE for ; Wed, 9 Jun 2004 06:13:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6776743D31 for ; Wed, 9 Jun 2004 06:13:40 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i596De0H016934 for ; Wed, 9 Jun 2004 06:13:40 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i596Ddx0016931 for perforce@freebsd.org; Wed, 9 Jun 2004 06:13:39 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 06:13:39 GMT Message-Id: <200406090613.i596Ddx0016931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 06:13:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=54448 Change 54448 by jmallett@jmallett_oingo on 2004/06/09 06:12:46 add gio at the end of attach, not in the middle of probe. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#4 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/imc/imc.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#3 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#4 $ */ #include @@ -69,7 +69,6 @@ { switch (mach_type) { case MACH_SGI_IP22: - device_add_child(dev, "gio", 0); return (0); default: return (ENOENT); @@ -152,6 +151,8 @@ } IMC_WRITE_4(port, IMC_GIO64ARB, reg); + device_add_child(dev, "gio", 0); + return (0); } From owner-p4-projects@FreeBSD.ORG Wed Jun 9 06:13:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B75016A52F; Wed, 9 Jun 2004 06:13:41 +0000 (GMT) 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 E62D216A51D for ; Wed, 9 Jun 2004 06:13:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDD9543D41 for ; Wed, 9 Jun 2004 06:13:40 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i596DeOo016943 for ; Wed, 9 Jun 2004 06:13:40 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i596DeGQ016937 for perforce@freebsd.org; Wed, 9 Jun 2004 06:13:40 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 06:13:40 GMT Message-Id: <200406090613.i596DeGQ016937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 06:13:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=54449 Change 54449 by jmallett@jmallett_oingo on 2004/06/09 06:13:31 Stab stab stab, I think I'll do bus stuff this way. Affected files ... .. //depot/projects/mips/sys/mips/include/bus.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/bus.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Juli Mallett. All rights reserved. + * Copyright (c) 2002-2004 Juli Mallett. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,8 +30,50 @@ typedef unsigned long bus_addr_t; typedef unsigned long bus_size_t; -typedef int bus_type_t; typedef unsigned long bus_space_handle_t; -typedef unsigned long bus_space_tag_t; +typedef unsigned long bus_space_word_t; + +struct bus_space_tag { + const char *bst_name; + bus_space_word_t (*bst_read)(char, bus_space_handle_t, bus_size_t); + void (*bst_write)(char, bus_space_handle_t, bus_size_t, bus_space_word_t); +}; + +typedef struct bus_space_tag *bus_space_tag_t; + +#define BUSSPACE_READ(size, type) \ +static __inline type \ +bus_space_read_ ## size(bus_space_tag_t t, \ + bus_space_handle_t h, \ + bus_size_t o) \ +{ \ + return ((type)((*(t)->bst_read)((size), h, o))); \ +} \ +struct __hack + +#define BUSSPACE_WRITE(size, type) \ +static __inline void \ +bus_space_write_ ## size(bus_space_tag_t t, \ + bus_space_handle_t h, \ + bus_size_t o, \ + type v) \ +{ \ + ((*(t)->bst_write)((size), h, o, v)); \ +} \ +struct __hack + +#define BUSSPACE_WRAPPER(size, type) \ +BUSSPACE_READ(size, type); \ +BUSSPACE_WRITE(size, type); \ +struct __hack + +BUSSPACE_WRAPPER(1, uint8_t); +BUSSPACE_WRAPPER(2, uint16_t); +BUSSPACE_WRAPPER(4, uint32_t); +BUSSPACE_WRAPPER(8, uint64_t); + +#undef BUSSPACE_READ +#undef BUSSPACE_WRITE +#undef BUSSPACE_WRAPPER #endif /* !_MACHINE_BUS_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 9 06:15:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5048116A4D1; Wed, 9 Jun 2004 06:15:44 +0000 (GMT) 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 2B7A316A4CE for ; Wed, 9 Jun 2004 06:15:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2601E43D2D for ; Wed, 9 Jun 2004 06:15:44 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i596FhxS017109 for ; Wed, 9 Jun 2004 06:15:43 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i596Fh2I017106 for perforce@freebsd.org; Wed, 9 Jun 2004 06:15:43 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 06:15:43 GMT Message-Id: <200406090615.i596Fh2I017106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 06:15:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=54450 Change 54450 by jmallett@jmallett_oingo on 2004/06/09 06:15:24 Wrapper for GIO, I'll fill this in in a bit. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#32 edit .. //depot/projects/mips/sys/mips/conf/INDY#7 edit .. //depot/projects/mips/sys/mips/sgimips/gio/gio.c#1 add .. //depot/projects/mips/sys/mips/sgimips/gio/gioreg.h#1 add Differences ... ==== //depot/projects/mips/sys/conf/files.mips#32 (text+ko) ==== @@ -56,6 +56,8 @@ dev/arcs/arcs.c optional arcs dev/arcs/arcs_console.c optional arcs +mips/sgimips/gio/gio.c optional gio + mips/sgimips/imc/imc.c optional imc libkern/bcmp.c standard ==== //depot/projects/mips/sys/mips/conf/INDY#7 (text+ko) ==== @@ -19,6 +19,7 @@ # Hardware support device arcs #ARCS Firmware + Console device imc #IMC bus. +device gio #GIO bus. # Debugging for use in -current options DDB #Enable the kernel debugger From owner-p4-projects@FreeBSD.ORG Wed Jun 9 09:19:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7E7316A4D1; Wed, 9 Jun 2004 09:19:35 +0000 (GMT) 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 9245316A4CE for ; Wed, 9 Jun 2004 09:19:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7536C43D4C for ; Wed, 9 Jun 2004 09:19:35 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i599JTS1063734 for ; Wed, 9 Jun 2004 09:19:29 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i599JTbD063731 for perforce@freebsd.org; Wed, 9 Jun 2004 09:19:29 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 09:19:29 GMT Message-Id: <200406090919.i599JTbD063731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 09:19:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=54457 Change 54457 by jmallett@jmallett_oingo on 2004/06/09 09:18:35 Add a direct KSEG1 bus space monkey and make it go ook. Affected files ... .. //depot/projects/mips/sys/mips/include/bus.h#4 edit .. //depot/projects/mips/sys/mips/mips/bus_machdep.c#1 add Differences ... ==== //depot/projects/mips/sys/mips/include/bus.h#4 (text+ko) ==== @@ -76,4 +76,7 @@ #undef BUSSPACE_WRITE #undef BUSSPACE_WRAPPER +/* Map directly through device space. */ +extern bus_space_tag_t device_space_tag; + #endif /* !_MACHINE_BUS_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 9 09:20:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6582F16A4D1; Wed, 9 Jun 2004 09:20:32 +0000 (GMT) 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 3B68316A4CE for ; Wed, 9 Jun 2004 09:20:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 207EC43D39 for ; Wed, 9 Jun 2004 09:20:32 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i599KVZM063807 for ; Wed, 9 Jun 2004 09:20:31 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i599KVCb063804 for perforce@freebsd.org; Wed, 9 Jun 2004 09:20:31 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 09:20:31 GMT Message-Id: <200406090920.i599KVCb063804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 09:20:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=54459 Change 54459 by jmallett@jmallett_oingo on 2004/06/09 09:19:32 Change how children are attached and stuff... Learn the lesson that you have to go through bus_generic_attach or do the probe_and_attach on children yourself! Affected files ... .. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#5 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/imc/imc.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#4 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#5 $ */ #include @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -64,36 +65,51 @@ "imc", imc_methods, 1 }; +static const char *imc_devices[] = { + "gio", + NULL +}; + +static const u_long imc_port = 0x1fa00000; /* XXX hints */ + +#define IMC_READ_4(port, r) \ + bus_space_read_4(device_space_tag, (port), (r)) + +#define IMC_WRITE_4(port, r, v) \ + bus_space_write_4(device_space_tag, (port), (r), (v)) + static int imc_probe(device_t dev) { + const char **namep; + + if (device_get_unit(dev) != 0) + return (ENXIO); + switch (mach_type) { case MACH_SGI_IP22: + device_set_desc(dev, "IMC Bus"); + for (namep = imc_devices; *namep != NULL; namep++) + device_add_child(dev, *namep, -1); return (0); default: return (ENOENT); } } -#define IMC_READ_4(port, r) \ - (*(volatile uint32_t *)(MIPS_PHYS_TO_KSEG1(port) | r)) - -#define IMC_WRITE_4(port, r, v) \ - ((*(volatile uint32_t *)(MIPS_PHYS_TO_KSEG1(port) | r)) = (v)) - static int imc_attach(device_t dev) { - const u_long port = 0x1fa00000; /* XXX hints */ + uint32_t reg; uint32_t sysid; - uint32_t reg; - sysid = IMC_READ_4(port, IMC_SYSID); - device_printf(dev, "revision %d, EISA %s\n", sysid & IMC_SYSID_REVMASK, sysid & IMC_SYSID_HAVEISA ? "present" : "not present"); + sysid = IMC_READ_4(imc_port, IMC_SYSID); + device_printf(dev, "revision %d, EISA %s\n", sysid & IMC_SYSID_REVMASK, + sysid & IMC_SYSID_HAVEISA ? "present" : "not present"); /* Clear error status. */ - IMC_WRITE_4(port, IMC_CPU_ERRSTAT, 0); - IMC_WRITE_4(port, IMC_GIO_ERRSTAT, 0); + IMC_WRITE_4(imc_port, IMC_CPU_ERRSTAT, 0); + IMC_WRITE_4(imc_port, IMC_GIO_ERRSTAT, 0); /* * Enable parity reporting on GIO/main memory transactions. @@ -103,15 +119,15 @@ * has the opposite sense... Turning it on turns the checks off!). * Finally, turn on interrupt writes to the CPU from the MC. */ - reg = IMC_READ_4(port, IMC_CPUCTRL0); + reg = IMC_READ_4(imc_port, IMC_CPUCTRL0); reg &= ~IMC_CPUCTRL0_NCHKMEMPAR; reg |= (IMC_CPUCTRL0_GPR | IMC_CPUCTRL0_MPR | IMC_CPUCTRL0_INTENA); - IMC_WRITE_4(port, IMC_CPUCTRL0, reg); + IMC_WRITE_4(imc_port, IMC_CPUCTRL0, reg); /* Setup the MC write buffer depth */ - reg = IMC_READ_4(port, IMC_CPUCTRL1); + reg = IMC_READ_4(imc_port, IMC_CPUCTRL1); reg = (reg & ~IMC_CPUCTRL1_MCHWMSK) | 13; - IMC_WRITE_4(port, IMC_CPUCTRL1, reg); + IMC_WRITE_4(imc_port, IMC_CPUCTRL1, reg); /* * Set GIO64 arbitrator configuration register: @@ -120,7 +136,7 @@ * on the graphics variant present and I'm not sure how to figure * that out or 100% sure what the correct settings are for each. */ - reg = IMC_READ_4(port, IMC_GIO64ARB); + reg = IMC_READ_4(imc_port, IMC_GIO64ARB); reg &= (IMC_GIO64ARB_GRX64 | IMC_GIO64ARB_GRXRT | IMC_GIO64ARB_GRXMST); /* GIO64 invariant for all IP22 platforms: one GIO bus, HPC1 @ 64 */ @@ -149,9 +165,9 @@ } break; } - IMC_WRITE_4(port, IMC_GIO64ARB, reg); + IMC_WRITE_4(imc_port, IMC_GIO64ARB, reg); - device_add_child(dev, "gio", 0); + bus_generic_attach(dev); return (0); } From owner-p4-projects@FreeBSD.ORG Wed Jun 9 09:20:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA58316A4D9; Wed, 9 Jun 2004 09:20:33 +0000 (GMT) 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 60D2816A4D8 for ; Wed, 9 Jun 2004 09:20:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41B7143D39 for ; Wed, 9 Jun 2004 09:20:33 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i599KXMw063822 for ; Wed, 9 Jun 2004 09:20:33 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i599KWxP063818 for perforce@freebsd.org; Wed, 9 Jun 2004 09:20:32 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 09:20:32 GMT Message-Id: <200406090920.i599KWxP063818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 09:20:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=54461 Change 54461 by jmallett@jmallett_oingo on 2004/06/09 09:20:22 Do evil GIO64 things which aren't really evil. Gotta do hints stuff to be able to look up children rather than this crap done to check for products ala NetBSD. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/gio/gio.c#2 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/gio/gio.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/gio/gio.c#1 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/gio/gio.c#2 $ */ #include @@ -34,9 +34,11 @@ #include #include #include +#include #include #include +#include static devclass_t gio_devclass; @@ -44,12 +46,11 @@ * Device methods */ static int gio_probe(device_t); -static int gio_attach(device_t); static device_method_t gio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gio_probe), - DEVMETHOD(device_attach, gio_attach), + DEVMETHOD(device_attach, bus_generic_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), @@ -64,27 +65,72 @@ "gio", gio_methods, 1 }; +static struct gio_device { + const char *gd_name; + uint32_t gd_product; +} gio_devices[] = { + { NULL, 0x00000000 } +}; + +static struct gio_ivar gio_slots[] = { + { NULL, 0x1f000000 }, + { NULL, 0x1f400000 }, + { NULL, 0x1f600000 }, + { NULL, 0x00000000 } +}; + +static int +gio_configure(device_t gio, struct gio_ivar *iv) +{ + struct gio_device *gd; + uint32_t product; + device_t dev; + + product = bus_space_read_4(iv->gi_tag, iv->gi_handle, 0); + for (gd = gio_devices; gd->gd_name != NULL; gd++) { + if (gd->gd_product == product) { + dev = device_add_child(gio, gd->gd_name, -1); + if (dev != NULL) { + device_set_ivars(dev, iv); + return (0); + } + } + } + return (ENOENT); +} + static int gio_probe(device_t dev) { + struct gio_ivar *iv; + int count; + int error; + + count = 0; + switch (mach_type) { case MACH_SGI_IP22: + device_set_desc(dev, "GIO64 Bus"); + for (iv = gio_slots; iv->gi_handle != 0; iv++) { + if (iv->gi_tag != NULL) + continue; + count++; + iv->gi_tag = device_space_tag; + error = gio_configure(dev, iv); + if (error != 0) { + iv->gi_tag = NULL; + count--; + } + } + if (count == 0) + device_printf(dev, "no children found\n"); + device_add_child(dev, "hpc", 0); + device_add_child(dev, "hpc", 1); + device_add_child(dev, "hpc", 2); return (0); default: return (ENOENT); } } -#define GIO_READ_4(port, r) \ - (*(volatile uint32_t *)(MIPS_PHYS_TO_KSEG1(port) | r)) - -#define GIO_WRITE_4(port, r, v) \ - ((*(volatile uint32_t *)(MIPS_PHYS_TO_KSEG1(port) | r)) = (v)) - -static int -gio_attach(device_t dev) -{ - return (0); -} - DRIVER_MODULE(gio, imc, gio_driver, gio_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Wed Jun 9 09:21:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EFB316A4D1; Wed, 9 Jun 2004 09:21:37 +0000 (GMT) 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 0979816A4CE for ; Wed, 9 Jun 2004 09:21:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03C3D43D31 for ; Wed, 9 Jun 2004 09:21:37 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i599LYpC064782 for ; Wed, 9 Jun 2004 09:21:34 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i599LYkN064773 for perforce@freebsd.org; Wed, 9 Jun 2004 09:21:34 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 09:21:34 GMT Message-Id: <200406090921.i599LYkN064773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 09:21:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=54462 Change 54462 by jmallett@jmallett_oingo on 2004/06/09 09:20:36 don't need nexus Affected files ... .. //depot/projects/mips/sys/mips/mips/autoconf.c#4 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/autoconf.c#4 (text+ko) ==== @@ -31,8 +31,6 @@ #include #include -static device_t nexusdev; - static void configure(void *); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL); @@ -40,7 +38,6 @@ static void configure(void *arg) { - nexusdev = device_add_child(root_bus, "nexus", 0); platform_configure(); root_bus_configure(); From owner-p4-projects@FreeBSD.ORG Wed Jun 9 09:21:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E097E16A4D7; Wed, 9 Jun 2004 09:21:37 +0000 (GMT) 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 879AF16A4FE for ; Wed, 9 Jun 2004 09:21:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FC1643D48 for ; Wed, 9 Jun 2004 09:21:37 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i599LZDW064797 for ; Wed, 9 Jun 2004 09:21:35 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i599LZsO064788 for perforce@freebsd.org; Wed, 9 Jun 2004 09:21:35 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 09:21:35 GMT Message-Id: <200406090921.i599LZsO064788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 09:21:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=54463 Change 54463 by jmallett@jmallett_oingo on 2004/06/09 09:20:58 Add hpc. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#33 edit .. //depot/projects/mips/sys/mips/conf/INDY#8 edit .. //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#1 add Differences ... ==== //depot/projects/mips/sys/conf/files.mips#33 (text+ko) ==== @@ -11,6 +11,7 @@ # This stanza is MIPS MD files. mips/mips/autoconf.c standard +mips/mips/bus_machdep.c standard mips/mips/critical.c standard mips/mips/elf_machdep.c standard mips/mips/exception.S standard @@ -58,6 +59,8 @@ mips/sgimips/gio/gio.c optional gio +mips/sgimips/hpc/hpc.c optional hpc + mips/sgimips/imc/imc.c optional imc libkern/bcmp.c standard ==== //depot/projects/mips/sys/mips/conf/INDY#8 (text+ko) ==== @@ -19,6 +19,7 @@ # Hardware support device arcs #ARCS Firmware + Console device imc #IMC bus. +device hpc #HPC bus. device gio #GIO bus. # Debugging for use in -current From owner-p4-projects@FreeBSD.ORG Wed Jun 9 09:21:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22F6216A4E6; Wed, 9 Jun 2004 09:21:38 +0000 (GMT) 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 D896516A4D8 for ; Wed, 9 Jun 2004 09:21:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3E5F43D45 for ; Wed, 9 Jun 2004 09:21:37 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i599LarS064809 for ; Wed, 9 Jun 2004 09:21:36 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i599LZZt064800 for perforce@freebsd.org; Wed, 9 Jun 2004 09:21:35 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 09:21:35 GMT Message-Id: <200406090921.i599LZZt064800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 09:21:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=54464 Change 54464 by jmallett@jmallett_oingo on 2004/06/09 09:21:19 forgot to add this... Affected files ... .. //depot/projects/mips/sys/mips/sgimips/gio/giovar.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 9 09:48:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A297516A4D1; Wed, 9 Jun 2004 09:48:12 +0000 (GMT) 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 7A2F416A4CE for ; Wed, 9 Jun 2004 09:48:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CA4D43D1D for ; Wed, 9 Jun 2004 09:48:12 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i599mC8T069998 for ; Wed, 9 Jun 2004 09:48:12 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i599mBIR069995 for perforce@freebsd.org; Wed, 9 Jun 2004 09:48:11 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 09:48:11 GMT Message-Id: <200406090948.i599mBIR069995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54470 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 09:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=54470 Change 54470 by jmallett@jmallett_oingo on 2004/06/09 09:47:23 Swing at using hints to figure out which port hpc is at. Affected files ... .. //depot/projects/mips/sys/mips/conf/INDY#9 edit .. //depot/projects/mips/sys/mips/conf/INDY.hints#1 add .. //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#2 edit Differences ... ==== //depot/projects/mips/sys/mips/conf/INDY#9 (text+ko) ==== @@ -8,6 +8,8 @@ ident INDY maxusers 0 +hints "INDY.hints" + makeoptions MIPSOPTS=-mips3 #Build for a MIPS III makeoptions TEXTADDR=0xA8069000 #Indy ==== //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#1 $ + * $P4: //depot/projects/mips/sys/mips/sgimips/hpc/hpc.c#2 $ */ #include @@ -60,40 +60,40 @@ { 0, 0 } }; +struct hpc_softc { + bus_space_tag_t sc_tag; + bus_space_handle_t sc_handle; +}; + static driver_t hpc_driver = { - "hpc", hpc_methods, 1 + "hpc", hpc_methods, sizeof (struct hpc_softc) }; -#define HPC_READ_4(port, r) \ - bus_space_read_4(device_space_tag, (port), (r)) +#define HPC_READ_4(sc, r) \ + bus_space_read_4((sc)->sc_tag, (sc)->sc_handle, (r)) -#define HPC_WRITE_4(port, r, v) \ - bus_space_write_4(device_space_tag, (port), (r), (v)) +#define HPC_WRITE_4(sc, r, v) \ + bus_space_write_4((sc)->sc_tag, (sc)->sc_handle, (r), (v)) static int hpc_probe(device_t dev) { - uint32_t port; + struct hpc_softc *sc; + long port; + int error; + + sc = device_get_softc(dev); switch (mach_type) { case MACH_SGI_IP22: device_set_desc(dev, "HPC3 Bus"); - /* XXX Need to go through hints here! */ - switch (device_get_unit(dev)) { - case 0: - port = 0x1fb80000; - break; - case 1: - port = 0x1fb00000; - break; - case 2: - port = 0x1f980000; - break; - default: - return (ENXIO); - } - HPC_READ_4(port, 0); - device_printf(dev, "port %#x\n", port); + error = resource_long_value(device_get_name(dev), + device_get_unit(dev), + "port", &port); + if (error != 0) + return (ENODEV); + sc->sc_tag = device_space_tag; + sc->sc_handle = port; return (0); default: return (ENOENT); @@ -103,6 +103,12 @@ static int hpc_attach(device_t dev) { + struct hpc_softc *sc; + + sc = device_get_softc(dev); + + device_printf(dev, "port %#lx\n", (long)sc->sc_handle); + bus_generic_attach(dev); return (0); From owner-p4-projects@FreeBSD.ORG Wed Jun 9 11:01:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1552516A4D1; Wed, 9 Jun 2004 11:01:57 +0000 (GMT) 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 DDFBE16A4CE for ; Wed, 9 Jun 2004 11:01:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C008243D1F for ; Wed, 9 Jun 2004 11:01:56 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i59B1jHH086483 for ; Wed, 9 Jun 2004 11:01:45 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i59B1iRp086474 for perforce@freebsd.org; Wed, 9 Jun 2004 11:01:44 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 11:01:44 GMT Message-Id: <200406091101.i59B1iRp086474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 11:01:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=54474 Change 54474 by jmallett@jmallett_oingo on 2004/06/09 11:01:30 Add R12K for giggles. Affected files ... .. //depot/projects/mips/sys/conf/options.mips#14 edit Differences ... ==== //depot/projects/mips/sys/conf/options.mips#14 (text+ko) ==== @@ -8,6 +8,7 @@ R4600 opt_global.h R5000 opt_global.h R10000 opt_global.h +R12000 opt_global.h SB1 opt_global.h SBMIPS opt_platform.h From owner-p4-projects@FreeBSD.ORG Wed Jun 9 12:41:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7361716A4D7; Wed, 9 Jun 2004 12:41:01 +0000 (GMT) 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 2FD9416A4D2 for ; Wed, 9 Jun 2004 12:41:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 129A643D1D for ; Wed, 9 Jun 2004 12:41:01 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i59CertS008270 for ; Wed, 9 Jun 2004 12:40:53 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i59CerdI008267 for perforce@freebsd.org; Wed, 9 Jun 2004 12:40:53 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 12:40:53 GMT Message-Id: <200406091240.i59CerdI008267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 12:41:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=54487 Change 54487 by jmallett@jmallett_oingo on 2004/06/09 12:40:11 Make build without IP22. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#31 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#31 (text+ko) ==== @@ -56,7 +56,9 @@ void (*init)(void); int type; } machines[] = { +#ifdef IP22 { "SGI-IP22", ip22_init, MACH_SGI_IP22 }, +#endif { NULL, NULL, 0 } }; From owner-p4-projects@FreeBSD.ORG Wed Jun 9 13:54:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9394416A4D1; Wed, 9 Jun 2004 13:54:25 +0000 (GMT) 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 4C2F316A4D0 for ; Wed, 9 Jun 2004 13:54:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3260943D49 for ; Wed, 9 Jun 2004 13:54:25 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i59DsNsP031125 for ; Wed, 9 Jun 2004 13:54:23 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i59DsNae031122 for perforce@freebsd.org; Wed, 9 Jun 2004 13:54:23 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 9 Jun 2004 13:54:23 GMT Message-Id: <200406091354.i59DsNae031122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 13:54:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=54490 Change 54490 by jmallett@jmallett_oingo on 2004/06/09 13:53:29 Take out some aggression on binutils for wasting 4 hours of my night and still refusing to DWIM. It seems that we need both the trad and non-trad elf32 stuff for life to be good. This is stupid and makes little sense to me. Probably something is just slightly off and it would rather give stupid error messages than just come out and tell me that it can't do BLAH without BLAH. I'm willing to listen, really. Instead though, it does that. I really just want the *trad* targets, but that seems to make BFD very, very unhappy. I made the config.bfd match what Linux has, which seems to imply you can do *trad* only. And I made the libbfd/Makefile.mips match this. But did it work? No. So I tried without the *trad*, but of course, that's the original problem. I can get over ambiguity with lots of --format and --oformat and --HURRRRRRRRRR, but the problem is for elf64-bigmips, BFD wants (and I mean really wants) to act like it's targetting IRIX6 userland. This makes my head hurt. And elf64-tradbigmips is no picnic either. Refcount explodey in the Kernel build w.r.t. strtab. I hate BU, I hate BFD. Hate Hate Hate. Flaming death upon it. That is all. Affected files ... .. //depot/projects/mips/contrib/binutils/bfd/config.bfd#5 edit .. //depot/projects/mips/gnu/usr.bin/binutils/libbfd/Makefile.mips#8 edit Differences ... ==== //depot/projects/mips/contrib/binutils/bfd/config.bfd#5 (text+ko) ==== @@ -675,7 +675,7 @@ ;; mips*-*-freebsd*) targ_defvec=bfd_elf32_tradbigmips_vec - targ_selvecs="bfd_elf32_bigmips_vec bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec" + targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec" ;; mips*el-*-netbsd*) targ_defvec=bfd_elf32_littlemips_vec ==== //depot/projects/mips/gnu/usr.bin/binutils/libbfd/Makefile.mips#8 (text+ko) ==== @@ -16,7 +16,14 @@ elflink.c \ elfxx-mips.c \ elfxx-target.h -VECS+= bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_bigmips_vec bfd_elf32_littlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec +VECS+= bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_bigmips_vec bfd_elf32_littlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec +# XXX troublemakers due to ambiguity, and BFD behaves badly if we only have +# *trad*. I'm sick of fighting it. +# The real problem here is that we have to use the *trad* at all. If we +# use elf64 (at least) in non-trad mode, BU seems to assume the binary will +# run on an IRIX system, and enforces such things as the rld_map section +# existing, but does not create it. gross gross gross. +#bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec # XXXMIPS Conditionalie on the MACHINE/MACHINE_ARCH targetry to decide # whether elf{32,64}_{big,little}mips vectors, but default to the likely @@ -24,14 +31,7 @@ .if ${TARGET_ARCH} == "mips" CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_tradbigmips_vec .endif -CFLAGS+= -DHAVE_bfd_elf32_tradbigmips_vec \ - -DHAVE_bfd_elf32_tradlittlemips_vec \ - -DHAVE_bfd_elf32_bigmips_vec \ - -DHAVE_bfd_elf32_littlemips_vec \ - -DHAVE_bfd_elf64_tradbigmips_vec \ - -DHAVE_bfd_elf64_tradlittlemips_vec \ - -DHAVE_bfd_elf64_bigmips_vec \ - -DHAVE_bfd_elf64_littlemips_vec + CLEANFILES+= elf32-target.h elf64-target.h elf32-target.h: elfxx-target.h From owner-p4-projects@FreeBSD.ORG Wed Jun 9 21:10:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFF3016A4DF; Wed, 9 Jun 2004 21:10:40 +0000 (GMT) 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 A3BA816A4D3 for ; Wed, 9 Jun 2004 21:10:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A3F943D2F for ; Wed, 9 Jun 2004 21:10:40 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i59LAe1t045473 for ; Wed, 9 Jun 2004 21:10:40 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i59LAcm4045470 for perforce@freebsd.org; Wed, 9 Jun 2004 21:10:38 GMT (envelope-from peter@freebsd.org) Date: Wed, 9 Jun 2004 21:10:38 GMT Message-Id: <200406092110.i59LAcm4045470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 21:10:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=54523 Change 54523 by peter@peter_daintree on 2004/06/09 21:09:53 IFC @54520 Affected files ... .. //depot/projects/hammer/bin/ls/ls.c#12 integrate .. //depot/projects/hammer/bin/ls/print.c#14 integrate .. //depot/projects/hammer/contrib/cvs/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/etc/rc.d/preseedrandom#3 integrate .. //depot/projects/hammer/lib/libc/gen/fts.c#7 integrate .. //depot/projects/hammer/lib/libc/stdio/fvwrite.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/local.h#11 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#15 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#14 integrate .. //depot/projects/hammer/lib/libc/stdio/wbuf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/hammer/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/hammer/lib/libkvm/kvm.c#5 integrate .. //depot/projects/hammer/lib/libvgl/main.c#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#14 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#23 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#25 integrate .. //depot/projects/hammer/share/examples/kld/cdev/module/cdev.c#2 integrate .. //depot/projects/hammer/share/man/man4/bge.4#8 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#78 integrate .. //depot/projects/hammer/sys/conf/files#60 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#28 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#32 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#17 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#18 integrate .. //depot/projects/hammer/sys/dev/eisa/eisa_if.m#1 branch .. //depot/projects/hammer/sys/dev/eisa/eisaconf.c#6 integrate .. //depot/projects/hammer/sys/dev/eisa/eisaconf.h#3 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#13 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#13 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#11 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#16 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#16 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#15 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#18 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#14 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#13 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#16 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#21 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#51 integrate .. //depot/projects/hammer/sys/kern/tty.c#15 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#17 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/hammer/sys/modules/em/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ipfilter/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/hammer/sys/net/netisr.h#5 integrate .. //depot/projects/hammer/sys/net/rtsock.c#13 integrate .. //depot/projects/hammer/sys/netatm/atm_ioctl.h#5 integrate .. //depot/projects/hammer/sys/netinet/in.h#11 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#11 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#28 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#21 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#34 integrate .. //depot/projects/hammer/sys/pci/if_de.c#15 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#19 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#34 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#20 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#27 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#27 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#26 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#21 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#19 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#37 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#24 integrate .. //depot/projects/hammer/sys/sys/tty.h#7 integrate .. //depot/projects/hammer/sys/sys/vmmeter.h#4 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#19 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#25 integrate .. //depot/projects/hammer/usr.sbin/adduser/rmuser.8#3 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#6 integrate .. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.c#9 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.8#4 integrate Differences ... ==== //depot/projects/hammer/bin/ls/ls.c#12 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.77 2004/06/03 15:04:00 le Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.78 2004/06/08 09:30:10 das Exp $"); #include #include @@ -452,7 +452,13 @@ fts_open(argv, options, f_nosort ? NULL : mastercmp)) == NULL) err(1, "fts_open"); - display(NULL, fts_children(ftsp, 0), options); + /* + * We ignore errors from fts_children here since they will be + * replicated and signalled on the next call to fts_read() below. + */ + chp = fts_children(ftsp, 0); + if (chp != NULL) + display(NULL, chp, options); if (f_listdir) return; @@ -533,16 +539,6 @@ char ngroup[STRBUF_SIZEOF(uid_t) + 1]; char nuser[STRBUF_SIZEOF(gid_t) + 1]; - /* - * If list is NULL there are two possibilities: that the parent - * directory p has no children, or that fts_children() returned an - * error. We ignore the error case since it will be replicated - * on the next call to fts_read() on the post-order visit to the - * directory p, and will be signaled in traverse(). - */ - if (list == NULL) - return; - needstats = f_inode || f_longform || f_size; flen = 0; btotal = 0; @@ -784,7 +780,13 @@ ++entries; } - if (!entries) + /* + * If there are no entries to display, we normally stop right + * here. However, we must continue if we have to display the + * total block count. In this case, we display the total only + * on the second (p != NULL) pass. + */ + if (!entries && (!(f_longform || f_size) || p == NULL)) return; d.list = list; ==== //depot/projects/hammer/bin/ls/print.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.72 2004/05/25 14:53:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.73 2004/06/08 09:27:42 das Exp $"); #include #include @@ -142,8 +142,10 @@ int haveacls; dev_t prevdev; - if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) + if ((dp->list == NULL || dp->list->fts_level != FTS_ROOTLEVEL) && + (f_longform || f_size)) { (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); + } haveacls = 1; prevdev = (dev_t)-1; @@ -294,8 +296,10 @@ if (num % numcols) ++numrows; - if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) + if ((dp->list == NULL || dp->list->fts_level != FTS_ROOTLEVEL) && + (f_longform || f_size)) { (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); + } base = 0; for (row = 0; row < numrows; ++row) { ==== //depot/projects/hammer/etc/rc.d/preseedrandom#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/preseedrandom,v 1.3 2004/06/07 09:16:19 obrien Exp $ +# $FreeBSD: src/etc/rc.d/preseedrandom,v 1.4 2004/06/08 19:53:25 obrien Exp $ # # PROVIDE: preseedrandom @@ -30,7 +30,7 @@ # First pass at reseeding /dev/random. # if [ -w /dev/random ]; then - feed_dev_random ${entropy_file} + feed_dev_random "/entropy" fi echo -n ' kickstart' ==== //depot/projects/hammer/lib/libc/gen/fts.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.26 2004/05/13 15:59:38 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.27 2004/06/08 06:23:23 das Exp $"); #include "namespace.h" #include @@ -710,8 +710,6 @@ cur->fts_flags |= FTS_DONTCHDIR; descend = 0; cderrno = errno; - (void)closedir(dirp); - dirp = NULL; } else descend = 1; } else ==== //depot/projects/hammer/lib/libc/stdio/fvwrite.c#3 (text+ko) ==== @@ -38,9 +38,8 @@ static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.16 2004/03/02 19:43:51 jkh Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.17 2004/06/08 05:45:48 das Exp $"); -#include #include #include #include @@ -68,10 +67,8 @@ if ((len = uio->uio_resid) == 0) return (0); /* make sure we can write */ - if (cantwrite(fp)) { - errno = EBADF; + if (prepwrite(fp) != 0) return (EOF); - } #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define COPY(n) (void)memcpy((void *)fp->_p, (void *)p, (size_t)(n)) ==== //depot/projects/hammer/lib/libc/stdio/local.h#11 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.24 2004/05/22 15:19:41 tjr Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.25 2004/06/08 05:45:32 das Exp $ */ #include /* for off_t */ @@ -93,9 +93,10 @@ }; /* - * Return true iff the given FILE cannot be written now. + * Prepare the given FILE for writing, and return 0 iff it + * can be written now. Otherwise, return EOF and set errno. */ -#define cantwrite(fp) \ +#define prepwrite(fp) \ ((((fp)->_flags & __SWR) == 0 || \ ((fp)->_bf._base == NULL && ((fp)->_flags & __SSTR) == 0)) && \ __swsetup(fp)) ==== //depot/projects/hammer/lib/libc/stdio/vfprintf.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.65 2004/05/02 10:55:05 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.67 2004/06/08 12:03:48 stefanf Exp $"); /* * Actual printf innards. @@ -642,7 +642,7 @@ decimal_point = localeconv()->decimal_point; #endif /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */ - if (cantwrite(fp)) + if (prepwrite(fp) != 0) return (EOF); /* optimise fprintf(stderr) (and other unbuffered Unix files) */ @@ -1273,7 +1273,7 @@ */ #define ADDTYPE(type) \ ((nextarg >= tablesize) ? \ - __grow_type_table(nextarg, &typetable, &tablesize) : 0, \ + __grow_type_table(nextarg, &typetable, &tablesize) : (void)0, \ (nextarg > tablemax) ? tablemax = nextarg : 0, \ typetable[nextarg++] = type) ==== //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#14 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* LIBC_SCCS and not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.20 2004/05/02 20:09:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.22 2004/06/08 12:03:48 stefanf Exp $"); /* * Actual wprintf innards. @@ -648,7 +648,7 @@ #endif convbuf = NULL; /* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */ - if (cantwrite(fp)) + if (prepwrite(fp) != 0) return (EOF); /* optimise fprintf(stderr) (and other unbuffered Unix files) */ @@ -1268,7 +1268,7 @@ */ #define ADDTYPE(type) \ ((nextarg >= tablesize) ? \ - __grow_type_table(nextarg, &typetable, &tablesize) : 0, \ + __grow_type_table(nextarg, &typetable, &tablesize) : (void)0, \ (nextarg > tablemax) ? tablemax = nextarg : 0, \ typetable[nextarg++] = type) ==== //depot/projects/hammer/lib/libc/stdio/wbuf.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/wbuf.c,v 1.10 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/wbuf.c,v 1.11 2004/06/08 05:45:32 das Exp $"); #include #include "local.h" @@ -65,7 +65,7 @@ * calls might wrap _w from negative to positive. */ fp->_w = fp->_lbfsize; - if (cantwrite(fp)) + if (prepwrite(fp) != 0) return (EOF); c = (unsigned char)c; ==== //depot/projects/hammer/lib/libc/stdio/wsetup.c#2 (text+ko) ==== @@ -38,8 +38,9 @@ static char sccsid[] = "@(#)wsetup.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.8 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.9 2004/06/08 05:44:52 das Exp $"); +#include #include #include #include "local.h" @@ -47,7 +48,7 @@ /* * Various output routines call wsetup to be sure it is safe to write, * because either _flags does not include __SWR, or _buf is NULL. - * _wsetup returns 0 if OK to write, nonzero otherwise. + * _wsetup returns 0 if OK to write; otherwise, it returns EOF and sets errno. */ int __swsetup(fp) @@ -61,8 +62,10 @@ * If we are not writing, we had better be reading and writing. */ if ((fp->_flags & __SWR) == 0) { - if ((fp->_flags & __SRW) == 0) + if ((fp->_flags & __SRW) == 0) { + errno = EBADF; return (EOF); + } if (fp->_flags & __SRD) { /* clobber any ungetc data */ if (HASUB(fp)) ==== //depot/projects/hammer/lib/libc/stdtime/localtime.c#4 (text+ko) ==== @@ -9,7 +9,7 @@ static char elsieid[] __unused = "@(#)localtime.c 7.57"; #endif /* !defined NOID */ #endif /* !defined lint */ -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.36 2003/02/16 17:29:11 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.37 2004/06/08 12:20:40 stefanf Exp $"); /* ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu). @@ -1508,12 +1508,7 @@ ** It's okay to guess wrong since the guess ** gets checked. */ - /* - ** The (void *) casts are the benefit of SunOS 3.3 on Sun 2's. - */ - sp = (const struct state *) - (((void *) funcp == (void *) localsub) ? - lclptr : gmtptr); + sp = (funcp == localsub) ? lclptr : gmtptr; #ifdef ALL_STATE if (sp == NULL) return WRONG; @@ -1583,11 +1578,7 @@ ** We try to divine the type they started from and adjust to the ** type they need. */ - /* - ** The (void *) casts are the benefit of SunOS 3.3 on Sun 2's. - */ - sp = (const struct state *) (((void *) funcp == (void *) localsub) ? - lclptr : gmtptr); + sp = (funcp == localsub) ? lclptr : gmtptr; #ifdef ALL_STATE if (sp == NULL) return WRONG; ==== //depot/projects/hammer/lib/libkvm/kvm.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.25 2003/10/29 14:02:16 simokawa Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.26 2004/06/08 13:08:19 stefanf Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -347,7 +347,7 @@ size_t len; { int cc; - void *cp; + char *cp; if (ISALIVE(kd)) { /* @@ -394,11 +394,11 @@ */ if (cc == 0) break; - (char *)cp += cc; + cp += cc; kva += cc; len -= cc; } - return ((char *)cp - (char *)buf); + return (cp - (char *)buf); } /* NOTREACHED */ } ==== //depot/projects/hammer/lib/libvgl/main.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libvgl/main.c,v 1.14 2002/06/02 20:05:39 schweikh Exp $"); +__FBSDID("$FreeBSD: src/lib/libvgl/main.c,v 1.15 2004/06/08 12:24:47 stefanf Exp $"); #include #include @@ -105,7 +105,7 @@ } static void -VGLAbort() +VGLAbort(int arg __unused) { VGLAbortPending = 1; signal(SIGINT, SIG_IGN); @@ -116,7 +116,7 @@ } static void -VGLSwitch() +VGLSwitch(int arg __unused) { if (!VGLOnDisplay) VGLOnDisplay = 1; ==== //depot/projects/hammer/lib/msun/src/math.h#14 (text+ko) ==== @@ -11,12 +11,13 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.33 2004/06/07 08:05:36 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.34 2004/06/09 10:32:05 das Exp $ */ #ifndef _MATH_H_ #define _MATH_H_ +#include #include /* @@ -150,8 +151,6 @@ #endif /* __BSD_VISIBLE */ -#include - /* * Most of these functions have the side effect of setting errno, so they * are not declared as __pure2. (XXX: this point needs to be revisited, ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + &os;/&arch; &release.current; Installation Instructions @@ -12,6 +12,7 @@ 2001 2002 2003 + 2004 The FreeBSD Documentation Project ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#23 (text+ko) ==== @@ -1,7 +1,7 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.144 2004/05/23 19:05:59 maxim Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.145 2004/06/09 20:10:37 ru Exp $ .\" -.Dd December 1, 2003 +.Dd June 9, 2004 .Dt IPFW 8 .Os .Sh NAME @@ -43,6 +43,15 @@ .Cm set show .Pp .Nm +.Cm table Ar number Cm add Ar addr Ns Oo / Ns Ar masklen Oc Op Ar value +.Nm +.Cm table Ar number Cm delete Ar addr Ns Op / Ns Ar masklen +.Nm +.Cm table Ar number Cm flush +.Nm +.Cm table Ar number Cm list +.Pp +.Nm .Brq Cm pipe | queue .Ar number .Cm config @@ -758,13 +767,26 @@ .Em or-block with multiple addresses) is provided for convenience only and its use is discouraged. -.It Ar addr : Oo Cm not Oc Brq Cm any | me | Ar addr-list | Ar addr-set +.It Ar addr : Oo Cm not Oc Bro +.Cm any | me | +.Cm table Ns Pq Ar number Ns Op , Ns Ar value +.Ar | addr-list | addr-set +.Brc .It Cm any matches any IP address. .It Cm me matches any IP address configured on an interface in the system. The address list is evaluated at the time the packet is analysed. +.It Cm table Ns Pq Ar number Ns Op , Ns Ar value +Matches any IP address for which an entry exists in the lookup table +.Ar number . +If an optional 32-bit unsigned +.Ar value +is also specified, an entry will match only if it has this value. +See the +.Sx LOOKUP TABLES +section below for more information on lookup tables. .It Ar addr-list : ip-addr Ns Op Ns , Ns Ar addr-list .It Ar ip-addr : A host or subnet address specified in one of the following ways: @@ -1248,6 +1270,43 @@ This option can be used to make anti-spoofing rules to reject all packets whose source address is unreachable. .El +.Sh LOOKUP TABLES +Lookup tables are useful to handle large sparse address sets, +typically from a hundred to several thousands of entries. +There could be 128 different lookup tables, numbered 0 to 127. +.Pp +Each entry is represented by an +.Ar addr Ns Op / Ns Ar masklen +and will match all addresses with base +.Ar addr +(specified as a dotted quad or a hostname) +and mask width of +.Ar masklen +bits. +If +.Ar masklen +is not specified, it defaults to 32. +When looking up an IP address in a table, the most specific +entry will match. +Associated with each entry is a 32-bit unsigned +.Ar value , +which can optionally be checked by a rule matching code. +When adding an entry, if +.Ar value +is not specified, it defaults to 0. +.Pp +An entry can be added to a table +.Pq Cm add , +removed from a table +.Pq Cm delete , +a table can be examined +.Pq Cm list +or flushed +.Pq Cm flush . +.Pp +Internally, each table is stored in a Radix tree, the same way as +the routing table (see +.Xr route 4 ) . .Sh SETS OF RULES Each rule belongs to one of 32 different .Em sets ==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#25 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.50 2004/06/02 21:12:55 csjp Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.51 2004/06/09 20:10:37 ru Exp $ */ #include @@ -385,7 +385,8 @@ err(EX_UNAVAILABLE, "socket"); if (optname == IP_FW_GET || optname == IP_DUMMYNET_GET || - optname == IP_FW_ADD) + optname == IP_FW_ADD || optname == IP_FW_TABLE_LIST || + optname == IP_FW_TABLE_GETSIZE) i = getsockopt(s, IPPROTO_IP, optname, optval, (socklen_t *)optlen); else @@ -714,6 +715,14 @@ printf("me"); return; } + if (cmd->o.opcode == O_IP_SRC_LOOKUP || + cmd->o.opcode == O_IP_DST_LOOKUP) { + printf("table(%u", ((ipfw_insn *)cmd)->arg1); + if (len == F_INSN_SIZE(ipfw_insn_u32)) + printf(",%u", *a); + printf(")"); + return; + } if (cmd->o.opcode == O_IP_SRC_SET || cmd->o.opcode == O_IP_DST_SET) { uint32_t x, *map = (uint32_t *)&(cmd->mask); int i, j; @@ -1088,6 +1097,7 @@ break; case O_IP_SRC: + case O_IP_SRC_LOOKUP: case O_IP_SRC_MASK: case O_IP_SRC_ME: case O_IP_SRC_SET: @@ -1102,6 +1112,7 @@ break; case O_IP_DST: + case O_IP_DST_LOOKUP: case O_IP_DST_MASK: case O_IP_DST_ME: case O_IP_DST_SET: @@ -1870,13 +1881,14 @@ "{pipe|queue} N config PIPE-BODY\n" "[pipe|queue] {zero|delete|show} [N{,N}]\n" "set [disable N... enable N...] | move [rule] X to Y | swap X Y | show\n" +"table N {add ip[/bits] [value] | delete ip[/bits] | flush | list}\n" "\n" "RULE-BODY: check-state [LOG] | ACTION [LOG] ADDR [OPTION_LIST]\n" "ACTION: check-state | allow | count | deny | reject | skipto N |\n" " {divert|tee} PORT | forward ADDR | pipe N | queue N\n" "ADDR: [ MAC dst src ether_type ] \n" " [ from IPADDR [ PORT ] to IPADDR [ PORTLIST ] ]\n" -"IPADDR: [not] { any | me | ip/bits{x,y,z} | IPLIST }\n" +"IPADDR: [not] { any | me | ip/bits{x,y,z} | table(t[,v]) | IPLIST }\n" "IPLIST: { ip | ip/bits | ip:mask }[,IPLIST]\n" "OPTION_LIST: OPTION [OPTION_LIST]\n" "OPTION: bridged | {dst-ip|src-ip} ADDR | {dst-port|src-port} LIST |\n" @@ -1932,6 +1944,21 @@ return; } + if (!strncmp(av, "table(", 6)) { + char *p = strchr(av + 6, ','); + + if (p) + *p++ = '\0'; + cmd->o.opcode = O_IP_DST_LOOKUP; + cmd->o.arg1 = strtoul(av + 6, NULL, 0); + if (p) { + cmd->o.len |= F_INSN_SIZE(ipfw_insn_u32); + d[0] = strtoul(p, NULL, 0); + } else + cmd->o.len |= F_INSN_SIZE(ipfw_insn); + return; + } + while (av) { /* * After the address we can have '/' or ':' indicating a mask, @@ -2663,6 +2690,8 @@ fill_ip((ipfw_insn_ip *)cmd, av); if (cmd->opcode == O_IP_DST_SET) /* set */ cmd->opcode = O_IP_SRC_SET; + else if (cmd->opcode == O_IP_DST_LOOKUP) /* table */ + cmd->opcode = O_IP_SRC_LOOKUP; else if (F_LEN(cmd) == F_INSN_SIZE(ipfw_insn)) /* me */ cmd->opcode = O_IP_SRC_ME; else if (F_LEN(cmd) == F_INSN_SIZE(ipfw_insn_u32)) /* one IP */ @@ -2678,6 +2707,8 @@ fill_ip((ipfw_insn_ip *)cmd, av); if (cmd->opcode == O_IP_DST_SET) /* set */ ; + else if (cmd->opcode == O_IP_DST_LOOKUP) /* table */ + ; else if (F_LEN(cmd) == F_INSN_SIZE(ipfw_insn)) /* me */ cmd->opcode = O_IP_DST_ME; else if (F_LEN(cmd) == F_INSN_SIZE(ipfw_insn_u32)) /* one IP */ @@ -3593,6 +3624,79 @@ } /* + * This one handles all table-related commands + * ipfw table N add addr[/masklen] [value] + * ipfw table N delete addr[/masklen] + * ipfw table N flush + * ipfw table N list + */ +static void +table_handler(int ac, char *av[]) +{ + ipfw_table_entry ent; + ipfw_table *tbl; + int do_add; + char *p; + socklen_t l; + uint32_t a; + + ac--; av++; + if (ac && isdigit(**av)) { + ent.tbl = atoi(*av); + ac--; av++; + } else + errx(EX_USAGE, "table number required"); + NEED1("table needs command"); + if (strncmp(*av, "add", strlen(*av)) == 0 || + strncmp(*av, "delete", strlen(*av)) == 0) { + do_add = **av == 'a'; + ac--; av++; + if (!ac) + errx(EX_USAGE, "IP address required"); + p = strchr(*av, '/'); + if (p) { + *p++ = '\0'; + ent.masklen = atoi(p); + if (ent.masklen > 32) + errx(EX_DATAERR, "bad width ``%s''", p); + } else + ent.masklen = 32; + if (lookup_host(*av, (struct in_addr *)&ent.addr) != 0) + errx(EX_NOHOST, "hostname ``%s'' unknown", av); + ac--; av++; + if (do_add && ac) + ent.value = strtoul(*av, NULL, 0); + else + ent.value = 0; + if (do_cmd(do_add ? IP_FW_TABLE_ADD : IP_FW_TABLE_DEL, + &ent, sizeof(ent)) < 0) + err(EX_OSERR, "setsockopt(IP_FW_TABLE_%s)", + do_add ? "ADD" : "DEL"); + } else if (strncmp(*av, "flush", strlen(*av)) == 0) { + if (do_cmd(IP_FW_TABLE_FLUSH, &ent.tbl, sizeof(ent.tbl)) < 0) + err(EX_OSERR, "setsockopt(IP_FW_TABLE_FLUSH)"); + } else if (strncmp(*av, "list", strlen(*av)) == 0) { + a = ent.tbl; + l = sizeof(a); + if (do_cmd(IP_FW_TABLE_GETSIZE, &a, (uintptr_t)&l) < 0) + err(EX_OSERR, "getsockopt(IP_FW_TABLE_GETSIZE)"); + l = sizeof(*tbl) + a * sizeof(ipfw_table_entry); + tbl = malloc(l); + if (tbl == NULL) + err(EX_OSERR, "malloc"); + tbl->tbl = ent.tbl; + if (do_cmd(IP_FW_TABLE_LIST, tbl, (uintptr_t)&l) < 0) + err(EX_OSERR, "getsockopt(IP_FW_TABLE_LIST)"); + for (a = 0; a < tbl->cnt; a++) { + printf("%s/%u %u\n", + inet_ntoa(*(struct in_addr *)&tbl->ent[a].addr), + tbl->ent[a].masklen, tbl->ent[a].value); + } + } else + errx(EX_USAGE, "invalid table command %s", *av); +} + +/* * Called with the arguments (excluding program name). * Returns 0 if successful, 1 if empty command, errx() in case of errors. */ @@ -3822,6 +3926,8 @@ list(ac, av, do_acct); else if (!strncmp(*av, "set", strlen(*av))) sets_handler(ac, av); + else if (!strncmp(*av, "table", strlen(*av))) + table_handler(ac, av); else if (!strncmp(*av, "enable", strlen(*av))) sysctl_handler(ac, av, 1); else if (!strncmp(*av, "disable", strlen(*av))) ==== //depot/projects/hammer/share/examples/kld/cdev/module/cdev.c#2 (text+ko) ==== @@ -65,15 +65,13 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/share/examples/kld/cdev/module/cdev.c,v 1.5 2001/11/13 07:42:30 arr Exp $ + * $FreeBSD: src/share/examples/kld/cdev/module/cdev.c,v 1.7 2004/06/09 17:10:41 maxim Exp $ */ -#include +#include #include -#include #include #include #include -#include #include #include "cdev.h" @@ -139,7 +137,7 @@ error = EINVAL; break; } - return error; + return (error); } /* @@ -162,7 +160,7 @@ } /* - * The mydev_read function just takes the buf that was saved + * The mydev_read function just takes the buf that was saved * via mydev_write() and returns it to userland for * accessing. */ @@ -175,7 +173,7 @@ dev2udev(dev), uio, ioflag); if (len <= 0) { - err = -1; + err = -1; } else { /* copy buf to userland */ copystr(&buf, uio->uio_iov->iov_base, 513, &len); } ==== //depot/projects/hammer/share/man/man4/bge.4#8 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/bge.4,v 1.10 2004/05/28 21:16:13 simon Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.11 2004/06/08 17:36:17 brueffer Exp $ .\" .Dd September 27, 2001 .Dt BGE 4 @@ -85,7 +85,7 @@ Additional features may be provided via value-add firmware updates. The BCM570x supports TBI (ten bit interface) and GMII -transceivers, which means it can be used with either copper of 1000baseX +transceivers, which means it can be used with either copper or 1000baseX fiber applications. Note however the device only supports a single speed in TBI mode. ==== //depot/projects/hammer/share/man/man9/ifnet.9#13 (text+ko) ==== @@ -26,8 +26,8 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.39 2004/06/07 16:46:28 yar Exp $ -.Dd January 15, 1997 +.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.42 2004/06/08 09:54:53 yar Exp $ +.Dd June 8, 2004 .Os .Dt IFNET 9 .Sh NAME @@ -413,6 +413,16 @@ in this table; the latter are marked .Aq D . .Pp +The macro +.Dv IFF_CANTCHANGE +defines the bits which cannot be set by a user program using the +.Dv SIOCSIFFLAGS +command to +.Xr ioctl 2 ; +these are indicated by an asterisk +.Pq Ql * +in the following listing. +.Pp .Bl -tag -width ".Dv IFF_POINTOPOINT" -offset indent -compact .It Dv IFF_UP .Aq D @@ -467,15 +477,15 @@ .It Dv IFF_MULTICAST .Aq S* This interface supports multicast. +.It Dv IFF_POLLING +.Aq D* +The interface is in +.Xr polling 4 +mode. +See +.Sx Interface Capabilities Flags +for details. .El -.Pp -The macro -.Dv IFF_CANTCHANGE -defines the bits which cannot be set by a user program using the -.Dv SIOCSIFFLAGS -command to -.Xr ioctl 2 ; -these are indicated by an asterisk in the listing above. .Ss "Interface Capabilities Flags" Interface capabilities are specialized features an interface may or may not support. @@ -511,6 +521,10 @@ .Bl -tag -width ".Dv IFCAP_VLAN_HWTAGGING" -offset indent .It Dv IFCAP_NETCONS This interface can be a network console. +.It Dv IFCAP_POLLING +This interface supports +.Xr polling 4 . +See below for details. .It Dv IFCAP_RXCSUM This interface can do checksum validation on receiving data. Some interfaces do not have sufficient buffer storage to store frames @@ -587,6 +601,48 @@ See .Xr mbuf 9 for details. +.Pp +The capability of a network interface to operate in +.Xr polling 4 +mode involves several flags in different +global variables and per-interface fields. +First, there is a system-wide +.Xr sysctl 8 +master switch named +.Va kern.polling.enable , +which can toggle +.Xr polling 4 +globally. +If that variable is set to non-zero, +.Xr polling 4 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 9 22:44:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FBF416A4D2; Wed, 9 Jun 2004 22:44:36 +0000 (GMT) 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 39D5F16A4CE for ; Wed, 9 Jun 2004 22:44:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 323CE43D1F for ; Wed, 9 Jun 2004 22:44:36 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i59MiZVY066883 for ; Wed, 9 Jun 2004 22:44:35 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i59MiYjk066880 for perforce@freebsd.org; Wed, 9 Jun 2004 22:44:34 GMT (envelope-from peter@freebsd.org) Date: Wed, 9 Jun 2004 22:44:34 GMT Message-Id: <200406092244.i59MiYjk066880@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 22:44:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=54526 Change 54526 by peter@peter_daintree on 2004/06/09 22:43:41 p4 integ -I -b i386_hammer (nop, just syncing metadata) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#45 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#9 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#28 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#34 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#45 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#9 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 10 03:27:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A352E16A4D2; Thu, 10 Jun 2004 03:27:50 +0000 (GMT) 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 6446316A4D0 for ; Thu, 10 Jun 2004 03:27:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B73843D39 for ; Thu, 10 Jun 2004 03:27:50 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5A3RLnx034540 for ; Thu, 10 Jun 2004 03:27:21 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5A3RLHP034535 for perforce@freebsd.org; Thu, 10 Jun 2004 03:27:21 GMT (envelope-from scottl@freebsd.org) Date: Thu, 10 Jun 2004 03:27:21 GMT Message-Id: <200406100327.i5A3RLHP034535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2004 03:27:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=54534 Change 54534 by scottl@scottl-esp-sparc64 on 2004/06/10 03:26:41 Provide maxsync, maxoffset, and maxwidth values for setting the USER/GOAL transfer settings. Remove dv_name from the ncr53c9x_softc and use device_print() in its place. Switch from using a private callout for each command to using the callout that is provided in the ccb. This also switches from the callout api to the timeout api. Fix autosense. Provide the correct datasize to the REQUEST_SENSE cdb. Return the correct error code from the completion path. Remove ncr53c9x_update_xfer_mode(). NetBSD seems to need a callback when the transfer settings are changed, but this is not needed in CAM. Wide and sync transfers work reliably now, though it seems that a faster sync rate actually gives slower real performance on my test box. I have no idea why this is. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#16 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#17 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#11 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#16 (text+ko) ==== @@ -359,6 +359,10 @@ */ sc->sc_minsync = 1000 / sc->sc_freq; + /* limit minsync due to unsolved performance issues */ + sc->sc_maxsync = sc->sc_minsync; + sc->sc_maxoffset = 15; + /* * Alas, we must now modify the value a bit, because it's * only valid when can switch on FASTCLK and FASTSCSI bits @@ -366,11 +370,13 @@ */ switch (sc->sc_rev) { case NCR_VARIANT_ESP100: + sc->sc_maxwidth = 0; sc->sc_maxxfer = 64 * 1024; sc->sc_minsync = 0; /* No synch on old chip? */ break; case NCR_VARIANT_ESP100A: + sc->sc_maxwidth = 1; sc->sc_maxxfer = 64 * 1024; /* Min clocks/byte is 5 */ sc->sc_minsync = ncr53c9x_cpb2stp(sc, 5); @@ -378,6 +384,7 @@ case NCR_VARIANT_ESP200: case NCR_VARIANT_FAS366: + sc->sc_maxwidth = 1; sc->sc_maxxfer = 16 * 1024 * 1024; /* XXX - do actually set FAST* bits */ break; ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#17 (text+ko) ==== @@ -102,7 +102,7 @@ #include #include -int ncr53c9x_debug = NCR_SHOWMISC /* |NCR_SHOWPHASE|NCR_SHOWMISC|NCR_SHOWTRAC|NCR_SHOWCMDS */; +int ncr53c9x_debug = NCR_SHOWMISC /*|NCR_SHOWPHASE|NCR_SHOWTRAC|NCR_SHOWCMDS*/; #ifdef DEBUG int ncr53c9x_notag = 0; #endif @@ -125,7 +125,6 @@ struct ncr53c9x_ecb *); static void ncr53c9x_wrfifo(struct ncr53c9x_softc *, u_char *, int); static int ncr53c9x_rdfifo(struct ncr53c9x_softc *, int); -static void ncr53c9x_update_xfer_mode(struct ncr53c9x_softc *, int); static struct ncr53c9x_ecb *ncr53c9x_get_ecb(struct ncr53c9x_softc *); static struct ncr53c9x_linfo *ncr53c9x_lunsearch(struct ncr53c9x_tinfo *, @@ -205,18 +204,17 @@ struct cam_path *path; mtx_init(&sc->sc_lock, "ncr", "ncr53c9x lock", MTX_DEF); - sc->dv_name = device_get_nameunit(sc->sc_dev); /* * Note, the front-end has set us up to print the chip variation. */ if (sc->sc_rev >= NCR_VARIANT_MAX) { - printf("\n%s: unknown variant %d, devices not attached\n", - sc->dv_name, sc->sc_rev); + device_printf(sc->sc_dev, "unknown variant %d, devices not " + "attached\n", sc->sc_rev); return (EINVAL); } - printf(": %s, %dMHz, SCSI ID %d\n", + device_printf(sc->sc_dev, "%s, %dMHz, SCSI ID %d\n", ncr53c9x_variant_names[sc->sc_rev], sc->sc_freq, sc->sc_id); sc->sc_ntarg = (sc->sc_rev == NCR_VARIANT_FAS366) ? 16 : 8; @@ -280,7 +278,7 @@ return (ENOMEM); sim = cam_sim_alloc(ncr53c9x_action, ncr53c9x_poll, "esp", sc, - device_get_unit(sc->sc_dev), 256, 1, devq); + device_get_unit(sc->sc_dev), 256, 256, devq); if (sim == NULL) { cam_simq_free(devq); return (ENOMEM); @@ -386,8 +384,8 @@ break; default: - printf("%s: unknown revision code, assuming ESP100\n", - sc->dv_name); + device_printf(sc->sc_dev, "unknown revision code, " + "assuming ESP100\n"); NCR_WRITE_REG(sc, NCR_CFG1, sc->sc_cfg1); NCR_WRITE_REG(sc, NCR_CCF, sc->sc_ccf); NCR_WRITE_REG(sc, NCR_SYNCOFF, 0); @@ -398,12 +396,11 @@ NCR_WRITE_REG(sc, NCR_AMDCFG4, sc->sc_cfg4); #if 0 - printf("%s: ncr53c9x_reset: revision %d\n", - sc->dv_name, sc->sc_rev); - printf("%s: ncr53c9x_reset: cfg1 0x%x, cfg2 0x%x, cfg3 0x%x, " - "ccf 0x%x, timeout 0x%x\n", - sc->dv_name, sc->sc_cfg1, sc->sc_cfg2, sc->sc_cfg3, - sc->sc_ccf, sc->sc_timeout); + device_printf(sc->sc_dev, "ncr53c9x_reset: revision %d\n", + sc->sc_rev); + device_printf(sc->sc_dev, "ncr53c9x_reset: cfg1 0x%x, cfg2 0x%x, " + "cfg3 0x%x, ccf 0x%x, timeout 0x%x\n", + sc->sc_cfg1, sc->sc_cfg2, sc->sc_cfg3, sc->sc_ccf, sc->sc_timeout); #endif } @@ -417,8 +414,9 @@ (*sc->sc_glue->gl_dma_stop)(sc); - printf("%s: resetting SCSI bus\n", sc->dv_name); + NCR_MISC(("%s: resetting SCSI bus\n", device_get_nameunit(sc->sc_dev))); NCRCMD(sc, NCRCMD_RSTSCSI); + DELAY(250000); /* Give the bus a fighting chance to settle */ } /* @@ -508,8 +506,6 @@ ti->period = sc->sc_minsync; ti->offset = 0; ti->cfg3 = 0; - - ncr53c9x_update_xfer_mode(sc, r); } if (doreset) { @@ -635,8 +631,8 @@ { int target = ecb->ccb->ccb_h.target_id; int lun = ecb->ccb->ccb_h.target_lun; - struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[target]; - int tiflags = ti->flags; + struct ncr53c9x_tinfo *ti; + int tiflags; u_char *cmd; int clen; int selatn3, selatns; @@ -645,14 +641,16 @@ NCR_TRACE(("[ncr53c9x_select(t%d,l%d,cmd:%x,tag:%x,%x)] ", target, lun, ecb->cmd.cmd.opcode, ecb->tag[0], ecb->tag[1])); + ti = &sc->sc_tinfo[target]; + tiflags = ti->flags; sc->sc_state = NCR_SELECTING; /* * Schedule the timeout now, the first time we will go away * expecting to come back due to an interrupt, because it is * always possible that the interrupt may never happen. */ - callout_reset(&ecb->ecb_callout, mstohz(ecb->timeout), - ncr53c9x_timeout, ecb); + ecb->ccb->ccb_h.timeout_ch = + timeout(ncr53c9x_timeout, sc, mstohz(ecb->timeout)); /* * The docs say the target register is never reset, and I @@ -839,7 +837,8 @@ struct ccb_pathinq *cpi = &ccb->cpi; cpi->version_num = 1; - cpi->hba_inquiry = + cpi->hba_inquiry = PI_SDTR_ABLE/*|PI_TAG_ABLE*/; + cpi->hba_inquiry |= (sc->sc_rev == NCR_VARIANT_FAS366) ? PI_WIDE_16 : 0; cpi->target_sprt = 0; cpi->hba_misc = 0; @@ -865,10 +864,22 @@ ti = &sc->sc_tinfo[ccb->ccb_h.target_id]; - cts->sync_period = ti->period; - cts->sync_offset = ti->offset; - cts->bus_width = ti->width; - cts->flags |= CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB; + if ((cts->flags & CCB_TRANS_CURRENT_SETTINGS) != 0) { + cts->sync_period = ti->period; + cts->sync_offset = ti->offset; + cts->bus_width = ti->width; + if ((ti->flags & T_TAG) != 0) + cts->flags |= + (CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB); + else + cts->flags &= + ~(CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB); + } else { + cts->sync_period = sc->sc_maxsync; + cts->sync_offset = sc->sc_maxoffset; + cts->bus_width = sc->sc_maxwidth; + cts->flags |= (CCB_TRANS_DISC_ENB | CCB_TRANS_TAG_ENB); + } cts->valid = CCB_TRANS_BUS_WIDTH_VALID | CCB_TRANS_SYNC_RATE_VALID | CCB_TRANS_SYNC_OFFSET_VALID | @@ -880,17 +891,20 @@ return; } case XPT_ABORT: + printf("XPT_ABORT called\n"); ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; mtx_unlock(&sc->sc_lock); xpt_done(ccb); return; case XPT_TERM_IO: + printf("XPT_TERM_IO called\n"); ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; mtx_unlock(&sc->sc_lock); xpt_done(ccb); return; + case XPT_RESET_DEV: + printf("XPT_RESET_DEV called\n"); case XPT_SCSI_IO: - case XPT_RESET_DEV: { struct ccb_scsiio *csio; @@ -953,15 +967,12 @@ int target = ccb->ccb_h.target_id; ti = &sc->sc_tinfo[target]; - ti->flags &= ~(T_NEGOTIATE|T_SYNCMODE); - ti->period = 0; - ti->offset = 0; if ((cts->valid & CCB_TRANS_TQ_VALID) != 0) { if ((sc->sc_cfflags & (1<<((target & 7) + 16))) == 0 && (cts->flags & CCB_TRANS_TAG_ENB)) { NCR_MISC(("%s: target %d: tagged queuing\n", - sc->dv_name, target)); + device_get_nameunit(sc->sc_dev), target)); ti->flags |= T_TAG; } else ti->flags &= ~T_TAG; @@ -970,7 +981,7 @@ if ((cts->valid & CCB_TRANS_BUS_WIDTH_VALID) != 0) { if (cts->bus_width != 0) { NCR_MISC(("%s: target %d: wide negotiation\n", - sc->dv_name, target)); + device_get_nameunit(sc->sc_dev), target)); if (sc->sc_rev == NCR_VARIANT_FAS366) { ti->flags |= T_WIDE; ti->width = 1; @@ -983,23 +994,17 @@ if ((cts->valid & CCB_TRANS_SYNC_RATE_VALID) != 0) { NCR_MISC(("%s: target %d: sync period negotiation\n", - sc->dv_name, target)); + device_get_nameunit(sc->sc_dev), target)); ti->flags |= T_NEGOTIATE; ti->period = cts->sync_period; } if ((cts->valid & CCB_TRANS_SYNC_OFFSET_VALID) != 0) { NCR_MISC(("%s: target %d: sync offset negotiation\n", - sc->dv_name, target)); + device_get_nameunit(sc->sc_dev), target)); ti->flags |= T_NEGOTIATE; - ti->period = cts->sync_offset; + ti->offset = cts->sync_offset; } - /* - * If we're not going to negotiate, send the notification - * now, since it won't happen later. - */ - if ((ti->flags & T_NEGOTIATE) == 0) - ncr53c9x_update_xfer_mode(sc, target); mtx_unlock(&sc->sc_lock); ccb->ccb_h.status = CAM_REQ_CMP; @@ -1008,7 +1013,7 @@ } default: - printf("%s: Unhandled function code %d\n", sc->dv_name, + device_printf(sc->sc_dev, "Unhandled function code %d\n", ccb->ccb_h.func_code); ccb->ccb_h.status = CAM_PROVIDE_FAIL; mtx_unlock(&sc->sc_lock); @@ -1019,35 +1024,6 @@ mtx_unlock(&sc->sc_lock); } -static void -ncr53c9x_update_xfer_mode(sc, target) - struct ncr53c9x_softc *sc; - int target; -{ -#if 0 - struct scsipi_xfer_mode xm; - struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[target]; - - xm.xm_target = target; - xm.xm_mode = 0; - xm.xm_period = 0; - xm.xm_offset = 0; - - if (ti->flags & T_SYNCMODE) { - xm.xm_mode |= PERIPH_CAP_SYNC; - xm.xm_period = ti->period; - xm.xm_offset = ti->offset; - } - if (ti->width) - xm.xm_mode |= PERIPH_CAP_WIDE16; - - if ((ti->flags & (T_RSELECTOFF|T_TAG)) == T_TAG) - xm.xm_mode |= PERIPH_CAP_TQING; - - scsipi_async_event(&sc->sc_channel, ASYNC_EVENT_XFER_MODE, &xm); -#endif -} - /* * Used when interrupt driven I/O isn't allowed, e.g. during boot. */ @@ -1182,7 +1158,7 @@ memset(ss, 0, sizeof(*ss)); ss->opcode = REQUEST_SENSE; ss->byte2 = ccb->ccb_h.target_lun << SCSI_CMD_LUN_SHIFT; - ss->length = sizeof(struct scsi_request_sense); + ss->length = sizeof(struct scsi_sense_data); ecb->clen = sizeof(*ss); ecb->daddr = (char *)&ecb->ccb->csio.sense_data; ecb->dleft = sizeof(struct scsi_sense_data); @@ -1224,7 +1200,7 @@ lun = ccb->ccb_h.target_lun; li = TINFO_LUN(ti, lun); - callout_stop(&ecb->ecb_callout); + untimeout(ncr53c9x_timeout, sc, ccb->ccb_h.timeout_ch); /* * Now, if we've come here with no error code, i.e. we've kept the @@ -1238,12 +1214,15 @@ if ((ecb->flags & ECB_ABORT) != 0) { ccb->ccb_h.status = CAM_CMD_TIMEOUT; } else if ((ecb->flags & ECB_SENSE) != 0) { - ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; } else if (ecb->stat == SCSI_STATUS_CHECK_COND) { - /* First, save the return values */ - ccb->csio.resid = ecb->dleft; - ncr53c9x_sense(sc, ecb); - return; + if ((ecb->flags & ECB_SENSE) != 0) + ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; + else { + /* First, save the return values */ + ccb->csio.resid = ecb->dleft; + ncr53c9x_sense(sc, ecb); + return; + } } else { ccb->csio.resid = ecb->dleft; } @@ -1476,9 +1455,8 @@ */ selid = sc->sc_selid & ~(1 << sc->sc_id); if (selid & (selid - 1)) { - printf("%s: reselect with invalid selid %02x;" - " sending DEVICE RESET\n", - sc->dv_name, selid); + device_printf(sc->sc_dev, "reselect with invalid " + "selid %02x; sending DEVICE RESET\n", selid); goto reset; } @@ -1512,9 +1490,9 @@ ecb = li->queued[tagid]; } if (ecb == NULL) { - printf("%s: reselect from target %d lun %d tag %x:%x " - "with no nexus; sending ABORT\n", - sc->dv_name, target, lun, tagtype, tagid); + device_printf(sc->sc_dev, "reselect from target %d lun %d " + "tag %x:%x with no nexus; sending ABORT\n", + target, lun, tagtype, tagid); goto abort; } @@ -1578,8 +1556,7 @@ NCR_TRACE(("[ncr53c9x_msgin(curmsglen:%ld)] ", (long)sc->sc_imlen)); if (sc->sc_imlen == 0) { - printf("%s: msgin: no msg byte available\n", - sc->dv_name); + device_printf(sc->sc_dev, "msgin: no msg byte available\n"); return; } @@ -1591,9 +1568,8 @@ */ if (sc->sc_prevphase != MESSAGE_IN_PHASE && sc->sc_state != NCR_RESELECTED) { - printf("%s: phase change, dropping message, " - "prev %d, state %d\n", - sc->dv_name, sc->sc_prevphase, sc->sc_state); + device_printf(sc->sc_dev, "phase change, dropping message, " + "prev %d, state %d\n", sc->sc_prevphase, sc->sc_state); sc->sc_flags &= ~NCR_DROP_MSGI; sc->sc_imlen = 0; } @@ -1685,8 +1661,8 @@ * - Disable tagged queuing for the target * - Dequeue ecb from the queued array. */ - printf("%s: tagged queuing rejected: " - "target %d\n", sc->dv_name, + device_printf(sc->sc_dev, "tagged queuing " + "rejected: target %d\n", ecb->ccb->ccb_h.target_id); NCR_MSGS(("(rejected sent tag)")); @@ -1706,20 +1682,18 @@ break; case SEND_SDTR: - printf("%s: sync transfer rejected: " - "target %d\n", sc->dv_name, + device_printf(sc->sc_dev, "sync transfer " + "rejected: target %d\n", ecb->ccb->ccb_h.target_id); sc->sc_flags &= ~NCR_SYNCHNEGO; ti->flags &= ~(T_NEGOTIATE | T_SYNCMODE); ncr53c9x_setsync(sc, ti); - ncr53c9x_update_xfer_mode(sc, - ecb->ccb->ccb_h.target_id); break; case SEND_WDTR: - printf("%s: wide transfer rejected: " - "target %d\n", sc->dv_name, + device_printf(sc->sc_dev, "wide transfer " + "rejected: target %d\n", ecb->ccb->ccb_h.target_id); ti->flags &= ~(T_WIDE | T_WDTRSENT); ti->width = 0; @@ -1821,16 +1795,14 @@ ti->flags |= T_SYNCMODE; } } - ncr53c9x_update_xfer_mode(sc, - ecb->ccb->ccb_h.target_id); sc->sc_flags &= ~NCR_SYNCHNEGO; ncr53c9x_setsync(sc, ti); break; case MSG_EXT_WDTR: #ifdef NCR53C9X_DEBUG - printf("%s: wide mode %d\n", - sc->dv_name, sc->sc_imess[3]); + device_printf(sc->sc_dev, "wide mode %d\n", + sc->sc_imess[3]); #endif if (sc->sc_imess[3] == 1) { ti->cfg3 |= NCRFASCFG3_EWIDE; @@ -1868,10 +1840,9 @@ */ if ((sc->sc_imess[0] != MSG_SIMPLE_Q_TAG) || (sc->sc_msgify == 0)) { - printf("%s: TAG reselect without IDENTIFY;" - " MSG %x;" - " sending DEVICE RESET\n", - sc->dv_name, sc->sc_imess[0]); + device_printf(sc->sc_dev, "TAG reselect without " + "IDENTIFY; MSG %x; sending DEVICE RESET\n", + sc->sc_imess[0]); goto reset; } (void) ncr53c9x_reselect(sc, sc->sc_msgify, @@ -1882,18 +1853,16 @@ if (MSG_ISIDENTIFY(sc->sc_imess[1])) { sc->sc_msgify = sc->sc_imess[1]; } else { - printf("%s: reselect without IDENTIFY;" - " MSG %x;" - " sending DEVICE RESET\n", - sc->dv_name, sc->sc_imess[1]); + device_printf(sc->sc_dev, "reselect without IDENTIFY;" + " MSG %x; sending DEVICE RESET\n", sc->sc_imess[1]); goto reset; } (void) ncr53c9x_reselect(sc, sc->sc_msgify, 0, 0); break; default: - printf("%s: unexpected MESSAGE IN; sending DEVICE RESET\n", - sc->dv_name); + device_printf(sc->sc_dev, "unexpected MESSAGE IN; " + "sending DEVICE RESET\n"); reset: ncr53c9x_sched_msgout(SEND_DEV_RESET); break; @@ -1950,8 +1919,8 @@ ncr53c9x_sched_msgout(sc->sc_msgoutq); goto new; } else { - printf("%s at line %d: unexpected MESSAGE OUT phase\n", - sc->dv_name, __LINE__); + device_printf(sc->sc_dev, "at line %d: unexpected " + "MESSAGE OUT phase\n", __LINE__); } } @@ -1987,8 +1956,8 @@ break; case SEND_IDENTIFY: if (sc->sc_state != NCR_CONNECTED) { - printf("%s at line %d: no nexus\n", - sc->dv_name, __LINE__); + device_printf(sc->sc_dev, "at line %d: no " + "nexus\n", __LINE__); } ecb = sc->sc_nexus; sc->sc_omess[0] = @@ -1996,8 +1965,8 @@ break; case SEND_TAG: if (sc->sc_state != NCR_CONNECTED) { - printf("%s at line %d: no nexus\n", - sc->dv_name, __LINE__); + device_printf(sc->sc_dev, "at line %d: no " + "nexus\n", __LINE__); } ecb = sc->sc_nexus; sc->sc_omess[0] = ecb->tag[0]; @@ -2010,7 +1979,6 @@ ecb = sc->sc_nexus; ti = &sc->sc_tinfo[ecb->ccb->ccb_h.target_id]; ti->flags &= ~T_SYNCMODE; - ncr53c9x_update_xfer_mode(sc,ecb->ccb->ccb_h.target_id); if ((ti->flags & T_SYNCHOFF) == 0) /* We can re-start sync negotiation */ ti->flags |= T_NEGOTIATE; @@ -2133,7 +2101,7 @@ DELAY(1); } if (sc->sc_state != NCR_SBR) { - printf("%s: SCSI bus reset\n", sc->dv_name); + device_printf(sc->sc_dev, "SCSI bus reset\n"); ncr53c9x_init(sc, 0); /* Restart everything */ goto out; } @@ -2144,7 +2112,7 @@ #endif if (sc->sc_nexus != NULL) panic("%s: nexus in reset state", - sc->dv_name); + device_get_nameunit(sc->sc_dev)); goto sched; } @@ -2177,16 +2145,16 @@ * another target. */ #ifdef DEBUG - printf("%s: ESP100 work-around activated\n", - sc->dv_name); + device_printf(sc->sc_dev, "ESP100 work-around " + "activated\n"); #endif sc->sc_flags &= ~NCR_EXPECT_ILLCMD; goto out; } /* illegal command, out of sync ? */ - printf("%s: illegal command: 0x%x " + device_printf(sc->sc_dev, "illegal command: 0x%x " "(state %d, phase %x, prevphase %x)\n", - sc->dv_name, sc->sc_lastcmd, + sc->sc_lastcmd, sc->sc_state, sc->sc_phase, sc->sc_prevphase); if (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF) { NCRCMD(sc, NCRCMD_FLUSH); @@ -2208,8 +2176,7 @@ if (NCRDMA_ISACTIVE(sc)) { int r = NCRDMA_INTR(sc); if (r == -1) { - printf("%s: DMA error; resetting\n", - sc->dv_name); + device_printf(sc->sc_dev, "DMA error; resetting\n"); ncr53c9x_init(sc, 1); goto out; } @@ -2237,10 +2204,9 @@ * is not MESSAGE IN. */ if (sc->sc_phase != MESSAGE_IN_PHASE) - printf("%s: !TC on MSG OUT" + device_printf(sc->sc_dev,"!TC on MSGOUT" " [intr %x, stat %x, step %d]" " prevphase %x, resid %lx\n", - sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep, @@ -2253,10 +2219,9 @@ * if the DMA counter and TC bit * appear to be out of sync. */ - printf("%s: !TC on DATA XFER" + device_printf(sc->sc_dev, "!TC on DATA XFER" " [intr %x, stat %x, step %d]" " prevphase %x, resid %x\n", - sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep, @@ -2270,7 +2235,7 @@ * Check for less serious errors. */ if ((sc->sc_espstat & NCRSTAT_PE) != 0) { - printf("%s: SCSI bus parity error\n", sc->dv_name); + device_printf(sc->sc_dev, "SCSI bus parity error\n"); if (sc->sc_prevphase == MESSAGE_IN_PHASE) ncr53c9x_sched_msgout(SEND_PARITY_ERROR); else @@ -2343,18 +2308,19 @@ * disconnecting, and this is necessary * to clean up their state. */ - printf("%s: unexpected disconnect " - "[state %d, intr %x, stat %x, phase(c %x, p %x)]; ", - sc->dv_name, sc->sc_state, - sc->sc_espintr, sc->sc_espstat, - sc->sc_phase, sc->sc_prevphase); + device_printf(sc->sc_dev, "unexpected " + "disconnect [state %d, intr %x, stat %x, " + "phase(c %x, p %x)]; ", sc->sc_state, + sc->sc_espintr, sc->sc_espstat, + sc->sc_phase, sc->sc_prevphase); if ((ecb->flags & ECB_SENSE) != 0) { printf("resetting\n"); goto reset; } printf("sending REQUEST SENSE\n"); - callout_stop(&ecb->ecb_callout); + untimeout(ncr53c9x_timeout, sc, + ecb->ccb->ccb_h.timeout_ch); ncr53c9x_sense(sc, ecb); goto out; } @@ -2375,17 +2341,15 @@ switch (sc->sc_state) { case NCR_SBR: - printf("%s: waiting for SCSI Bus Reset to happen\n", - sc->dv_name); + device_printf(sc->sc_dev, "waiting for Bus Reset to happen\n"); goto out; case NCR_RESELECTED: /* * we must be continuing a message ? */ - printf("%s: unhandled reselect continuation, " - "state %d, intr %02x\n", - sc->dv_name, sc->sc_state, sc->sc_espintr); + device_printf(sc->sc_dev, "unhandled reselect continuation, " + "state %d, intr %02x\n", sc->sc_state, sc->sc_espintr); ncr53c9x_init(sc, 1); goto out; break; @@ -2398,8 +2362,8 @@ * Things are seriously fucked up. * Pull the brakes, i.e. reset */ - printf("%s: target didn't send tag: %d bytes in fifo\n", - sc->dv_name, i); + device_printf(sc->sc_dev, "target didn't send tag: %d " + "bytes in fifo\n", i); /* Drain and display fifo */ while (i-- > 0) printf("[%d] ", NCR_READ_REG(sc, NCR_FIFO)); @@ -2424,7 +2388,8 @@ */ if (sc->sc_state == NCR_SELECTING) { NCR_INTS(("backoff selector ")); - callout_stop(&ecb->ecb_callout); + untimeout(ncr53c9x_timeout, sc, + ecb->ccb->ccb_h.timeout_ch); ncr53c9x_dequeue(sc, ecb); TAILQ_INSERT_HEAD(&sc->ready_list, ecb, chain); ecb->flags |= ECB_READY; @@ -2436,8 +2401,8 @@ * Things are seriously fucked up. * Pull the brakes, i.e. reset */ - printf("%s: target didn't identify\n", - sc->dv_name); + device_printf(sc->sc_dev, "target didn't " + "identify\n"); ncr53c9x_init(sc, 1); goto out; } @@ -2472,10 +2437,9 @@ nfifo = ncr53c9x_rdfifo(sc, NCR_RDFIFO_START); if (nfifo != 2) { - printf("%s: RESELECT: %d bytes in FIFO! " - "[intr %x, stat %x, step %d, " + device_printf(sc->sc_dev, "RESELECT: %d bytes " + "in FIFO! [intr %x, stat %x, step %d, " "prevphase %x]\n", - sc->dv_name, nfifo, sc->sc_espintr, sc->sc_espstat, @@ -2493,9 +2457,8 @@ if (sc->sc_state != NCR_CONNECTED && sc->sc_state != NCR_IDENTIFIED) { /* IDENTIFY fail?! */ - printf("%s: identify failed, " - "state %d, intr %02x\n", - sc->dv_name, sc->sc_state, + device_printf(sc->sc_dev, "identify failed, " + "state %d, intr %02x\n", sc->sc_state, sc->sc_espintr); ncr53c9x_init(sc, 1); goto out; @@ -2531,13 +2494,12 @@ case 1: if ((ti->flags & T_NEGOTIATE) == 0 && ecb->tag[0] == 0) { - printf("%s: step 1 & !NEG\n", - sc->dv_name); + device_printf(sc->sc_dev, "step 1 & " + "!NEG\n"); goto reset; } if (sc->sc_phase != MESSAGE_OUT_PHASE) { - printf("%s: !MSGOUT\n", - sc->dv_name); + device_printf(sc->sc_dev, "!MSGOUT\n"); goto reset; } if (ti->flags & T_WIDE) { @@ -2546,8 +2508,6 @@ } if (ti->flags & T_NEGOTIATE) { /* Start negotiating */ - ti->period = sc->sc_minsync; - ti->offset = 15; sc->sc_flags |= NCR_SYNCHNEGO; if (ecb->tag[0]) ncr53c9x_sched_msgout( @@ -2582,7 +2542,7 @@ printf("(%s:%d:%d): selection failed;" " %d left in FIFO " "[intr %x, stat %x, step %d]\n", - sc->dv_name, + device_get_nameunit(sc->sc_dev), ecb->ccb->ccb_h.target_id, ecb->ccb->ccb_h.target_lun, NCR_READ_REG(sc, NCR_FFLAG) @@ -2602,7 +2562,7 @@ printf("(%s:%d:%d): select; " "%lu left in DMA buffer " "[intr %x, stat %x, step %d]\n", - sc->dv_name, + device_get_nameunit(sc->sc_dev), ecb->ccb->ccb_h.target_id, ecb->ccb->ccb_h.target_lun, (u_long)sc->sc_cmdlen, @@ -2622,16 +2582,15 @@ } else { - printf("%s: unexpected status after select" - ": [intr %x, stat %x, step %x]\n", - sc->dv_name, + device_printf(sc->sc_dev, "unexpected status after " + "select: [intr %x, stat %x, step %x]\n", sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); NCRCMD(sc, NCRCMD_FLUSH); DELAY(1); goto reset; } if (sc->sc_state == NCR_IDLE) { - printf("%s: stray interrupt\n", sc->dv_name); + device_printf(sc->sc_dev, "stray interrupt\n"); mtx_unlock(&sc->sc_lock); return; } @@ -2645,16 +2604,15 @@ sc->sc_flags &= ~NCR_ICCS; if (!(sc->sc_espintr & NCRINTR_DONE)) { - printf("%s: ICCS: " + device_printf(sc->sc_dev, "ICCS: " ": [intr %x, stat %x, step %x]\n", - sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); } ncr53c9x_rdfifo(sc, NCR_RDFIFO_START); if (sc->sc_imlen < 2) - printf("%s: can't get status, only %d bytes\n", - sc->dv_name, (int)sc->sc_imlen); + device_printf(sc->sc_dev, "can't get status, " + "only %d bytes\n", (int)sc->sc_imlen); ecb->stat = sc->sc_imess[sc->sc_imlen - 2]; msg = sc->sc_imess[sc->sc_imlen - 1]; NCR_PHASE(("", ecb->stat, msg)); @@ -2665,8 +2623,8 @@ ecb->ccb->csio.resid = ecb->dleft; sc->sc_state = NCR_CMDCOMPLETE; } else - printf("%s: STATUS_PHASE: msg %d\n", - sc->dv_name, msg); + device_printf(sc->sc_dev, "STATUS_PHASE: " + "msg %d\n", msg); sc->sc_imlen = 0; NCRCMD(sc, NCRCMD_MSGOK); goto shortcut; /* ie. wait for disconnect */ @@ -2674,9 +2632,9 @@ break; default: - printf("%s: invalid state: %d [intr %x, phase(c %x, p %x)]\n", - sc->dv_name, sc->sc_state, - sc->sc_espintr, sc->sc_phase, sc->sc_prevphase); + device_printf(sc->sc_dev, "invalid state: %d [intr %x, " + "phase(c %x, p %x)]\n", sc->sc_state, + sc->sc_espintr, sc->sc_phase, sc->sc_prevphase); goto reset; } @@ -2707,9 +2665,8 @@ NCRCMD(sc, NCRCMD_TRANS); } else if ((sc->sc_espintr & NCRINTR_FC) != 0) { if ((sc->sc_flags & NCR_WAITI) == 0) { - printf("%s: MSGIN: unexpected FC bit: " - "[intr %x, stat %x, step %x]\n", - sc->dv_name, + device_printf(sc->sc_dev, "MSGIN: unexpected " + "FC bit: [intr %x, stat %x, step %x]\n", sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); } @@ -2719,9 +2676,8 @@ NCR_RDFIFO_CONTINUE : NCR_RDFIFO_START); ncr53c9x_msgin(sc); } else { - printf("%s: MSGIN: weird bits: " + device_printf(sc->sc_dev, "MSGIN: weird bits: " "[intr %x, stat %x, step %x]\n", - sc->dv_name, sc->sc_espintr, sc->sc_espstat, sc->sc_espstep); } sc->sc_prevphase = MESSAGE_IN_PHASE; @@ -2815,8 +2771,7 @@ break; default: - printf("%s: unexpected bus phase; resetting\n", - sc->dv_name); + device_printf(sc->sc_dev, "unexpected bus phase; resetting\n"); goto reset; } @@ -2887,8 +2842,8 @@ /* * Reschedule timeout. */ - callout_reset(&ecb->ecb_callout, mstohz(ecb->timeout), - ncr53c9x_timeout, ecb); + ecb->ccb->ccb_h.timeout_ch = + timeout(ncr53c9x_timeout, sc, mstohz(ecb->timeout)); } else { /* * Just leave the command where it is. @@ -2910,10 +2865,9 @@ struct ncr53c9x_tinfo *ti = &sc->sc_tinfo[ccb->ccb_h.target_id]; xpt_print_path(ccb->ccb_h.path); - printf("%s: timed out [ecb %p (flags 0x%x, dleft %x, stat %x)], " - "", - sc->dv_name, + device_printf(sc->sc_dev, "timed out [ecb %p (flags 0x%x, dleft %x, " + "stat %x)], ", ecb, ecb->flags, ecb->dleft, ecb->stat, sc->sc_state, sc->sc_nexus, NCR_READ_REG(sc, NCR_STAT), @@ -2946,7 +2900,6 @@ printf("sync negotiation disabled\n"); sc->sc_cfflags |= (1 << ((ccb->ccb_h.target_id & 7) + 8)); - ncr53c9x_update_xfer_mode(sc, ccb->ccb_h.target_id); } } ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#11 (text+ko) ==== @@ -119,7 +119,6 @@ #define ECB_RESET 0x80 #define ECB_TENTATIVE_DONE 0x100 int timeout; - struct callout ecb_callout; struct { u_char msg[3]; /* Selection Id msg and tags */ @@ -272,7 +271,6 @@ struct ncr53c9x_softc { device_t sc_dev; /* us as a device */ - const char *dv_name; struct cam_sim *sc_sim; /* our scsi adapter */ struct cam_path *sc_path; /* our scsi channel */ @@ -342,6 +340,9 @@ int sc_features; /* Chip features */ int sc_minsync; /* Minimum sync period / 4 */ int sc_maxxfer; /* Maximum transfer size */ + int sc_maxsync; /* Maximum sync period */ + int sc_maxoffset; /* Maximum offset */ + int sc_maxwidth; /* Maximum width */ struct mtx sc_lock; /* driver mutex */ }; From owner-p4-projects@FreeBSD.ORG Thu Jun 10 04:37:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01EB916A4D1; Thu, 10 Jun 2004 04:37:00 +0000 (GMT) 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 D0E3F16A4CE for ; Thu, 10 Jun 2004 04:36:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9B2D43D31 for ; Thu, 10 Jun 2004 04:36:59 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5A4anOF049576 for ; Thu, 10 Jun 2004 04:36:49 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5A4amNV049573 for perforce@freebsd.org; Thu, 10 Jun 2004 04:36:48 GMT (envelope-from scottl@freebsd.org) Date: Thu, 10 Jun 2004 04:36:48 GMT Message-Id: <200406100436.i5A4amNV049573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2004 04:37:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=54540 Change 54540 by scottl@scottl-esp-sparc64 on 2004/06/10 04:35:50 Add copyrights and id tags. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#17 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#5 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854reg.h#2 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#6 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#18 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xreg.h#2 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#12 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#17 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2004 Scott Long + * 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. + * + */ + /* $NetBSD: esp_sbus.c,v 1.27 2002/12/10 13:44:47 pk Exp $ */ /*- @@ -38,6 +65,7 @@ */ #include +__FBSDID("$FreeBSD$"); #include #include ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#5 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2004 Scott Long + * 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. + * + */ + /* $NetBSD: lsi64854.c,v 1.22 2002/10/01 07:07:03 petrov Exp $ */ /*- @@ -37,6 +64,7 @@ */ #include +__FBSDID("$FreeBSD$"); #include #include ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854reg.h#2 (text+ko) ==== @@ -36,6 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +/* $FreeBSD$ */ + /* * LSI 64854 DMA engine. Contains three independent channels * designed to interface with (a) a NCR539X SCSI controller, ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#6 (text+ko) ==== @@ -36,6 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +/* $FreeBSD$ */ + struct lsi64854_softc { device_t sc_dev; const char *dv_name; ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#18 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2004 Scott Long + * 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. + * + */ + /* $NetBSD: ncr53c9x.c,v 1.106 2003/04/16 18:53:50 petrov Exp $ */ /*- @@ -77,6 +104,7 @@ */ #include +__FBSDID("$FreeBSD$") #include #include ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xreg.h#2 (text+ko) ==== @@ -29,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* $FreeBSD$ */ + /* * Register addresses, relative to some base address */ ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#12 (text+ko) ==== @@ -66,6 +66,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* $FreeBSD$ */ + #ifndef _DEV_IC_NCR53C9XVAR_H_ #define _DEV_IC_NCR53C9XVAR_H_ From owner-p4-projects@FreeBSD.ORG Thu Jun 10 04:54:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57D3616A4D1; Thu, 10 Jun 2004 04:54:12 +0000 (GMT) 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 3247316A4CE for ; Thu, 10 Jun 2004 04:54:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AB1343D48 for ; Thu, 10 Jun 2004 04:54:12 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5A4sAa1059611 for ; Thu, 10 Jun 2004 04:54:10 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5A4sABm059608 for perforce@freebsd.org; Thu, 10 Jun 2004 04:54:10 GMT (envelope-from scottl@freebsd.org) Date: Thu, 10 Jun 2004 04:54:10 GMT Message-Id: <200406100454.i5A4sABm059608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 54541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2004 04:54:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=54541 Change 54541 by scottl@scottl-esp-sparc64 on 2004/06/10 04:54:06 Remove K&R function arguments Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#18 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#6 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#19 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#18 (text+ko) ==== @@ -493,9 +493,7 @@ #endif u_char -esp_read_reg(sc, reg) - struct ncr53c9x_softc *sc; - int reg; +esp_read_reg(struct ncr53c9x_softc *sc, int reg) { struct esp_softc *esc = (struct esp_softc *)sc; u_char v; @@ -510,10 +508,7 @@ } void -esp_write_reg(sc, reg, v) - struct ncr53c9x_softc *sc; - int reg; - u_char v; +esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v) { struct esp_softc *esc = (struct esp_softc *)sc; @@ -526,8 +521,7 @@ } int -esp_dma_isintr(sc) - struct ncr53c9x_softc *sc; +esp_dma_isintr(struct ncr53c9x_softc *sc) { struct esp_softc *esc = (struct esp_softc *)sc; @@ -535,8 +529,7 @@ } void -esp_dma_reset(sc) - struct ncr53c9x_softc *sc; +esp_dma_reset(struct ncr53c9x_softc *sc) { struct esp_softc *esc = (struct esp_softc *)sc; @@ -544,8 +537,7 @@ } int -esp_dma_intr(sc) - struct ncr53c9x_softc *sc; +esp_dma_intr(struct ncr53c9x_softc *sc) { struct esp_softc *esc = (struct esp_softc *)sc; @@ -553,12 +545,8 @@ } int -esp_dma_setup(sc, addr, len, datain, dmasize) - struct ncr53c9x_softc *sc; - caddr_t *addr; - size_t *len; - int datain; - size_t *dmasize; +esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr, size_t *len, + int datain, size_t *dmasize) { struct esp_softc *esc = (struct esp_softc *)sc; @@ -566,8 +554,7 @@ } void -esp_dma_go(sc) - struct ncr53c9x_softc *sc; +esp_dma_go(struct ncr53c9x_softc *sc) { struct esp_softc *esc = (struct esp_softc *)sc; @@ -575,8 +562,7 @@ } void -esp_dma_stop(sc) - struct ncr53c9x_softc *sc; +esp_dma_stop(struct ncr53c9x_softc *sc) { struct esp_softc *esc = (struct esp_softc *)sc; u_int32_t csr; @@ -587,8 +573,7 @@ } int -esp_dma_isactive(sc) - struct ncr53c9x_softc *sc; +esp_dma_isactive(struct ncr53c9x_softc *sc) { struct esp_softc *esc = (struct esp_softc *)sc; ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#6 (text+ko) ==== @@ -114,8 +114,7 @@ * sc_client (one of SCSI, ENET, PP `soft_c' pointers) */ void -lsi64854_attach(sc) - struct lsi64854_softc *sc; +lsi64854_attach(struct lsi64854_softc *sc) { u_int32_t csr; @@ -250,8 +249,7 @@ } while(0) void -lsi64854_reset(sc) - struct lsi64854_softc *sc; +lsi64854_reset(struct lsi64854_softc *sc) { u_int32_t csr; @@ -345,12 +343,8 @@ * setup a DMA transfer */ int -lsi64854_setup(sc, addr, len, datain, dmasize) - struct lsi64854_softc *sc; - caddr_t *addr; - size_t *len; - int datain; - size_t *dmasize; /* IN-OUT */ +lsi64854_setup(struct lsi64854_softc *sc, caddr_t *addr, size_t *len, + int datain, size_t *dmasize) { u_int32_t csr; @@ -428,8 +422,7 @@ * return 1 if it was a DMA continue. */ int -lsi64854_scsi_intr(arg) - void *arg; +lsi64854_scsi_intr(void *arg) { struct lsi64854_softc *sc = arg; struct ncr53c9x_softc *nsc = sc->sc_client; @@ -554,8 +547,7 @@ * Pseudo (chained) interrupt to le driver to handle DMA errors. */ int -lsi64854_enet_intr(arg) - void *arg; +lsi64854_enet_intr(void *arg) { struct lsi64854_softc *sc = arg; u_int32_t csr; @@ -613,12 +605,8 @@ * setup a DMA transfer */ int -lsi64854_setup_pp(sc, addr, len, datain, dmasize) - struct lsi64854_softc *sc; - caddr_t *addr; - size_t *len; - int datain; - size_t *dmasize; /* IN-OUT */ +lsi64854_setup_pp(struct lsi64854_softc *sc, caddr_t *addr, size_t *len, + int datain, size_t *dmasize) { u_int32_t csr; @@ -676,8 +664,7 @@ * Parallel port DMA interrupt. */ int -lsi64854_pp_intr(arg) - void *arg; +lsi64854_pp_intr(void *arg) { struct lsi64854_softc *sc = arg; int ret, trans, resid = 0; ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#19 (text+ko) ==== @@ -104,7 +104,7 @@ */ #include -__FBSDID("$FreeBSD$") +__FBSDID("$FreeBSD$"); #include #include @@ -210,9 +210,7 @@ * Search linked list for LUN info by LUN id. */ static struct ncr53c9x_linfo * -ncr53c9x_lunsearch(ti, lun) - struct ncr53c9x_tinfo *ti; - int64_t lun; +ncr53c9x_lunsearch(struct ncr53c9x_tinfo *ti, int64_t lun) { struct ncr53c9x_linfo *li; LIST_FOREACH(li, &ti->luns, link) @@ -340,9 +338,7 @@ } int -ncr53c9x_detach(sc, flags) - struct ncr53c9x_softc *sc; - int flags; +ncr53c9x_detach(struct ncr53c9x_softc *sc, int flags) { #if 0 /* don't allow detach for now */ @@ -362,8 +358,7 @@ * routine above. */ void -ncr53c9x_reset(sc) - struct ncr53c9x_softc *sc; +ncr53c9x_reset(struct ncr53c9x_softc *sc) { /* reset DMA first */ @@ -436,8 +431,7 @@ * Reset the SCSI bus, but not the chip */ static void -ncr53c9x_scsi_reset(sc) - struct ncr53c9x_softc *sc; +ncr53c9x_scsi_reset(struct ncr53c9x_softc *sc) { (*sc->sc_glue->gl_dma_stop)(sc); @@ -451,9 +445,7 @@ * Initialize ncr53c9x state machine */ void -ncr53c9x_init(sc, doreset) - struct ncr53c9x_softc *sc; - int doreset; +ncr53c9x_init(struct ncr53c9x_softc *sc, int doreset) { struct ncr53c9x_ecb *ecb; struct ncr53c9x_linfo *li; @@ -555,8 +547,7 @@ * if an interrupt is pending. */ static __inline void -ncr53c9x_readregs(sc) - struct ncr53c9x_softc *sc; +ncr53c9x_readregs(struct ncr53c9x_softc *sc) { sc->sc_espstat = NCR_READ_REG(sc, NCR_STAT); @@ -587,9 +578,7 @@ * Convert Synchronous Transfer Period to chip register Clock Per Byte value. */ static __inline int -ncr53c9x_stp2cpb(sc, period) - struct ncr53c9x_softc *sc; - int period; +ncr53c9x_stp2cpb(struct ncr53c9x_softc *sc, int period) { int v; v = (sc->sc_freq * period) / 250; @@ -600,9 +589,7 @@ } static __inline void -ncr53c9x_setsync(sc, ti) - struct ncr53c9x_softc *sc; - struct ncr53c9x_tinfo *ti; +ncr53c9x_setsync(struct ncr53c9x_softc *sc, struct ncr53c9x_tinfo *ti) { u_char syncoff, synctp; u_char cfg3 = sc->sc_cfg3 | ti->cfg3; @@ -653,9 +640,7 @@ * by DMA instead of programmed I/O soon. */ static void -ncr53c9x_select(sc, ecb) - struct ncr53c9x_softc *sc; - struct ncr53c9x_ecb *ecb; +ncr53c9x_select(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb) { int target = ecb->ccb->ccb_h.target_id; int lun = ecb->ccb->ccb_h.target_lun; @@ -802,9 +787,7 @@ } static void -ncr53c9x_free_ecb(sc, ecb) - struct ncr53c9x_softc *sc; - struct ncr53c9x_ecb *ecb; +ncr53c9x_free_ecb(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb) { ecb->flags = 0; @@ -813,8 +796,7 @@ } static struct ncr53c9x_ecb * -ncr53c9x_get_ecb(sc) - struct ncr53c9x_softc *sc; +ncr53c9x_get_ecb(struct ncr53c9x_softc *sc) { struct ncr53c9x_ecb *ecb; @@ -1078,8 +1060,7 @@ * things going. Should only be called when state == NCR_IDLE and at bio pl. */ static void -ncr53c9x_sched(sc) - struct ncr53c9x_softc *sc; +ncr53c9x_sched(struct ncr53c9x_softc *sc) { struct ncr53c9x_ecb *ecb; struct ncr53c9x_tinfo *ti; @@ -1167,9 +1148,7 @@ } static void -ncr53c9x_sense(sc, ecb) - struct ncr53c9x_softc *sc; - struct ncr53c9x_ecb *ecb; +ncr53c9x_sense(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb) { union ccb *ccb = ecb->ccb; struct ncr53c9x_tinfo *ti; @@ -1213,9 +1192,7 @@ * POST PROCESSING OF SCSI_CMD (usually current) */ static void -ncr53c9x_done(sc, ecb) - struct ncr53c9x_softc *sc; - struct ncr53c9x_ecb *ecb; +ncr53c9x_done(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb) { union ccb *ccb = ecb->ccb; struct ncr53c9x_tinfo *ti; @@ -1304,9 +1281,7 @@ } static void -ncr53c9x_dequeue(sc, ecb) - struct ncr53c9x_softc *sc; - struct ncr53c9x_ecb *ecb; +ncr53c9x_dequeue(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb) { struct ncr53c9x_tinfo *ti; struct ncr53c9x_linfo *li; @@ -1461,10 +1436,8 @@ } static int -ncr53c9x_reselect(sc, message, tagtype, tagid) - struct ncr53c9x_softc *sc; - int message; - int tagtype, tagid; +ncr53c9x_reselect(struct ncr53c9x_softc *sc, int message, int tagtype, + int tagid) { u_char selid, target, lun; struct ncr53c9x_ecb *ecb = NULL; @@ -1577,8 +1550,7 @@ * byte in the FIFO */ static void -ncr53c9x_msgin(sc) - struct ncr53c9x_softc *sc; +ncr53c9x_msgin(struct ncr53c9x_softc *sc) { NCR_TRACE(("[ncr53c9x_msgin(curmsglen:%ld)] ", (long)sc->sc_imlen)); @@ -1917,8 +1889,7 @@ * Send the highest priority, scheduled message */ static void -ncr53c9x_msgout(sc) - struct ncr53c9x_softc *sc; +ncr53c9x_msgout(struct ncr53c9x_softc *sc) { struct ncr53c9x_tinfo *ti; struct ncr53c9x_ecb *ecb; @@ -2086,8 +2057,7 @@ * Most of this needs verifying. */ void -ncr53c9x_intr(arg) - void *arg; +ncr53c9x_intr(void *arg) { struct ncr53c9x_softc *sc = arg; struct ncr53c9x_ecb *ecb; @@ -2884,8 +2854,7 @@ } static void -ncr53c9x_timeout(arg) - void *arg; +ncr53c9x_timeout(void *arg) { struct ncr53c9x_ecb *ecb = arg; union ccb *ccb = ecb->ccb; @@ -2935,8 +2904,7 @@ } static void -ncr53c9x_watch(arg) - void *arg; +ncr53c9x_watch(void *arg) { struct ncr53c9x_softc *sc = (struct ncr53c9x_softc *)arg; struct ncr53c9x_tinfo *ti; From owner-p4-projects@FreeBSD.ORG Thu Jun 10 22:07:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05BC316A4D1; Thu, 10 Jun 2004 22:07:39 +0000 (GMT) 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 BC49416A4CE for ; Thu, 10 Jun 2004 22:07:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B322D43D45 for ; Thu, 10 Jun 2004 22:07:38 +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.12.11/8.12.11) with ESMTP id i5AM7LAA012287 for ; Thu, 10 Jun 2004 22:07:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5AM7Jr0012284 for perforce@freebsd.org; Thu, 10 Jun 2004 22:07:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 10 Jun 2004 22:07:19 GMT Message-Id: <200406102207.i5AM7Jr0012284@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 Subject: PERFORCE change 54582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2004 22:07:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=54582 Change 54582 by rwatson@rwatson_tislabs on 2004/06/10 22:07:16 Integrate netperf_socket from FreeBSD CVS HEAD. - Loop back UNIX domain socket locking. resolve -at to lose the original netperf_socket locking and replace with the rwatson_netperf locking. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/netperf_socket/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/include/asm.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/md_var.h#6 integrate .. //depot/projects/netperf_socket/sys/amd64/include/profile.h#4 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#19 integrate .. //depot/projects/netperf_socket/sys/conf/files#25 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#5 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#8 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/eisa/eisa_if.m#1 branch .. //depot/projects/netperf_socket/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/eisa/eisaconf.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#1 branch .. //depot/projects/netperf_socket/sys/dev/esp/lsi64854.c#1 branch .. //depot/projects/netperf_socket/sys/dev/esp/lsi64854reg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/esp/lsi64854var.h#1 branch .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9x.c#1 branch .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9xreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9xvar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/fb/vga.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/my/if_my.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcf_ebus.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pccard.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom_io.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/madt.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/bios/smapi.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/bios/vpd.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/bios.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/symbols.raw#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/md_var.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/pc/bios.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#5 integrate .. //depot/projects/netperf_socket/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/netperf_socket/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/em/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/esp/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/vx/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#11 integrate .. //depot/projects/netperf_socket/sys/pci/if_sf.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#8 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#10 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#15 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#8 integrate .. //depot/projects/netperf_socket/sys/pci/if_wb.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#8 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#5 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#7 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.147 2004/06/10 04:30:59 alc Exp $"); #include #include @@ -612,7 +612,6 @@ pmap_init(void) { int i; - int initial_pvs; /* * Allocate memory for random pmap data structures. Includes the @@ -630,12 +629,9 @@ /* * init the pv free list */ - initial_pvs = vm_page_array_size; - if (initial_pvs < MINPV) - initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(pvzone, initial_pvs); + uma_prealloc(pvzone, MINPV); /* * Now it is safe to enable pv_table recording. ==== //depot/projects/netperf_socket/sys/alpha/include/pc/bios.h#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/alpha/include/pc/bios.h,v 1.5 1999/08/28 00:38:56 peter Exp $ + * $FreeBSD: src/sys/alpha/include/pc/bios.h,v 1.6 2004/06/10 20:30:54 jhb Exp $ * from: i386/include/pc bios.h,v 1.2 */ @@ -71,13 +71,8 @@ }; extern void bios32(caddr_t func_addr, struct bios32_args *args); -#if 0 -#define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase) -#define BIOS_VADDRTOPADDR(x) (((x) - atdevbase) + ISA_HOLE_START) -#else #define BIOS_PADDRTOVADDR(x) (x) #define BIOS_VADDRTOPADDR(x) (x) -#endif /* * System Management BIOS / Desktop Management Interface tables ==== //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.13 2004/06/03 20:25:04 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.14 2004/06/10 21:30:08 peter Exp $"); #include #include @@ -65,7 +65,6 @@ } ioapics[NIOAPICS]; struct lapic_info { - u_int la_present:1; u_int la_enabled:1; u_int la_acpi_id:8; } lapics[NLAPICS]; @@ -447,18 +446,17 @@ printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", proc->LocalApicId, proc->ProcessorId, proc->ProcessorEnabled ? "enabled" : "disabled"); + if (!proc->ProcessorEnabled) + break; if (proc->LocalApicId >= NLAPICS) panic("%s: CPU ID %d too high", __func__, proc->LocalApicId); la = &lapics[proc->LocalApicId]; - KASSERT(la->la_present == 0, + KASSERT(la->la_enabled == 0, ("Duplicate local APIC ID %d", proc->LocalApicId)); - la->la_present = 1; + la->la_enabled = 1; la->la_acpi_id = proc->ProcessorId; - if (proc->ProcessorEnabled) { - la->la_enabled = 1; - lapic_create(proc->LocalApicId, 0); - } + lapic_create(proc->LocalApicId, 0); break; } } @@ -548,15 +546,12 @@ int i; for (i = 0; i < NLAPICS; i++) { - if (!lapics[i].la_present) + if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) continue; *apic_id = i; - if (lapics[i].la_enabled) - return (0); - else - return (ENXIO); + return (0); } return (ENOENT); } @@ -770,7 +765,7 @@ pc = pcpu_find(i); KASSERT(pc != NULL, ("no pcpu data for CPU %d", i)); la = &lapics[pc->pc_apic_id]; - if (!la->la_present || !la->la_enabled) + if (!la->la_enabled) panic("APIC: CPU with APIC ID %u is not enabled", pc->pc_apic_id); pc->pc_acpi_id = la->la_acpi_id; ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.608 2004/06/08 01:02:51 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.609 2004/06/10 20:30:55 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -140,7 +140,6 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) int _udatasel, _ucodesel, _ucode32sel; -u_long atdevbase; int cold = 1; @@ -1116,8 +1115,6 @@ thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - atdevbase = ISA_HOLE_START + KERNBASE; - /* * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. ==== //depot/projects/netperf_socket/sys/amd64/include/asm.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/amd64/include/asm.h,v 1.15 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.16 2004/06/10 22:02:26 peter Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -64,10 +64,14 @@ #ifdef PROF #define ALTENTRY(x) _ENTRY(x); \ + pushq %rbp; movq %rsp,%rbp; \ call PIC_PLT(HIDENAME(mcount)); \ + popq %rbp; \ jmp 9f #define ENTRY(x) _ENTRY(x); \ + pushq %rbp; movq %rsp,%rbp; \ call PIC_PLT(HIDENAME(mcount)); \ + popq %rbp; \ 9: #else #define ALTENTRY(x) _ENTRY(x) ==== //depot/projects/netperf_socket/sys/amd64/include/md_var.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.74 2004/06/08 01:02:52 peter Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.75 2004/06/10 20:30:55 jhb Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -37,7 +37,6 @@ */ extern long Maxmem; -extern u_long atdevbase; /* offset in virtual memory of ISA io mem */ extern u_int basemem; extern int busdma_swi_pending; extern u_int cpu_exthigh; ==== //depot/projects/netperf_socket/sys/amd64/include/profile.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/profile.h,v 1.39 2004/05/20 16:22:57 bde Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.40 2004/06/10 22:00:58 peter Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -108,10 +108,12 @@ pushq %rcx \n\ pushq %r8 \n\ pushq %r9 \n\ + pushq %rax \n\ movq 8(%rbp),%rsi \n\ movq (%rbp),%rdi \n\ movq 8(%rdi),%rdi \n\ call _mcount \n\ + popq %rax \n\ popq %r9 \n\ popq %r8 \n\ popq %rcx \n\ ==== //depot/projects/netperf_socket/sys/conf/NOTES#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1228 2004/06/07 19:33:05 netchild Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1229 2004/06/10 05:43:36 scottl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1205,6 +1205,7 @@ # such as the Tekram DC-390(T). # bt: Most Buslogic controllers: including BT-445, BT-54x, BT-64x, BT-74x, # BT-75x, BT-946, BT-948, BT-956, BT-958, SDC3211B, SDC3211F, SDC3222F +# esp: NCR53c9x. Only for SBUS hardware right now. # isp: Qlogic ISP 1020, 1040 and 1040B PCI SCSI host adapters, # ISP 1240 Dual Ultra SCSI, ISP 1080 and 1280 (Dual) Ultra2, # ISP 12160 Ultra3 SCSI, @@ -1239,6 +1240,7 @@ device ahc device ahd device amd +device esp device isp hint.isp.0.disable="1" hint.isp.0.role="3" ==== //depot/projects/netperf_socket/sys/conf/files#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.901 2004/06/07 19:00:56 julian Exp $ +# $FreeBSD: src/sys/conf/files,v 1.903 2004/06/10 05:21:44 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -417,6 +417,7 @@ dev/ed/if_ed_pccard.c optional ed card dev/ed/if_ed_pccard.c optional ed pccard dev/ed/if_ed_pci.c optional ed pci +dev/eisa/eisa_if.m standard dev/eisa/eisaconf.c optional eisa dev/em/if_em.c optional em dev/em/if_em_hw.c optional em @@ -428,6 +429,7 @@ dev/ep/if_ep_mca.c optional ep mca dev/ep/if_ep_pccard.c optional ep card dev/ep/if_ep_pccard.c optional ep pccard +dev/esp/ncr53c9x.c optional esp dev/ex/if_ex.c optional ex dev/ex/if_ex_isa.c optional ex isa dev/ex/if_ex_pccard.c optional ex card ==== //depot/projects/netperf_socket/sys/conf/files.sparc64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.53 2004/05/08 13:53:46 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.54 2004/06/10 05:21:44 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -12,6 +12,8 @@ crypto/des/des_enc.c optional ipsec ipsec_esp crypto/blowfish/bf_enc.c optional crypto crypto/des/des_enc.c optional crypto +dev/esp/esp_sbus.c optional esp sbus +dev/esp/lsi64854.c optional esp sbus dev/fb/creator.c optional creator sc dev/fb/fb.c optional sc dev/fb/splash.c optional splash ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#8 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.159 2004/05/26 00:52:52 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.160 2004/06/09 16:08:20 imp Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -289,7 +289,7 @@ MFILES?= kern/bus_if.m kern/device_if.m dev/iicbus/iicbb_if.m \ dev/iicbus/iicbus_if.m isa/isa_if.m \ libkern/iconv_converter_if.m \ - dev/mii/miibus_if.m \ + dev/eisa/eisa_if.m dev/mii/miibus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ ==== //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.69 2004/05/30 20:08:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.71 2004/06/09 16:01:59 wpaul Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -211,7 +211,6 @@ static u_int8_t bge_eeprom_getbyte (struct bge_softc *, int, u_int8_t *); static int bge_read_eeprom (struct bge_softc *, caddr_t, int, int); -static uint32_t bge_mchash (const uint8_t *); static void bge_setmulti (struct bge_softc *); static void bge_handle_events (struct bge_softc *); @@ -1133,27 +1132,6 @@ return(0); } -#define BGE_POLY 0xEDB88320 - -static uint32_t -bge_mchash(addr) - const uint8_t *addr; -{ - uint32_t crc; - int idx, bit; - uint8_t data; - - /* Compute CRC for the address value. */ - crc = 0xFFFFFFFF; /* initial value */ - - for (idx = 0; idx < 6; idx++) { - for (data = *addr++, bit = 0; bit < 8; bit++, data >>= 1) - crc = (crc >> 1) ^ (((crc ^ data) & 1) ? BGE_POLY : 0); - } - - return(crc & 0x7F); -} - static void bge_setmulti(sc) struct bge_softc *sc; @@ -1181,7 +1159,8 @@ TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - h = bge_mchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); + h = ether_crc32_le(LLADDR((struct sockaddr_dl *) + ifma->ifma_addr), ETHER_ADDR_LEN) & 0x7F; hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F); } @@ -2403,6 +2382,7 @@ IFM_ETHER|IFM_1000_SX|IFM_FDX, 0, NULL); ifmedia_add(&sc->bge_ifmedia, IFM_ETHER|IFM_AUTO, 0, NULL); ifmedia_set(&sc->bge_ifmedia, IFM_ETHER|IFM_AUTO); + sc->bge_ifmedia.ifm_media = sc->bge_ifmedia.ifm_cur->ifm_media; } else { /* * Do transceiver setup. @@ -2602,6 +2582,18 @@ CSR_WRITE_4(sc, BGE_MAC_MODE, 0); + /* + * The 5704 in TBI mode apparently needs some special + * adjustment to insure the SERDES drive level is set + * to 1.2V. + */ + if (sc->bge_asicrev == BGE_ASICREV_BCM5704 && sc->bge_tbi) { + uint32_t serdescfg; + serdescfg = CSR_READ_4(sc, BGE_SERDES_CFG); + serdescfg = (serdescfg & ~0xFFF) | 0x880; + CSR_WRITE_4(sc, BGE_SERDES_CFG, serdescfg); + } + DELAY(10000); return; @@ -2937,6 +2929,9 @@ if (CSR_READ_4(sc, BGE_MAC_STS) & BGE_MACSTAT_TBI_PCS_SYNCHED) { sc->bge_link++; + if (sc->bge_asicrev == BGE_ASICREV_BCM5704) + BGE_CLRBIT(sc, BGE_MAC_MODE, + BGE_MACMODE_TBI_SEND_CFGS); CSR_WRITE_4(sc, BGE_MAC_STS, 0xFFFFFFFF); printf("bge%d: gigabit link up\n", sc->bge_unit); if (ifp->if_snd.ifq_head != NULL) @@ -3333,6 +3328,23 @@ return(EINVAL); switch(IFM_SUBTYPE(ifm->ifm_media)) { case IFM_AUTO: + /* + * The BCM5704 ASIC appears to have a special + * mechanism for programming the autoneg + * advertisement registers in TBI mode. + */ + if (sc->bge_asicrev == BGE_ASICREV_BCM5704) { + uint32_t sgdig; + CSR_WRITE_4(sc, BGE_TX_TBI_AUTONEG, 0); + sgdig = CSR_READ_4(sc, BGE_SGDIG_CFG); + sgdig |= BGE_SGDIGCFG_AUTO| + BGE_SGDIGCFG_PAUSE_CAP| + BGE_SGDIGCFG_ASYM_PAUSE; + CSR_WRITE_4(sc, BGE_SGDIG_CFG, + sgdig|BGE_SGDIGCFG_SEND); + DELAY(5); + CSR_WRITE_4(sc, BGE_SGDIG_CFG, sgdig); + } break; case IFM_1000_SX: if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { ==== //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.27 2004/05/24 04:46:54 ps Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.28 2004/06/09 16:01:59 wpaul Exp $ */ /* @@ -525,6 +525,10 @@ #define BGE_RX_BD_RULES_CTL15 0x04F8 #define BGE_RX_BD_RULES_MASKVAL15 0x04FC #define BGE_RX_RULES_CFG 0x0500 +#define BGE_SERDES_CFG 0x0590 +#define BGE_SERDES_STS 0x0594 +#define BGE_SGDIG_CFG 0x05B0 +#define BGE_SGDIG_STS 0x05B4 #define BGE_RX_STATS 0x0800 #define BGE_TX_STATS 0x0880 @@ -655,6 +659,40 @@ #define BGE_RXRULEMASK_VALUE 0x0000FFFF #define BGE_RXRULEMASK_MASKVAL 0xFFFF0000 +/* SERDES configuration register */ +#define BGE_SERDESCFG_RXR 0x00000007 /* phase interpolator */ +#define BGE_SERDESCFG_RXG 0x00000018 /* rx gain setting */ +#define BGE_SERDESCFG_RXEDGESEL 0x00000040 /* rising/falling egde */ +#define BGE_SERDESCFG_TX_BIAS 0x00000380 /* TXDAC bias setting */ +#define BGE_SERDESCFG_IBMAX 0x00000400 /* bias current +25% */ +#define BGE_SERDESCFG_IBMIN 0x00000800 /* bias current -25% */ +#define BGE_SERDESCFG_TXMODE 0x00001000 +#define BGE_SERDESCFG_TXEDGESEL 0x00002000 /* rising/falling edge */ +#define BGE_SERDESCFG_MODE 0x00004000 /* TXCP/TXCN disabled */ +#define BGE_SERDESCFG_PLLTEST 0x00008000 /* PLL test mode */ +#define BGE_SERDESCFG_CDET 0x00010000 /* comma detect enable */ +#define BGE_SERDESCFG_TBILOOP 0x00020000 /* local loopback */ +#define BGE_SERDESCFG_REMLOOP 0x00040000 /* remote loopback */ +#define BGE_SERDESCFG_INVPHASE 0x00080000 /* Reverse 125Mhz clock */ +#define BGE_SERDESCFG_12REGCTL 0x00300000 /* 1.2v regulator ctl */ +#define BGE_SERDESCFG_REGCTL 0x00C00000 /* regulator ctl (2.5v) */ + +/* SERDES status register */ +#define BGE_SERDESSTS_RXSTAT 0x0000000F /* receive status bits */ +#define BGE_SERDESSTS_CDET 0x00000010 /* comma code detected */ + +/* SGDIG config (not documented) */ +#define BGE_SGDIGCFG_PAUSE_CAP 0x00000800 +#define BGE_SGDIGCFG_ASYM_PAUSE 0x00001000 +#define BGE_SGDIGCFG_SEND 0x40000000 +#define BGE_SGDIGCFG_AUTO 0x80000000 + +/* SGDIG status (not documented) */ +#define BGE_SGDIGSTS_PAUSE_CAP 0x00080000 +#define BGE_SGDIGSTS_ASYM_PAUSE 0x00100000 +#define BGE_SGDIGSTS_DONE 0x00000002 + + /* MI communication register */ #define BGE_MICOMM_DATA 0x0000FFFF #define BGE_MICOMM_REG 0x001F0000 ==== //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#7 (text+ko) ==== @@ -22,7 +22,7 @@ * Cronyx Id: if_cx.c,v 1.1.2.23 2004/02/26 17:56:40 rik Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.17 2004/06/08 10:38:20 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.19 2004/06/10 13:50:28 rik Exp $"); #include @@ -1037,6 +1037,14 @@ if (!d || d->chan->type == T_NONE) continue; + +#if __FreeBSD_version >= 502113 + if (d->tty) { + ttyrel (d->tty); + d->tty = NULL; + } +#endif + #ifdef NETGRAPH #if __FreeBSD_version >= 500000 if (d->node) { @@ -1735,7 +1743,13 @@ splx (s); d->callout = 0; - /* Wake up bidirectional opens. */ + /* + * Wake up bidirectional opens. + * Since we may be opened twice we couldn't call ttyrel() here. + * So just keep d->tty for future use. It would be freed by + * ttyrel() at cx_detach(). + */ + wakeup (d); d->open_dev &= ~0x2; @@ -2140,7 +2154,7 @@ return 0; } - if (c->mode == M_ASYNC && d->tty) { + if (c->mode == M_ASYNC && !IF_CUNIT(dev) && d->tty) { #if __FreeBSD_version >= 502113 error = ttyioctl (dev, cmd, data, flag, td); ttyldoptim (d->tty); ==== //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.231 2004/05/23 16:11:46 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.232 2004/06/09 14:33:58 naddy Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -104,8 +104,6 @@ static void ed_setrcr (struct ed_softc *); -static uint32_t ds_mchash (const uint8_t *); - /* * Interrupt conversion table for WD/SMC ASIC/83C584 */ @@ -3520,30 +3518,6 @@ } /* - * Compute crc for ethernet address - */ -static uint32_t -ds_mchash(addr) - const uint8_t *addr; -{ -#define ED_POLYNOMIAL 0x04c11db6 - register uint32_t crc = 0xffffffff; - register int carry, idx, bit; - register uint8_t data; - - for (idx = 6; --idx >= 0;) { - for (data = *addr++, bit = 8; --bit >= 0; data >>=1 ) { - carry = ((crc & 0x80000000) ? 1 : 0) ^ (data & 0x01); - crc <<= 1; - if (carry) - crc = (crc ^ ED_POLYNOMIAL) | carry; - } - } - return crc; -#undef POLYNOMIAL -} - -/* * Compute the multicast address filter from the * list of multicast addresses we need to listen to. */ @@ -3562,8 +3536,8 @@ TAILQ_FOREACH(ifma, &sc->arpcom.ac_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - index = ds_mchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)) - >> 26; + index = ether_crc32_be(LLADDR((struct sockaddr_dl *) + ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; af[index >> 3] |= 1 << (index & 7); } } ==== //depot/projects/netperf_socket/sys/dev/eisa/eisaconf.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.65 2003/08/24 17:46:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.66 2004/06/09 16:08:20 imp Exp $"); #include "opt_eisa.h" @@ -508,8 +508,8 @@ return rv; } -int -eisa_add_intr(device_t dev, int irq, int trigger) +static int +eisa_add_intr_m(device_t eisa, device_t dev, int irq, int trigger) { struct eisa_device *e_dev = device_get_ivars(dev); struct irq_node *irq_info; @@ -575,8 +575,9 @@ return (0); } -int -eisa_add_mspace(device_t dev, u_long mbase, u_long msize, int flags) +static int +eisa_add_mspace_m(device_t eisa, device_t dev, u_long mbase, u_long msize, + int flags) { struct eisa_device *e_dev = device_get_ivars(dev); @@ -584,8 +585,9 @@ flags); } -int -eisa_add_iospace(device_t dev, u_long iobase, u_long iosize, int flags) +static int +eisa_add_iospace_m(device_t eisa, device_t dev, u_long iobase, u_long iosize, + int flags) { struct eisa_device *e_dev = device_get_ivars(dev); @@ -614,6 +616,11 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + /* EISA interface */ + DEVMETHOD(eisa_add_intr, eisa_add_intr_m), + DEVMETHOD(eisa_add_iospace, eisa_add_iospace_m), + DEVMETHOD(eisa_add_mspace, eisa_add_mspace_m), + { 0, 0 } }; ==== //depot/projects/netperf_socket/sys/dev/eisa/eisaconf.h#2 (text+ko) ==== @@ -28,12 +28,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/eisa/eisaconf.h,v 1.22 2002/08/20 12:32:06 mux Exp $ + * $FreeBSD: src/sys/dev/eisa/eisaconf.h,v 1.23 2004/06/09 16:08:20 imp Exp $ */ -#ifndef _I386_EISA_EISACONF_H_ -#define _I386_EISA_EISACONF_H_ 1 +#ifndef _DEV_EISA_EISACONF_H_ +#define _DEV_EISA_EISACONF_H_ 1 +#include "eisa_if.h" #define EISA_SLOT_SIZE 0x1000 #define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@') /* Bits 26-30 */ @@ -68,14 +69,30 @@ #undef EISA_ACCESSOR -int eisa_add_intr(device_t, int, int); - #define RESVADDR_NONE 0x00 #define RESVADDR_BITMASK 0x01 /* size is a mask of reserved * bits at addr */ #define RESVADDR_RELOCATABLE 0x02 -int eisa_add_iospace(device_t, u_long, u_long, int); -int eisa_add_mspace(device_t, u_long, u_long, int); + +static __inline int +eisa_add_intr(device_t dev, int irq, int trigger) +{ + return (EISA_ADD_INTR(device_get_parent(dev), dev, irq, trigger)); +} + +static __inline int +eisa_add_iospace(device_t dev, u_long iobase, u_long iosize, int flags) +{ + return (EISA_ADD_IOSPACE(device_get_parent(dev), dev, iobase, iosize, + flags)); +} + +static __inline int +eisa_add_mspace(device_t dev, u_long mbase, u_long msize, int flags) +{ + return (EISA_ADD_MSPACE(device_get_parent(dev), dev, mbase, msize, + flags)); +} -#endif /* _I386_EISA_EISACONF_H_ */ +#endif /* _DEV_EISA_EISACONF_H_ */ ==== //depot/projects/netperf_socket/sys/dev/fb/vga.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.29 2004/04/03 15:28:25 nectar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.30 2004/06/10 20:30:56 jhb Exp $"); #include "opt_vga.h" #include "opt_fb.h" @@ -67,7 +67,7 @@ #if !defined(__amd64__) #define BIOS_PADDRTOVADDR(x) (x) #else -#define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase) +#define BIOS_PADDRTOVADDR(x) ((x) + KERNBASE) #endif #endif ==== //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#6 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.84 2004/05/23 16:11:47 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.85 2004/06/09 14:33:59 naddy Exp $"); /* * @@ -2033,29 +2033,6 @@ } /* - * Compute hash value for an Ethernet address - */ -static uint32_t -fe_mchash (const uint8_t *addr) -{ -#define FE_POLY 0xEDB88320L - - uint32_t carry, crc = 0xFFFFFFFFL; - int idx, bit; - uint8_t data; - - for ( idx = ETHER_ADDR_LEN; --idx >= 0; ) { - for (data = *addr++, bit = 8; --bit >= 0; data >>= 1) { - carry = crc; - crc >>= 1; - if ((carry ^ data) & 1) - crc ^= FE_POLY; - } - } - return (crc >> 26); -} - -/* * Compute the multicast address filter from the * list of multicast addresses we need to listen to. */ @@ -2070,7 +2047,8 @@ TAILQ_FOREACH(ifma, &sc->arpcom.ac_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - index = fe_mchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); + index = ether_crc32_le(LLADDR((struct sockaddr_dl *) + ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; #ifdef FE_DEBUG printf("%s: hash(%6D) == %d\n", sc->sc_xname, enm->enm_addrlo , ":", index); ==== //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.24 2004/06/03 06:09:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.26 2004/06/10 00:04:16 marius Exp $"); /* * Driver for Sun GEM ethernet controllers. @@ -1844,14 +1844,11 @@ { struct ifnet *ifp = &sc->sc_arpcom.ac_if; struct ifmultiaddr *inm; - struct sockaddr_dl *sdl; bus_space_tag_t t = sc->sc_bustag; bus_space_handle_t h = sc->sc_h; - u_char *cp; u_int32_t crc; u_int32_t hash[16]; u_int32_t v; - int len; int i; /* Get current RX configuration */ @@ -1891,24 +1888,9 @@ TAILQ_FOREACH(inm, &sc->sc_arpcom.ac_if.if_multiaddrs, ifma_link) { if (inm->ifma_addr->sa_family != AF_LINK) continue; - sdl = (struct sockaddr_dl *)inm->ifma_addr; - cp = LLADDR(sdl); - crc = 0xffffffff; - for (len = sdl->sdl_alen; --len >= 0;) { - int octet = *cp++; - int i; + crc = ether_crc32_le(LLADDR((struct sockaddr_dl *) + inm->ifma_addr), ETHER_ADDR_LEN); -#define MC_POLY_LE 0xedb88320UL /* mcast crc, little endian */ - for (i = 0; i < 8; i++) { - if ((crc & 1) ^ (octet & 1)) { - crc >>= 1; - crc ^= MC_POLY_LE; - } else { - crc >>= 1; - } - octet >>= 1; - } - } /* Just want the 8 most significant bits. */ crc >>= 24; ==== //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.24 2004/06/03 06:09:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.26 2004/06/10 00:06:04 marius Exp $"); /* * HME Ethernet module driver. @@ -1404,12 +1404,9 @@ { struct ifnet *ifp = &sc->sc_arpcom.ac_if; struct ifmultiaddr *inm; - struct sockaddr_dl *sdl; - u_char *cp; u_int32_t crc; u_int32_t hash[4]; u_int32_t macc; - int len; /* Clear hash table */ hash[3] = hash[2] = hash[1] = hash[0] = 0; @@ -1458,24 +1455,9 @@ TAILQ_FOREACH(inm, &sc->sc_arpcom.ac_if.if_multiaddrs, ifma_link) { if (inm->ifma_addr->sa_family != AF_LINK) continue; - sdl = (struct sockaddr_dl *)inm->ifma_addr; - cp = LLADDR(sdl); - crc = 0xffffffff; - for (len = sdl->sdl_alen; --len >= 0;) { - int octet = *cp++; - int i; + crc = ether_crc32_le(LLADDR((struct sockaddr_dl *) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 10 22:21:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 274DC16A4D1; Thu, 10 Jun 2004 22:21:08 +0000 (GMT) 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 DBB2416A4CE for ; Thu, 10 Jun 2004 22:21:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE22743D64 for ; Thu, 10 Jun 2004 22:21:07 +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.12.11/8.12.11) with ESMTP id i5AMKbTN014501 for ; Thu, 10 Jun 2004 22:20:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5AMKb1W014493 for perforce@freebsd.org; Thu, 10 Jun 2004 22:20:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 10 Jun 2004 22:20:37 GMT Message-Id: <200406102220.i5AMKb1W014493@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 Subject: PERFORCE change 54583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2004 22:21:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=54583 Change 54583 by rwatson@rwatson_paprika on 2004/06/10 22:19:38 Reinject netperf_socket socket locking following slightly too enthusiastic resolve -at of UNIX domain socket locking from CVS. Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#10 edit Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#10 (text+ko) ==== @@ -114,6 +114,7 @@ UNP_LOCK(); unp_drop(unp, ECONNABORTED); unp_detach(unp); /* NB: unlocks */ + SOCK_LOCK(so); sotryfree(so); return (0); } @@ -269,6 +270,12 @@ if (unp == NULL) return (EINVAL); + /* + * Reorder locks to avoid LORs. Note that we + * delay re-locking so_rcv to below so it can + * be done only once. + */ + SOCKBUF_UNLOCK(&so>so_rcv); UNP_LOCK(); switch (so->so_type) { case SOCK_DGRAM: @@ -276,9 +283,14 @@ /*NOTREACHED*/ case SOCK_STREAM: - if (unp->unp_conn == NULL) + if (unp->unp_conn == NULL) { + SOCKBUF_LOCK(&so->so_rcv); break; + } so2 = unp->unp_conn->unp_socket; + /* NB: careful of order here */ + SOCKBUF_LOCK(&so2->so_snd); + SOCKBUF_LOCK(&so->so_rcv); /* * Adjust backpressure on sender * and wakeup any waiting to write. @@ -290,7 +302,8 @@ (void)chgsbsize(so2->so_cred->cr_uidinfo, &so2->so_snd.sb_hiwat, newhiwat, RLIM_INFINITY); unp->unp_cc = so->so_rcv.sb_cc; - sowwakeup(so2); + sowwakeup_locked(so2); + SOCKBUF_UNLOCK(&so2->so_snd); break; default: @@ -323,7 +336,13 @@ if (control != NULL && (error = unp_internalize(&control, td))) goto release; + /* + * Reorder locks to avoid LORs. + */ + SOCKBUF_UNLOCK(&so->so_snd); UNP_LOCK(); + SOCKBUF_LOCK(&so->so_snd); + switch (so->so_type) { case SOCK_DGRAM: { @@ -334,7 +353,9 @@ error = EISCONN; break; } + SOCKBUF_UNLOCK(&so->so_snd); error = unp_connect(so, nam, td); + SOCKBUF_LOCK(&so->so_snd); if (error) break; } else { @@ -348,13 +369,15 @@ from = (struct sockaddr *)unp->unp_addr; else from = &sun_noname; - if (sbappendaddr(&so2->so_rcv, from, m, control)) { - sorwakeup(so2); + SOCKBUF_LOCK(&so2->so_rcv); + if (sbappendaddr_locked(&so2->so_rcv, from, m, control)) { + sorwakeup_locked(so2); m = NULL; control = NULL; } else { error = ENOBUFS; } + SOCKBUF_UNLOCK(&so2->so_rcv); if (nam != NULL) unp_disconnect(unp); break; @@ -368,7 +391,9 @@ */ if ((so->so_state & SS_ISCONNECTED) == 0) { if (nam != NULL) { + SOCKBUF_UNLOCK(&so->so_snd); error = unp_connect(so, nam, td); + SOCKBUF_LOCK(&so->so_snd); if (error) break; /* XXX */ } else { @@ -384,16 +409,17 @@ if (unp->unp_conn == NULL) panic("uipc_send connected but no connection?"); so2 = unp->unp_conn->unp_socket; + SOCKBUF_LOCK(&so2->so_rcv); /* * Send to paired receive port, and then reduce * send buffer hiwater marks to maintain backpressure. * Wake up readers. */ if (control != NULL) { - if (sbappendcontrol(&so2->so_rcv, m, control)) + if (sbappendcontrol_locked(&so2->so_rcv, m, control)) control = NULL; } else { - sbappend(&so2->so_rcv, m); + sbappend_locked(&so2->so_rcv, m); } so->so_snd.sb_mbmax -= so2->so_rcv.sb_mbcnt - unp->unp_conn->unp_mbcnt; @@ -403,7 +429,8 @@ (void)chgsbsize(so->so_cred->cr_uidinfo, &so->so_snd.sb_hiwat, newhiwat, RLIM_INFINITY); unp->unp_conn->unp_cc = so2->so_rcv.sb_cc; - sorwakeup(so2); + sorwakeup_locked(so2); + SOCKBUF_UNLOCK(&so2->so_rcv); m = NULL; break; @@ -416,7 +443,7 @@ * a SHUTDOWN. */ if (flags & PRUS_EOF) { - socantsendmore(so); + socantsendmore_locked(so); unp_shutdown(unp); } UNP_UNLOCK(); @@ -462,6 +489,7 @@ if (unp == NULL) return (EINVAL); UNP_LOCK(); + /* XXX socket lock? */ socantsendmore(so); unp_shutdown(unp); UNP_UNLOCK(); From owner-p4-projects@FreeBSD.ORG Thu Jun 10 22:31:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C04F516A4D2; Thu, 10 Jun 2004 22:31:27 +0000 (GMT) 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 96BA916A4D1 for ; Thu, 10 Jun 2004 22:31:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87C7E43D58 for ; Thu, 10 Jun 2004 22:31:27 +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.12.11/8.12.11) with ESMTP id i5AMUr8L016548 for ; Thu, 10 Jun 2004 22:30:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5AMUqBX016545 for perforce@freebsd.org; Thu, 10 Jun 2004 22:30:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 10 Jun 2004 22:30:52 GMT Message-Id: <200406102230.i5AMUqBX016545@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 Subject: PERFORCE change 54586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2004 22:31:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=54586 Change 54586 by rwatson@rwatson_tislabs on 2004/06/10 22:30:08 Top up integrate for netperf_socket as I prepare a new netperf patch. Affected files ... .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#5 (text+ko) ==== @@ -24,10 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.22 2004/06/04 16:02:51 phk Exp $"); - -#include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.22 2004/06/04 16:02:51 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.23 2004/06/10 22:15:51 marius Exp $"); #include "opt_ddb.h" #include "opt_comconsole.h" From owner-p4-projects@FreeBSD.ORG Thu Jun 10 23:16:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11F8C16A4D1; Thu, 10 Jun 2004 23:16:55 +0000 (GMT) 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 DEC7016A4CE for ; Thu, 10 Jun 2004 23:16:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D487E43D31 for ; Thu, 10 Jun 2004 23:16:54 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5ANGrwU027547 for ; Thu, 10 Jun 2004 23:16:53 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5ANGpBw027544 for perforce@freebsd.org; Thu, 10 Jun 2004 23:16:51 GMT (envelope-from julian@freebsd.org) Date: Thu, 10 Jun 2004 23:16:51 GMT Message-Id: <200406102316.i5ANGpBw027544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 54591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2004 23:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=54591 Change 54591 by julian@julian_ref on 2004/06/10 23:16:29 IFC and sir merge-alot Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/mem.c#3 integrate .. //depot/projects/nsched/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/nsched/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/nsched/sys/alpha/alpha/uio_machdep.c#3 integrate .. //depot/projects/nsched/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/nsched/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/nsched/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/nsched/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/nsched/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/nsched/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/nsched/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/nsched/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/nsched/sys/amd64/include/asm.h#3 integrate .. //depot/projects/nsched/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/nsched/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/nsched/sys/amd64/include/param.h#2 integrate .. //depot/projects/nsched/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/nsched/sys/amd64/include/profile.h#4 integrate .. //depot/projects/nsched/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/nsched/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/nsched/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/nsched/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/nsched/sys/arm/arm/exception.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/locore.S#2 integrate .. //depot/projects/nsched/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/nsched/sys/boot/i386/boot2/boot1.S#4 integrate .. //depot/projects/nsched/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/nsched/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/nsched/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/nsched/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/nsched/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/nsched/sys/conf/NOTES#4 integrate .. //depot/projects/nsched/sys/conf/files#10 integrate .. //depot/projects/nsched/sys/conf/files.sparc64#3 integrate .. //depot/projects/nsched/sys/conf/kmod.mk#4 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/nsched/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/nsched/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/nsched/sys/dev/aac/aac.c#3 integrate .. //depot/projects/nsched/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/nsched/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/nsched/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_powerres.c#4 integrate .. //depot/projects/nsched/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/nsched/sys/dev/arl/if_arl.c#4 integrate .. //depot/projects/nsched/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/nsched/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/nsched/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/nsched/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/nsched/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/nsched/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/nsched/sys/dev/cy/cy.c#3 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/nsched/sys/dev/digi/digi.c#3 integrate .. //depot/projects/nsched/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/nsched/sys/dev/eisa/eisa_if.m#1 branch .. //depot/projects/nsched/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/nsched/sys/dev/eisa/eisaconf.h#2 integrate .. //depot/projects/nsched/sys/dev/em/if_em.c#4 integrate .. //depot/projects/nsched/sys/dev/esp/esp_sbus.c#1 branch .. //depot/projects/nsched/sys/dev/esp/lsi64854.c#1 branch .. //depot/projects/nsched/sys/dev/esp/lsi64854reg.h#1 branch .. //depot/projects/nsched/sys/dev/esp/lsi64854var.h#1 branch .. //depot/projects/nsched/sys/dev/esp/ncr53c9x.c#1 branch .. //depot/projects/nsched/sys/dev/esp/ncr53c9xreg.h#1 branch .. //depot/projects/nsched/sys/dev/esp/ncr53c9xvar.h#1 branch .. //depot/projects/nsched/sys/dev/fb/tga.c#2 integrate .. //depot/projects/nsched/sys/dev/fb/vga.c#3 integrate .. //depot/projects/nsched/sys/dev/fe/if_fe.c#4 integrate .. //depot/projects/nsched/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/nsched/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/nsched/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/nsched/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/nsched/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/nsched/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/nsched/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/nsched/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/nsched/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/nsched/sys/dev/lnc/if_lnc.c#4 integrate .. //depot/projects/nsched/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/nsched/sys/dev/my/if_my.c#3 integrate .. //depot/projects/nsched/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/nsched/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/nsched/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/nsched/sys/dev/pcf/pcf_ebus.c#1 branch .. //depot/projects/nsched/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/nsched/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/nsched/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/nsched/sys/dev/rc/rc.c#3 integrate .. //depot/projects/nsched/sys/dev/re/if_re.c#4 integrate .. //depot/projects/nsched/sys/dev/rp/rp.c#2 integrate .. //depot/projects/nsched/sys/dev/sab/sab.c#2 integrate .. //depot/projects/nsched/sys/dev/si/si.c#2 integrate .. //depot/projects/nsched/sys/dev/sio/sio.c#4 integrate .. //depot/projects/nsched/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/sn/if_sn.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/emu8000.c#2 delete .. //depot/projects/nsched/sys/dev/sound/isa/gusmidi.c#2 delete .. //depot/projects/nsched/sys/dev/sound/isa/mpu.c#2 delete .. //depot/projects/nsched/sys/dev/sound/isa/opl.c#2 delete .. //depot/projects/nsched/sys/dev/sound/isa/uartsio.c#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/midi.c#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/midi.h#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/midibuf.c#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/midibuf.h#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/midisynth.c#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/midisynth.h#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/miditypes.h#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/sequencer.c#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/sequencer.h#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/timer.c#2 delete .. //depot/projects/nsched/sys/dev/sound/midi/timer.h#2 delete .. //depot/projects/nsched/sys/dev/sound/pci/csamidi.c#2 delete .. //depot/projects/nsched/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/nsched/sys/dev/sx/sx.c#2 integrate .. //depot/projects/nsched/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/nsched/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/nsched/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/umass.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs.h#4 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs_data.h#4 integrate .. //depot/projects/nsched/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/nsched/sys/dev/xe/if_xe.c#4 integrate .. //depot/projects/nsched/sys/dev/zs/zs.c#3 integrate .. //depot/projects/nsched/sys/dev/zs/zs_sbus.c#2 integrate .. //depot/projects/nsched/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/nsched/sys/geom/geom_io.c#3 integrate .. //depot/projects/nsched/sys/geom/geom_sunlabel_enc.c#2 integrate .. //depot/projects/nsched/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/nsched/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/nsched/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/nsched/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/nsched/sys/i386/bios/smbios.c#2 integrate .. //depot/projects/nsched/sys/i386/bios/vpd.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/bios.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/geode.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/nsched/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/nsched/sys/i386/i386/symbols.raw#2 integrate .. //depot/projects/nsched/sys/i386/i386/trap.c#2 integrate .. //depot/projects/nsched/sys/i386/i386/uio_machdep.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/nsched/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/nsched/sys/i386/include/md_var.h#3 integrate .. //depot/projects/nsched/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/nsched/sys/i386/isa/npx.c#4 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_hdr.h#3 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_sup.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_vtf.c#2 integrate .. //depot/projects/nsched/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/nsched/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/nsched/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/nsched/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/nsched/sys/ia64/ia64/mem.c#3 integrate .. //depot/projects/nsched/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/nsched/sys/ia64/ia64/uio_machdep.c#3 integrate .. //depot/projects/nsched/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/nsched/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/nsched/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_clock.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_conf.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_event.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_exec.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_exit.c#9 integrate .. //depot/projects/nsched/sys/kern/kern_intr.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_lock.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_mbuf.c#1 branch .. //depot/projects/nsched/sys/kern/kern_proc.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_sig.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_subr.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_synch.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#19 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#5 integrate .. //depot/projects/nsched/sys/kern/subr_blist.c#2 integrate .. //depot/projects/nsched/sys/kern/subr_bus.c#3 integrate .. //depot/projects/nsched/sys/kern/subr_mbuf.c#3 delete .. //depot/projects/nsched/sys/kern/subr_witness.c#2 integrate .. //depot/projects/nsched/sys/kern/tty.c#3 integrate .. //depot/projects/nsched/sys/kern/tty_conf.c#3 integrate .. //depot/projects/nsched/sys/kern/tty_pty.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_accf.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/nsched/sys/kern/uipc_mbuf2.c#4 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/nsched/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/nsched/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/nsched/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/em/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/esp/Makefile#1 branch .. //depot/projects/nsched/sys/modules/ipfilter/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/vx/Makefile#2 integrate .. //depot/projects/nsched/sys/net/ethernet.h#2 integrate .. //depot/projects/nsched/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/nsched/sys/net/if_sl.c#3 integrate .. //depot/projects/nsched/sys/net/netisr.h#3 integrate .. //depot/projects/nsched/sys/net/rtsock.c#4 integrate .. //depot/projects/nsched/sys/netatm/atm_ioctl.h#2 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_tee.c#3 integrate .. //depot/projects/nsched/sys/netinet/in.h#3 integrate .. //depot/projects/nsched/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/nsched/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/nsched/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/nsched/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/nsched/sys/pc98/i386/machdep.c#2 integrate .. //depot/projects/nsched/sys/pc98/pc98/clock.c#3 integrate .. //depot/projects/nsched/sys/pc98/pc98/mse.c#2 integrate .. //depot/projects/nsched/sys/pc98/pc98/olpt.c#2 integrate .. //depot/projects/nsched/sys/pc98/pc98/pc98gdc.c#2 integrate .. //depot/projects/nsched/sys/pc98/pc98/pmc.c#2 integrate .. //depot/projects/nsched/sys/pc98/pc98/ppc.c#2 integrate .. //depot/projects/nsched/sys/pc98/pc98/scgdcrndr.c#2 integrate .. //depot/projects/nsched/sys/pc98/pc98/scterm-sck.c#2 integrate .. //depot/projects/nsched/sys/pc98/pc98/sio.c#4 integrate .. //depot/projects/nsched/sys/pci/if_dc.c#4 integrate .. //depot/projects/nsched/sys/pci/if_de.c#3 integrate .. //depot/projects/nsched/sys/pci/if_pcn.c#3 integrate .. //depot/projects/nsched/sys/pci/if_rl.c#5 integrate .. //depot/projects/nsched/sys/pci/if_sf.c#3 integrate .. //depot/projects/nsched/sys/pci/if_sis.c#4 integrate .. //depot/projects/nsched/sys/pci/if_sk.c#4 integrate .. //depot/projects/nsched/sys/pci/if_ste.c#6 integrate .. //depot/projects/nsched/sys/pci/if_vr.c#5 integrate .. //depot/projects/nsched/sys/pci/if_wb.c#3 integrate .. //depot/projects/nsched/sys/pci/if_xl.c#4 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/uio_machdep.c#3 integrate .. //depot/projects/nsched/sys/sparc64/central/central.c#2 integrate .. //depot/projects/nsched/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/nsched/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/nsched/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/nsched/sys/sparc64/fhc/fhc_nexus.c#2 integrate .. //depot/projects/nsched/sys/sparc64/include/asmacros.h#2 integrate .. //depot/projects/nsched/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/nsched/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/uio_machdep.c#4 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/vm_machdep.c#5 integrate .. //depot/projects/nsched/sys/sys/blist.h#2 integrate .. //depot/projects/nsched/sys/sys/bus.h#3 integrate .. //depot/projects/nsched/sys/sys/conf.h#3 integrate .. //depot/projects/nsched/sys/sys/linedisc.h#1 branch .. //depot/projects/nsched/sys/sys/mbuf.h#5 integrate .. //depot/projects/nsched/sys/sys/param.h#4 integrate .. //depot/projects/nsched/sys/sys/proc.h#12 integrate .. //depot/projects/nsched/sys/sys/socket.h#4 integrate .. //depot/projects/nsched/sys/sys/socketvar.h#3 integrate .. //depot/projects/nsched/sys/sys/sun_disklabel.h#3 integrate .. //depot/projects/nsched/sys/sys/systm.h#3 integrate .. //depot/projects/nsched/sys/sys/tty.h#3 integrate .. //depot/projects/nsched/sys/sys/vmmeter.h#3 integrate .. //depot/projects/nsched/sys/sys/vnode.h#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/nsched/sys/vm/uma.h#2 integrate .. //depot/projects/nsched/sys/vm/uma_core.c#2 integrate .. //depot/projects/nsched/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/nsched/sys/vm/uma_int.h#2 integrate .. //depot/projects/nsched/sys/vm/vm_kern.c#4 integrate .. //depot/projects/nsched/sys/vm/vm_page.h#4 integrate .. //depot/projects/nsched/sys/vm/vm_pageq.c#3 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/mem.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.48 2004/04/05 21:00:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.49 2004/06/03 05:58:27 phk Exp $"); /* * Memory special file @@ -48,9 +48,10 @@ #include #include #include -#include #include #include +#include +#include #include #include #include ==== //depot/projects/nsched/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.147 2004/06/10 04:30:59 alc Exp $"); #include #include @@ -612,7 +612,6 @@ pmap_init(void) { int i; - int initial_pvs; /* * Allocate memory for random pmap data structures. Includes the @@ -630,12 +629,9 @@ /* * init the pv free list */ - initial_pvs = vm_page_array_size; - if (initial_pvs < MINPV) - initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - uma_prealloc(pvzone, initial_pvs); + uma_prealloc(pvzone, MINPV); /* * Now it is safe to enable pv_table recording. ==== //depot/projects/nsched/sys/alpha/alpha/promcons.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.36 2004/02/28 16:36:14 kensmith Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.38 2004/06/04 16:02:48 phk Exp $"); #include #include @@ -61,13 +61,11 @@ static d_open_t promopen; static d_close_t promclose; -static d_ioctl_t promioctl; static struct cdevsw prom_cdevsw = { .d_version = D_VERSION, .d_open = promopen, .d_close = promclose, - .d_ioctl = promioctl, .d_name = "prom", .d_flags = D_TTY | D_NEEDGIANT, }; @@ -126,7 +124,7 @@ splx(s); - error = (*linesw[tp->t_line].l_open)(dev, tp); + error = ttyld_open(tp, dev); if (error == 0 && setuptimeout) { polltime = hz / PROM_POLL_HZ; @@ -150,37 +148,12 @@ return ENXIO; untimeout(promtimeout, tp, promtimeouthandle); - (*linesw[tp->t_line].l_close)(tp, flag); + ttyld_close(tp, flag); ttyclose(tp); return 0; } int -promioctl(dev, cmd, data, flag, td) - dev_t dev; - u_long cmd; - caddr_t data; - int flag; - struct thread *td; -{ - int unit = minor(dev); - struct tty *tp = prom_tp; - int error; - - if (unit != 0) - return ENXIO; - - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) - return error; - error = ttioctl(tp, cmd, data, flag); - if (error != ENOIOCTL) - return error; - - return ENOTTY; -} - -int promparam(tp, t) struct tty *tp; struct termios *t; @@ -238,7 +211,7 @@ while ((c = promcncheckc(NULL)) != -1) { if (tp->t_state & TS_ISOPEN) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); } promtimeouthandle = timeout(promtimeout, tp, polltime); } ==== //depot/projects/nsched/sys/alpha/alpha/support.s#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/alpha/alpha/support.s,v 1.16 2004/01/19 21:27:10 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.17 2004/06/06 21:26:47 phk Exp $ */ /* @@ -680,10 +680,8 @@ longjmp_botch: lda a0, longjmp_botchmsg - mov 0, a1 - mov 0, a2 - mov ra, a3 - CALL(__panic) + mov ra, a1 + CALL(panic) call_pal PAL_bugchk .data ==== //depot/projects/nsched/sys/alpha/alpha/uio_machdep.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.2 2004/04/05 21:00:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.4 2004/06/03 10:22:45 tjr Exp $"); #include #include @@ -70,12 +70,8 @@ ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); - if (td != NULL) { - mtx_lock_spin(&sched_lock); - save = td->td_flags & TDF_DEADLKTREAT; - td->td_flags |= TDF_DEADLKTREAT; - mtx_unlock_spin(&sched_lock); - } + save = td->td_pflags & TDP_DEADLKTREAT; + td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { iov = uio->uio_iov; cnt = iov->iov_len; @@ -119,10 +115,7 @@ n -= cnt; } out: - if (td != NULL && save == 0) { - mtx_lock_spin(&sched_lock); - td->td_flags &= ~TDF_DEADLKTREAT; - mtx_unlock_spin(&sched_lock); - } + if (save == 0) + td->td_pflags &= ~TDP_DEADLKTREAT; return (error); } ==== //depot/projects/nsched/sys/alpha/include/pc/bios.h#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/alpha/include/pc/bios.h,v 1.5 1999/08/28 00:38:56 peter Exp $ + * $FreeBSD: src/sys/alpha/include/pc/bios.h,v 1.6 2004/06/10 20:30:54 jhb Exp $ * from: i386/include/pc bios.h,v 1.2 */ @@ -71,13 +71,8 @@ }; extern void bios32(caddr_t func_addr, struct bios32_args *args); -#if 0 -#define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase) -#define BIOS_VADDRTOPADDR(x) (((x) - atdevbase) + ISA_HOLE_START) -#else #define BIOS_PADDRTOVADDR(x) (x) #define BIOS_VADDRTOPADDR(x) (x) -#endif /* * System Management BIOS / Desktop Management Interface tables ==== //depot/projects/nsched/sys/alpha/linux/linux_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.17 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.18 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/nsched/sys/alpha/linux/linux_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.15 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.16 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/nsched/sys/alpha/linux/linux_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.15 2004/03/29 02:19:43 bms Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.16 2004/06/04 13:52:51 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp */ #include "opt_compat.h" @@ -382,7 +382,7 @@ { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer }, /* 362 = linux_setitimer */ { AS(linux_utimes_args), (sy_call_t *)linux_utimes }, /* 363 = linux_utimes */ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage }, /* 364 = getrusage */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */ { 0, (sy_call_t *)linux_adjtimex }, /* 366 = linux_adjtimex */ { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd }, /* 367 = linux_getcwd */ { 0, (sy_call_t *)linux_capget }, /* 368 = linux_capget */ ==== //depot/projects/nsched/sys/alpha/linux/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.57 2004/03/29 02:19:43 bms Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -445,7 +445,7 @@ struct l_itimerval *oitv); } 363 STD { int linux_utimes(char *fname, struct l_timeval *times); } 364 MNOPROTO { int getrusage(int who, struct rusage *rusage); } -365 STD { int linux_wait4(l_pid_t pid, l_uint *status, l_int options, \ +365 MSTD { int linux_wait4(l_pid_t pid, l_uint *status, l_int options, \ struct l_rusage *rusage); } 366 STD { int linux_adjtimex(void); } 367 STD { int linux_getcwd(char *buf, l_ulong bufsize); } ==== //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.42 2004/02/21 21:10:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.44 2004/06/04 16:02:48 phk Exp $"); #include "opt_ddb.h" @@ -68,13 +68,11 @@ static d_open_t zsopen; static d_close_t zsclose; -static d_ioctl_t zsioctl; static struct cdevsw zs_cdevsw = { .d_version = D_VERSION, .d_open = zsopen, .d_close = zsclose, - .d_ioctl = zsioctl, .d_name = "zs", .d_flags = D_TTY | D_NEEDGIANT, }; @@ -293,7 +291,7 @@ splx(s); - error = (*linesw[tp->t_line].l_open)(dev, tp); + error = ttyld_open(tp, dev); if (error == 0 && setuptimeout) { zspolltime = hz / 50; @@ -320,7 +318,7 @@ s = spltty(); untimeout(zs_poll_intr, sc, sc->zst); - (*linesw[tp->t_line].l_close)(tp, flag); + ttyld_close(tp, flag); ttyclose(tp); splx(s); @@ -328,31 +326,6 @@ } static int -zsioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) -{ - struct zs_softc *sc = ZS_SOFTC(minor(dev)); - struct tty *tp; - int error; - - if (sc == NULL) - return (ENXIO); - - tp = ZS_SOFTC(minor(dev))->tp; - - error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td); - - if (error != ENOIOCTL) - return (error); - - error = ttioctl(tp, cmd, data, flag); - - if (error != ENOIOCTL) - return (error); - else - return (ENOTTY); -} - -static int zsparam(struct tty *tp, struct termios *t) { return (0); @@ -529,7 +502,7 @@ Debugger("manual escape to debugger"); #endif if (tp && (tp->t_state & TS_ISOPEN)) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); DELAY(5); } } @@ -544,7 +517,7 @@ Debugger("manual escape to debugger"); #endif if (tp && (tp->t_state & TS_ISOPEN)) - (*linesw[tp->t_line].l_rint)(c, tp); + ttyld_rint(tp, c); DELAY(5); } } ==== //depot/projects/nsched/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.12 2004/05/16 20:30:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.14 2004/06/10 21:30:08 peter Exp $"); #include #include @@ -65,10 +65,9 @@ } ioapics[NIOAPICS]; struct lapic_info { - u_int la_present:1; u_int la_enabled:1; - u_int la_apic_id:8; -} lapics[NLAPICS + 1]; + u_int la_acpi_id:8; +} lapics[NLAPICS]; static int madt_found_sci_override; static MULTIPLE_APIC_TABLE *madt; @@ -447,18 +446,17 @@ printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", proc->LocalApicId, proc->ProcessorId, proc->ProcessorEnabled ? "enabled" : "disabled"); - if (proc->ProcessorId > NLAPICS) + if (!proc->ProcessorEnabled) + break; + if (proc->LocalApicId >= NLAPICS) panic("%s: CPU ID %d too high", __func__, - proc->ProcessorId); - la = &lapics[proc->ProcessorId]; - KASSERT(la->la_present == 0, - ("Duplicate local ACPI ID %d", proc->ProcessorId)); - la->la_present = 1; - la->la_apic_id = proc->LocalApicId; - if (proc->ProcessorEnabled) { - la->la_enabled = 1; - lapic_create(proc->LocalApicId, 0); - } + proc->LocalApicId); + la = &lapics[proc->LocalApicId]; + KASSERT(la->la_enabled == 0, + ("Duplicate local APIC ID %d", proc->LocalApicId)); + la->la_enabled = 1; + la->la_acpi_id = proc->ProcessorId; + lapic_create(proc->LocalApicId, 0); break; } } @@ -545,14 +543,17 @@ static int madt_find_cpu(u_int acpi_id, u_int *apic_id) { + int i; - if (!lapics[acpi_id].la_present) - return (ENOENT); - *apic_id = lapics[acpi_id].la_apic_id; - if (lapics[acpi_id].la_enabled) + for (i = 0; i < NLAPICS; i++) { + if (!lapics[i].la_enabled) + continue; + if (lapics[i].la_acpi_id != acpi_id) + continue; + *apic_id = i; return (0); - else - return (ENXIO); + } + return (ENOENT); } /* @@ -752,8 +753,9 @@ static void madt_set_ids(void *dummy) { + struct lapic_info *la; struct pcpu *pc; - u_int i, j; + u_int i; if (madt == NULL) return; @@ -762,19 +764,14 @@ continue; pc = pcpu_find(i); KASSERT(pc != NULL, ("no pcpu data for CPU %d", i)); - for (j = 0; j < NLAPICS + 1; j++) { - if (!lapics[j].la_present || !lapics[j].la_enabled) - continue; - if (lapics[j].la_apic_id == pc->pc_apic_id) { - pc->pc_acpi_id = j; - if (bootverbose) - printf("APIC: CPU %u has ACPI ID %u\n", - i, j); - break; - } - } - if (j == NLAPICS + 1) - panic("Unable to find ACPI ID for CPU %d", i); + la = &lapics[pc->pc_apic_id]; + if (!la->la_enabled) + panic("APIC: CPU with APIC ID %u is not enabled", + pc->pc_apic_id); + pc->pc_acpi_id = la->la_acpi_id; + if (bootverbose) + printf("APIC: CPU %u has ACPI ID %u\n", i, + la->la_acpi_id); } } SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL) ==== //depot/projects/nsched/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.149 2004/04/05 21:25:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.153 2004/06/08 01:35:48 peter Exp $"); #include #include @@ -73,6 +73,7 @@ #define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) +#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : : "m" (r)) #define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") @@ -111,6 +112,7 @@ fpuinit(void) { register_t savecrit; + u_int mxcsr; u_short control; savecrit = intr_disable(); @@ -119,6 +121,8 @@ fninit(); control = __INITIAL_FPUCW__; fldcw(&control); + mxcsr = __INITIAL_MXCSR__; + ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); start_emulating(); fpu_cleanstate_ready = 1; ==== //depot/projects/nsched/sys/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.131 2004/04/07 00:44:15 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.134 2004/06/08 01:20:37 peter Exp $"); #include "opt_cpu.h" @@ -69,13 +69,10 @@ void earlysetcpuclass(void); void panicifcpuunsupported(void); -static void print_AMD_features(void); static void print_AMD_info(void); static void print_AMD_assoc(int i); -int cpu_feature2; /* XXX change cpu_feature to long? */ int cpu_class; -u_int cpu_exthigh; /* Highest arg to extended CPUID */ char machine[] = "amd64"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); @@ -90,7 +87,10 @@ static char cpu_brand[48]; -static struct cpu_nameclass amd64_cpus[] = { +static struct { + char *cpu_name; + int cpu_class; +} amd64_cpus[] = { { "Clawhammer", CPUCLASS_K8 }, /* CPU_CLAWHAMMER */ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; @@ -106,26 +106,18 @@ strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model)); /* Check for extended CPUID information and a processor name. */ - if (cpu_high > 0 && - (strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0)) { - do_cpuid(0x80000000, regs); - if (regs[0] >= 0x80000000) { - cpu_exthigh = regs[0]; - if (cpu_exthigh >= 0x80000004) { - brand = cpu_brand; - for (i = 0x80000002; i < 0x80000005; i++) { - do_cpuid(i, regs); - memcpy(brand, regs, sizeof(regs)); - brand += sizeof(regs); - } - } + if (cpu_exthigh >= 0x80000004) { + brand = cpu_brand; + for (i = 0x80000002; i < 0x80000005; i++) { + do_cpuid(i, regs); + memcpy(brand, regs, sizeof(regs)); + brand += sizeof(regs); } } if (strcmp(cpu_vendor, "GenuineIntel") == 0) { - /* Better late than never I suppose.. */ - strcat(cpu_model, "IA-32e"); + /* Please make up your mind folks! */ + strcat(cpu_model, "EM64T"); } else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { /* * Values taken from AMD Processor Recognition @@ -256,6 +248,43 @@ "\040" ); } + if (amd_feature != 0) { + printf("\n AMD Features=0x%b", amd_feature, + "\020" /* in hex */ + "\001" /* Same */ + "\002" /* Same */ + "\003" /* Same */ + "\004" /* Same */ + "\005" /* Same */ + "\006" /* Same */ + "\007" /* Same */ + "\010" /* Same */ + "\011" /* Same */ + "\012" /* Same */ + "\013" /* Undefined */ + "\014SYSCALL" /* Have SYSCALL/SYSRET */ + "\015" /* Same */ + "\016" /* Same */ + "\017" /* Same */ + "\020" /* Same */ + "\021" /* Same */ + "\022" /* Same */ + "\023" /* Reserved, unknown */ + "\024MP" /* Multiprocessor Capable */ + "\025NX" /* Has EFER.NXE, NX */ + "\026" /* Undefined */ + "\027MMX+" /* AMD MMX Extensions */ + "\030" /* Same */ + "\031" /* Same */ + "\032" /* Undefined */ + "\033" /* Undefined */ + "\034" /* Undefined */ + "\035" /* Undefined */ + "\036LM" /* 64 bit long mode */ + "\0373DNow+" /* AMD 3DNow! Extensions */ + "\0403DNow" /* AMD 3DNow! */ + ); + } /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 10 23:25:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7EF116A4D1; Thu, 10 Jun 2004 23:25:36 +0000 (GMT) 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 C1E2616A4CE for ; Thu, 10 Jun 2004 23:25:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3E4243D1D for ; Thu, 10 Jun 2004 23:25:36 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5ANO2oq029401 for ; Thu, 10 Jun 2004 23:24:02 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5ANO26Y029398 for perforce@freebsd.org; Thu, 10 Jun 2004 23:24:02 GMT (envelope-from julian@freebsd.org) Date: Thu, 10 Jun 2004 23:24:02 GMT Message-Id: <200406102324.i5ANO26Y029398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 54592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2004 23:25:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=54592 Change 54592 by julian@julian_ref on 2004/06/10 23:23:08 TDF_SA -> TDP_SA IFC Affected files ... .. //depot/projects/nsched/sys/kern/kern_kse.c#9 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_kse.c#9 (text+ko) ==== @@ -351,7 +351,7 @@ return (error); TIMESPEC_TO_TIMEVAL(&tv, &timeout); } - if (td->td_flags & TDF_SA) + if (td->td_pflags & TDP_SA) td->td_pflags |= TDP_UPCALLING; else { ku->ku_mflags = fuword(&ku->ku_mailbox->km_flags); @@ -485,7 +485,7 @@ if (virtual_cpu != 0) ncpus = virtual_cpu; if (!(mbx.km_flags & KMF_BOUND)) - sa = TDF_SA; + sa = TDP_SA; else ncpus = 1; PROC_LOCK(p); @@ -524,7 +524,7 @@ mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); } else { - if (!first && ((td->td_flags & TDF_SA) ^ sa) != 0) + if (!first && ((td->td_pflags & TDP_SA) ^ sa) != 0) return (EINVAL); newkg = kg; } @@ -612,14 +612,14 @@ } if (!sa) { newtd->td_mailbox = mbx.km_curthread; - newtd->td_flags &= ~TDF_SA; + newtd->td_pflags &= ~TDP_SA; if (newtd != td) { mtx_unlock_spin(&sched_lock); cpu_set_upcall_kse(newtd, newku); mtx_lock_spin(&sched_lock); } } else { - newtd->td_flags |= TDF_SA; + newtd->td_pflags |= TDP_SA; } if (newtd != td) setrunqueue(newtd); @@ -805,7 +805,7 @@ struct thread *td = curthread; struct ksegrp *kg = td->td_ksegrp; - if (kg->kg_numupcalls == 0 || !(td->td_flags & TDF_SA)) + if (kg->kg_numupcalls == 0 || !(td->td_pflags & TDP_SA)) return (0); if (user) { /* Current always do via ast() */ @@ -931,8 +931,8 @@ /* Let the new thread become owner of the upcall */ ku->ku_owner = td2; td2->td_upcall = ku; - td2->td_flags = TDF_SA; - td2->td_pflags = TDP_UPCALLING; + td2->td_flags = 0; + td2->td_pflags = (TDP_SA | TDP_UPCALLING); td2->td_state = TDS_CAN_RUN; td2->td_inhibitors = 0; SIGFILLSET(td2->td_sigmask); @@ -1038,7 +1038,7 @@ * but for now do it every time. */ kg = td->td_ksegrp; - if (td->td_flags & TDF_SA) { + if (td->td_pflags & TDP_SA) { ku = td->td_upcall; KASSERT(ku, ("%s: no upcall owned", __func__)); KASSERT((ku->ku_owner == td), ("%s: wrong owner", __func__)); @@ -1097,7 +1097,7 @@ ku = td->td_upcall; /* Nothing to do with bound thread */ - if (!(td->td_flags & TDF_SA)) + if (!(td->td_pflags & TDP_SA)) return (0); /* From owner-p4-projects@FreeBSD.ORG Fri Jun 11 00:12:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 380E116A4D1; Fri, 11 Jun 2004 00:12:57 +0000 (GMT) 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 109D316A4CE for ; Fri, 11 Jun 2004 00:12:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05F2143D1D for ; Fri, 11 Jun 2004 00:12:57 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5B0C6Nc040129 for ; Fri, 11 Jun 2004 00:12:06 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5B0C58i040098 for perforce@freebsd.org; Fri, 11 Jun 2004 00:12:05 GMT (envelope-from peter@freebsd.org) Date: Fri, 11 Jun 2004 00:12:05 GMT Message-Id: <200406110012.i5B0C58i040098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 54599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 00:12:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=54599 Change 54599 by peter@peter_daintree on 2004/06/11 00:11:37 IFC @54590 Affected files ... .. //depot/projects/hammer/contrib/cvs/BUGS#3 integrate .. //depot/projects/hammer/contrib/cvs/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/cvs/HACKING#3 integrate .. //depot/projects/hammer/contrib/cvs/INSTALL#5 integrate .. //depot/projects/hammer/contrib/cvs/Makefile.am#5 integrate .. //depot/projects/hammer/contrib/cvs/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/NEWS#5 integrate .. //depot/projects/hammer/contrib/cvs/acinclude.m4#5 integrate .. //depot/projects/hammer/contrib/cvs/aclocal.m4#5 integrate .. //depot/projects/hammer/contrib/cvs/config.h.in#5 integrate .. //depot/projects/hammer/contrib/cvs/configure#5 integrate .. //depot/projects/hammer/contrib/cvs/configure.in#5 integrate .. //depot/projects/hammer/contrib/cvs/diff/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/cvs/diff/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.1#1 branch .. //depot/projects/hammer/contrib/cvs/doc/cvs.man.footer#1 branch .. //depot/projects/hammer/contrib/cvs/doc/cvs.man.header#1 branch .. //depot/projects/hammer/contrib/cvs/doc/cvs.texinfo#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/mkman.in#1 branch .. //depot/projects/hammer/contrib/cvs/doc/stamp-1#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/stamp-vti#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/version-client.texi#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/version.texi#4 integrate .. //depot/projects/hammer/contrib/cvs/lib/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/lib/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/cvs/lib/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/lib/system.h#4 integrate .. //depot/projects/hammer/contrib/cvs/lib/xsize.h#1 branch .. //depot/projects/hammer/contrib/cvs/man/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/man/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/cvs/man/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/src/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/src/add.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/client.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/commit.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/cvs.h#5 integrate .. //depot/projects/hammer/contrib/cvs/src/filesubr.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/history.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/ignore.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/log.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/sanity.sh#5 integrate .. //depot/projects/hammer/contrib/cvs/src/server.c#8 integrate .. //depot/projects/hammer/contrib/cvs/src/subr.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/update.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/vers_ts.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/wrapper.c#5 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#7 edit .. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#6 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#15 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#1 branch .. //depot/projects/hammer/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/hammer/release/Makefile#48 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#26 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#23 integrate .. //depot/projects/hammer/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#89 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#28 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#19 integrate .. //depot/projects/hammer/sys/conf/NOTES#46 integrate .. //depot/projects/hammer/sys/conf/files#61 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#18 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#1 branch .. //depot/projects/hammer/sys/dev/esp/lsi64854.c#1 branch .. //depot/projects/hammer/sys/dev/esp/lsi64854reg.h#1 branch .. //depot/projects/hammer/sys/dev/esp/lsi64854var.h#1 branch .. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#1 branch .. //depot/projects/hammer/sys/dev/esp/ncr53c9xreg.h#1 branch .. //depot/projects/hammer/sys/dev/esp/ncr53c9xvar.h#1 branch .. //depot/projects/hammer/sys/dev/fb/vga.c#16 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#14 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#12 integrate .. //depot/projects/hammer/sys/dev/kbd/atkbd.c#9 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#10 integrate .. //depot/projects/hammer/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/hammer/sys/dev/pcf/pcf_ebus.c#1 branch .. //depot/projects/hammer/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#5 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#15 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#12 integrate .. //depot/projects/hammer/sys/i386/bios/mca_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#7 integrate .. //depot/projects/hammer/sys/i386/bios/smbios.c#4 integrate .. //depot/projects/hammer/sys/i386/bios/vpd.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#33 integrate .. //depot/projects/hammer/sys/i386/i386/symbols.raw#2 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#12 integrate .. //depot/projects/hammer/sys/i386/include/pc/bios.h#4 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#6 integrate .. //depot/projects/hammer/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/hammer/sys/isa/syscons_isa.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/esp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/vx/Makefile#2 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#29 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#27 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#22 integrate Differences ... ==== //depot/projects/hammer/contrib/cvs/BUGS#3 (text+ko) ==== @@ -47,12 +47,6 @@ are never a problem, whether or not LockDir is in use. -* "make remotecheck" sometimes fails on test 187a3 with - cvs server: in directory .: - cvs [server aborted]: *PANIC* administration files missing -This does not happen every time. (-kingdon, Nov 96, Red Hat linux 3.0.3). - - * The -m option to "cvs add" does not work with client/server CVS. CVS will accept the option, but it won't actually set the file's description. @@ -84,121 +78,6 @@ P.S. Is anyone working on fixing these bugs? -* From: Roland McGrath - To: Cyclic CVS Hackers - Subject: weird bug - Date: Sat, 25 Mar 1995 16:41:41 -0500 - X-Windows: Even your dog won't like it. - - I just noticed some droppings on my disk from what must be a pretty weird - bug in remote CVS. - - In my home directory on a repository machine I use, I find: - - drwxr-xr-x 4 roland staff 512 Mar 7 14:08 cvs-serv28962 - drwxr-xr-x 4 roland staff 512 Mar 7 14:11 cvs-serv28978 - drwxr-xr-x 4 roland staff 512 Mar 7 15:13 cvs-serv29141 - - OK, so these are leftover cruft from some cvs run that got aborted. - Well, it should clean up after itself, but so what. - - The last one is pretty dull; the real weirdness is the contents of the - first two directories. - - duality 77 # ls -RF cvs-serv28978/ - CVS/ cvs-serv28978/ - - cvs-serv28978/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978: - arpa/ - - cvs-serv28978/cvs-serv28978/arpa: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978: - assert/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978: - bare/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978: - conf/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978: - crypt/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978: - csu/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978: - ctype/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype: - CVS/ cvs-serv28978/ - - [...] - - ls: cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype/cvs-serv28978/dirent/cvs-serv28978/elf/cvs-serv28978/gnu/cvs-serv28978/gnulib/cvs-serv28978/grp/cvs-serv28978/hurd/cvs-serv28978/hurd/hurd/cvs-serv28978/inet/cvs-serv28978/inet/arpa/cvs-serv28978/inet/netinet[...]/cvs-serv28978/posix/cvs-serv28978/posix/glob/cvs-serv28978/posix/gnu/cvs-serv28978/posix/sys/cvs-serv28978/protocols/cvs-serv28978/pwd/cvs-serv28978/resolv/cvs-serv28978/resolv/arpa/cvs-serv28978/resolv/sys/cvs-serv28978/resource/cvs-serv28978/resource/sys/cvs-serv28978/rpc/cvs-serv28978/setjmp/cvs-serv28978/signal/cvs-serv28978/signal/sys/cvs-serv28978/socket/cvs-serv28978/socket: File name too long - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype/cvs-serv28978/dirent/cvs-serv28978/elf/cvs-serv28978/gnu/cvs-serv28978/gnulib/cvs-serv28978/grp/cvs-serv28978/hurd/cvs-serv28978/hurd/hurd/cvs-serv28978/inet/cvs-serv28978/inet/arpa/cvs-serv28978/inet/netinet[...]/cvs-serv28978/posix/glob/cvs-serv28978/posix/gnu/cvs-serv28978/posix/sys/cvs-serv28978/protocols/cvs-serv28978/pwd/cvs-serv28978/resolv/cvs-serv28978/resolv/arpa/cvs-serv28978/resolv/sys/cvs-serv28978/resource/cvs-serv28978/resource/sys/cvs-serv28978/rpc/cvs-serv28978/setjmp/cvs-serv28978/signal/cvs-serv28978/signal/sys/cvs-serv28978/socket/cvs-serv28978: - -* From: Roland McGrath - To: Cyclic CVS Hackers - Subject: bizarre failure mode - Date: Tue, 7 Mar 95 14:17:28 -0500 - - This is pretty weird: - - CVS_SERVER='TMPDIR=. /usr/local/bin/cvs' ../cvs-build/src/cvs update -q - cvs [server aborted]: could not get working directory: Result too large - [Exit 1] - asylum 29 % grep 'Result too large' /usr/include/sys/errno.h - #define ERANGE 34 /* Result too large */ - - Now, getcwd fails with ERANGE when the buffer is too small. But I don't - know why that would be the case; I don't think there are exceptionally long - directory names involved. It would be robust to notice ERANGE and use a - bigger buffer. But I suspect something weirder is going on. - - The repository in question in duality.gnu.ai.mit.edu:/gd4/gnu/cvsroot/libc. - - Send me a PGP-signed message if you want the password to use the machine - where the problem showed up. - * CVS does not always seem to be waiting to the next filesystem timestamp quanta after commits. So far this has only shown up in testing under the BSDI OS. The symptoms are that ocassionally CVS will not notice that modified files @@ -208,18 +87,22 @@ an incorrect value, though this does not explain why symptoms have only been noticed under BSDI. + * Spaces in arguments to `cvs diff' are currently split on spaces and tabs before being passed to diff. This can often cause diff to abort since it can no longer interpret its options string and if it can, coincidentally, interpret its option string, then the problem may be output in unexpected formats. + * `release' of a project subdir does not remove the `subdir' entry from `./CVS/Entries'. -* The Windows Microsoft Visual C++ project files are out of date, but the - project can still be built under Windows using `nmake'. See the INSTALL - file for more. + +* Most of the remote commands are encountering assertion failures when listing + the toplevel of the repository (e.g. `cvs rlog .'). This appears to be + related to the symlinked CVS root fix. + * Status ==== //depot/projects/hammer/contrib/cvs/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,83 @@ +2004-06-09 Derek Price + + * NEWS: Note Stefan & Sebastian's security fixes. + * acinclude.m4 (gl_SIZE_MAX, gl_XSIZE): Import from GNULIB. + * configure.in: Call gl_XSIZE. + +2004-06-09 Derek Price + + * NEWS: Note CAN-2004-0414 fix. + +2004-05-19 Derek Price + + * NEWS: Note CAN-2004-0396 fix. + +2004-05-17 Derek Price + + * BUGS: Note assertion failure of r* commands. + +2004-05-17 Derek Price + + * BUGS: Remove out of date comment about out of date Windows build + files and several bug reports that are so old, without similar recent + reports, that I'm assuming that the problems have been fixed. + +2004-05-15 Derek Price + + * cvsnt.dsp: Header file list updated. + * cvsnt.dep: Regenerated for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + (Patch from Conrad Pino .) + +2004-05-13 Derek Price + + * NEWS: Note MSVC++ project file regeneration. + +2004-05-13 Derek Price + + * cvsnt.dsw: Rename "zlib/zlib.*" to "zlib/libz.*". + Add project "lib/libcvs". + * cvsnt.dsp: Revised for "cvsnt.dsw" changes. Move "lib/*.c" to + project "lib/libcvs". Upgraded to Visual C++ 6.0 format. + * cvsnt.dep: Added for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + (Patch from Conrad Pino .) + + * configure.in: Generate windows-NT/fix-msvc-mak. + +2004-04-30 Derek Price + + * NEWS: Note that man page is generated from cvs.texinfo now. + * configure.in: Build doc/mkman. + * configure, Makefile.in: Regenerated. + +2004-04-26 Derek Price + + * NEWS: Note that :ext: no longer relies on an external transport with + a GNU argument processor. + +2004-04-20 Derek Price + + * NEWS: Note XP directory deletion fix. + +2004-04-16 Derek Price + + * NEWS: Correct CVS name for piped checkout issue now that we have one. + +2004-04-15 Derek Price + + * NEWS: Retroactively add CVE issue name for the piped etc issue. + +2004-04-15 Derek Price + + * NEWS: Retroactively add CVE issue name for the trojan server issue. + +2004-04-14 Derek Price + + * INSTALL (Building from source code under Unix): Move Autoconf & + Automake notes... + * HACKING (Regenerating Build Files): ...here. + 2004-04-13 Derek Price * NEWS: Note validation of paths passed to the client. ==== //depot/projects/hammer/contrib/cvs/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.10 2002/09/02 05:58:30 peter Exp $ +$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $ MAINTAINER= peter@FreeBSD.org @@ -7,39 +7,19 @@ versions or official-patch versions must be imported. To prepare a new cvs dist for import, extract it into a fresh directory; +then delete the files and directories listed in FREEBSD-Xlist. -The following generated files were deleted: -doc/*.ps -doc/*.info* -doc/texinfo.tex -lib/getdate.c -cvsnt.* -cvs.spec* -build.com -*/*.com -*/*.dsp -*/.cvsignore -.cvsignore -README.VMS - -The following non-freebsd-specific directories were deleted: -os2 -emx -windows-NT -vms -zlib - -It is imported from it's top level directory something like this: +CVS is imported from its top level directory something like this: cvs -n import src/contrib/cvs CVSHOME v -The -n option is "dont do anything" so you can see what is about to happen +The -n option is "don't do anything" so you can see what is about to happen first. Remove it when it looks ok. The initial import was done with: cvs import src/contrib/cvs CVSHOME v1_8_1 When new versions are imported, cvs will give instructions on how to merge -the local and vendor changes when/if conflicts arise.. +the local and vendor changes when/if conflicts arise. The developers can be reached at: . Local changes that are suitable for public consumption should be submitted for inclusion ==== //depot/projects/hammer/contrib/cvs/HACKING#3 (text+ko) ==== @@ -104,6 +104,25 @@ (the latter causes Visual C++ 2.1 to create makefiles which Visual C++ 4.0 cannot use). +* Regenerating Build Files + +On UNIX, if you wish to change the Build files, you will need Autoconf and +Automake. + +Some combinations of Automake and Autoconf versions may break the +CVS build if file timestamps aren't set correctly and people don't +have the same versions the developers do, so the rules to run them +automatically aren't included in the generated Makefiles unless you run +configure with the --enable-maintainer-mode option. + +The CVS Makefiles and configure script were built using Automake 1.7.9 and +Autoconf 2.58, respectively. + +There is a known bug in Autoconf 2.57 that will prevent the configure +scripts it generates from working on some platforms. Other combinations of +autotool versions may or may not work. If you get other versions to work, +please send a report to . + * Writing patches (strategy) Only some kinds of changes are suitable for inclusion in the ==== //depot/projects/hammer/contrib/cvs/INSTALL#5 (text+ko) ==== @@ -257,21 +257,7 @@ Building from source code under Unix: -1) Some combinations of Automake and Autoconf versions may break the - CVS build if file timestamps aren't set correctly and people don't - have the same versions the developers do, so the rules to run them - automatically aren't included in the generated Makefiles unless you run - configure with --enable-maintainer-mode. - - The CVS Makefiles and configure script were built using Automake 1.7.9 and - Autoconf 2.58, respectively. - - There is a known bug in Autoconf 2.57 that will prevent the configure - scripts it generates from working on some platforms. Other combinations of - autotool versions may or may not work. If you get other versions to work, - please send a report to . - -2) Run "configure": +1) Run "configure": $ ./configure @@ -385,7 +371,7 @@ END OF NOTE FOR NDBM GUNK. -3) Try to build it: +2) Try to build it: $ make @@ -396,7 +382,7 @@ compiler information, make output, and anything else you think will be helpful. -3a) Run the regression tests (optional). +3) Run the regression tests (optional). You may also wish to validate the correctness of the new binary by running the regression tests. If they succeed, that is nice to ==== //depot/projects/hammer/contrib/cvs/Makefile.am#5 (text+ko) ==== @@ -35,6 +35,7 @@ TESTS \ build.com \ cvs-format.el \ + cvsnt.dep \ cvsnt.dsp \ cvsnt.dsw \ cvsnt.mak \ ==== //depot/projects/hammer/contrib/cvs/Makefile.in#5 (text+ko) ==== @@ -161,6 +161,7 @@ TESTS \ build.com \ cvs-format.el \ + cvsnt.dep \ cvsnt.dsp \ cvsnt.dsw \ cvsnt.mak \ @@ -372,7 +373,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/zlib + $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ ==== //depot/projects/hammer/contrib/cvs/NEWS#5 (text+ko) ==== @@ -1,18 +1,62 @@ -Changes since 1.11.14: +Changes since 1.11.16: ********************** +SERVER SECURITY FIXES + +* Thanks to Stefan Esser & Sebastian Krahmer, several potential security + problems have been fixed. The ones which were considered dangerous enough + to catalogue were assigned issue numbers CAN-2004-0416, CAN-2004-0417, & + CAN-2004-0418 by the Common Vulnerabilities and Exposures Project. Please + see for more information. + +* A potential buffer overflow vulnerability in the server has been fixed. + This addresses the Common Vulnerabilities and Exposures Project's issue + #CAN-2004-0414. Please see for more information. + +Changes from 1.11.15 to 1.11.16: +******************************** + +SERVER SECURITY FIXES + +* A potential buffer overflow vulnerability in the server has been fixed. + Prior to this patch, a malicious client could potentially use carefully + crafted server requests to run arbitrary programs on the CVS server machine. + This addresses the Common Vulnerabilities and Exposures Project's issue + #CAN-2004-0396. Please see for more information. + +BUG FIXES + +* The Microsoft Visual C++ workspace and project files have been repaired and + regenerated with MSVC++ 6.0. + +* The cvs.1 man page is now generated automatically from a section of the CVS + Manual. + +* Thanks to a report from Mark Andrews at the Internet Systems Consortium, the + :ext: connection method no longer relies on a transparent transport that uses + an argument processor that can handle arbitrary ordering of options and other + arguments when using a username other than the caller's. + +* Thanks to Ken Raeburn at MIT, directory deletion, whether via `cvs release' + or empty directory pruning, now works on network shares under Windows XP. + +Changes from 1.11.14 to 1.11.15: +******************************** + SERVER SECURITY ISSUES * Piped checkouts of paths above $CVSROOT no longer work. Previously, clients could have requested the contents of RCS archive files anywhere on a CVS - server. + server. This addresses CVE issue CAN-2004-0405. Please see + for more information. CLIENT SECURITY ISSUES * Clients now check paths from the server to verify that they are within one of the sandboxes the user requested be updated. Previously, a trojan server could have written or overwritten files anywhere the user had access, - presenting a serious security risk. + presenting a serious security risk. This addresses CVE issue CAN-2004-1080. + Please see for more information. GENERAL USER ISSUES ==== //depot/projects/hammer/contrib/cvs/acinclude.m4#5 (text+ko) ==== @@ -267,3 +267,85 @@ AC_SEARCH_LIBS([gss_import_name], [gssapi_krb5 gssapi]) fi ])dnl + + + +# size_max.m4 serial 2 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([gl_SIZE_MAX], +[ + AC_CHECK_HEADERS(stdint.h) + dnl First test whether the system already has SIZE_MAX. + AC_MSG_CHECKING([for SIZE_MAX]) + result= + AC_EGREP_CPP([Found it], [ +#include +#if HAVE_STDINT_H +#include +#endif +#ifdef SIZE_MAX +Found it +#endif +], result=yes) + if test -z "$result"; then + dnl Define it ourselves. Here we assume that the type 'size_t' is not wider + dnl than the type 'unsigned long'. + dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', + dnl which is guaranteed to work from LONG_MIN to LONG_MAX. + _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, + [#include ], result=?) + _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, + [#include ], result=?) + _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, + [#include ], result=?) + if test "$fits_in_uint" = 1; then + dnl Even though SIZE_MAX fits in an unsigned int, it must be of type + dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. + AC_TRY_COMPILE([#include + extern size_t foo; + extern unsigned long foo; + ], [], fits_in_uint=0) + fi + if test -z "$result"; then + if test "$fits_in_uint" = 1; then + result="$res_hi$res_lo"U + else + result="$res_hi$res_lo"UL + fi + else + dnl Shouldn't happen, but who knows... + result='~(size_t)0' + fi + fi + AC_MSG_RESULT([$result]) + if test "$result" != yes; then + AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], + [Define as the maximum value of type 'size_t', if the system doesn't define it.]) + fi +]) + + + +# xsize.m4 serial 3 +dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_XSIZE], +[ + dnl Prerequisites of lib/xsize.h. + AC_REQUIRE([gl_SIZE_MAX]) + AC_REQUIRE([AC_C_INLINE]) + AC_CHECK_HEADERS(stdint.h) +]) ==== //depot/projects/hammer/contrib/cvs/aclocal.m4#5 (text+ko) ==== @@ -281,6 +281,88 @@ fi ])dnl + + +# size_max.m4 serial 2 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([gl_SIZE_MAX], +[ + AC_CHECK_HEADERS(stdint.h) + dnl First test whether the system already has SIZE_MAX. + AC_MSG_CHECKING([for SIZE_MAX]) + result= + AC_EGREP_CPP([Found it], [ +#include +#if HAVE_STDINT_H +#include +#endif +#ifdef SIZE_MAX +Found it +#endif +], result=yes) + if test -z "$result"; then + dnl Define it ourselves. Here we assume that the type 'size_t' is not wider + dnl than the type 'unsigned long'. + dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', + dnl which is guaranteed to work from LONG_MIN to LONG_MAX. + _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, + [#include ], result=?) + _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, + [#include ], result=?) + _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, + [#include ], result=?) + if test "$fits_in_uint" = 1; then + dnl Even though SIZE_MAX fits in an unsigned int, it must be of type + dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. + AC_TRY_COMPILE([#include + extern size_t foo; + extern unsigned long foo; + ], [], fits_in_uint=0) + fi + if test -z "$result"; then + if test "$fits_in_uint" = 1; then + result="$res_hi$res_lo"U + else + result="$res_hi$res_lo"UL + fi + else + dnl Shouldn't happen, but who knows... + result='~(size_t)0' + fi + fi + AC_MSG_RESULT([$result]) + if test "$result" != yes; then + AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], + [Define as the maximum value of type 'size_t', if the system doesn't define it.]) + fi +]) + + + +# xsize.m4 serial 3 +dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_XSIZE], +[ + dnl Prerequisites of lib/xsize.h. + AC_REQUIRE([gl_SIZE_MAX]) + AC_REQUIRE([AC_C_INLINE]) + AC_CHECK_HEADERS(stdint.h) +]) + # Do all the work for Automake. -*- Autoconf -*- # This macro actually does too much some checks are only needed if ==== //depot/projects/hammer/contrib/cvs/config.h.in#5 (text+ko) ==== @@ -425,6 +425,10 @@ */ #undef SERVER_SUPPORT +/* Define as the maximum value of type 'size_t', if the system doesn't define + it. */ +#undef SIZE_MAX + /* Define to 1 if the `S_IS*' macros in do not work properly. */ #undef STAT_MACROS_BROKEN @@ -486,6 +490,12 @@ /* Define to `int' if doesn't define. */ #undef gid_t +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + /* Define to `int' if does not define. */ #undef mode_t ==== //depot/projects/hammer/contrib/cvs/configure#5 (text+ko) ==== @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.58 for Concurrent Versions System (CVS) 1.11.15. +# Generated by GNU Autoconf 2.58 for Concurrent Versions System (CVS) 1.11.17. # # Report bugs to . # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='Concurrent Versions System (CVS)' PACKAGE_TARNAME='cvs' -PACKAGE_VERSION='1.11.15' -PACKAGE_STRING='Concurrent Versions System (CVS) 1.11.15' +PACKAGE_VERSION='1.11.17' +PACKAGE_STRING='Concurrent Versions System (CVS) 1.11.17' PACKAGE_BUGREPORT='bug-cvs@gnu.org' ac_unique_file="src/cvs.h" @@ -784,7 +784,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Concurrent Versions System (CVS) 1.11.15 to adapt to many kinds of systems. +\`configure' configures Concurrent Versions System (CVS) 1.11.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -846,7 +846,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Concurrent Versions System (CVS) 1.11.15:";; + short | recursive ) echo "Configuration of Concurrent Versions System (CVS) 1.11.17:";; esac cat <<\_ACEOF @@ -1031,7 +1031,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Concurrent Versions System (CVS) configure 1.11.15 +Concurrent Versions System (CVS) configure 1.11.17 generated by GNU Autoconf 2.58 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1045,7 +1045,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Concurrent Versions System (CVS) $as_me 1.11.15, which was +It was created by Concurrent Versions System (CVS) $as_me 1.11.17, which was generated by GNU Autoconf 2.58. Invocation command line was $ $0 $@ @@ -1657,7 +1657,7 @@ # Define the identity of the package. PACKAGE='cvs' - VERSION='1.11.15' + VERSION='1.11.17' # Some tools Automake needs. @@ -6102,84 +6102,774 @@ -cat >>confdefs.h <<\_ACEOF -#define getpass cvs_getpass +for ac_header in stdint.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> _ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------ ## +## Report this to bug-cvs@gnu.org ## +## ------------------------------ ## +_ASBOX + ) | >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 11 00:21:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4574616A4D1; Fri, 11 Jun 2004 00:21:22 +0000 (GMT) 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 1EFEA16A4CE for ; Fri, 11 Jun 2004 00:21:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0062143D53 for ; Fri, 11 Jun 2004 00:21:22 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5B0LIk3041465 for ; Fri, 11 Jun 2004 00:21:18 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5B0LIdd041398 for perforce@freebsd.org; Fri, 11 Jun 2004 00:21:18 GMT (envelope-from julian@freebsd.org) Date: Fri, 11 Jun 2004 00:21:18 GMT Message-Id: <200406110021.i5B0LIdd041398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 54600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 00:21:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=54600 Change 54600 by julian@julian_ref on 2004/06/11 00:21:14 Merging in from -current Affected files ... .. //depot/projects/nsched/sys/kern/kern_kse.c#10 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_kse.c#10 (text+ko) ==== @@ -27,38 +27,23 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.175 2004/04/03 15:59:12 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.180 2004/06/07 07:26:53 julian Exp $"); #include #include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include -#include -#include -#include #include #include -#include - -#include -#include -#include -#include #include -#include - -#include /* * KSEGRP related storage. @@ -74,7 +59,6 @@ extern struct mtx kse_zombie_lock; - #define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) TAILQ_HEAD(, kse_upcall) zombie_upcalls = @@ -83,7 +67,48 @@ static int thread_update_usr_ticks(struct thread *td, int user); static void thread_alloc_spare(struct thread *td, struct thread *spare); +#if 0 +/* move to proc.h */ +extern void kse_purge(struct proc *p, struct thread *td); +extern void kse_purge_group(struct thread *td); +void kseinit(void); +void kse_GC(void); + +static int virtual_cpu; +SYSCTL_DECL(_kern_threads); +static int +sysctl_kse_virtual_cpu(SYSCTL_HANDLER_ARGS) +{ + int error, new_val; + int def_val; + +#ifdef SMP + def_val = mp_ncpus; +#else + def_val = 1; +#endif + if (virtual_cpu == 0) + new_val = def_val; + else + new_val = virtual_cpu; + error = sysctl_handle_int(oidp, &new_val, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (new_val < 0) + return (EINVAL); + virtual_cpu = new_val; + return (0); +} + +/* DEBUG ONLY */ +SYSCTL_PROC(_kern_threads, OID_AUTO, virtual_cpu, CTLTYPE_INT|CTLFLAG_RW, + 0, sizeof(virtual_cpu), sysctl_kse_virtual_cpu, "I", + "debug virtual cpus"); + + +#endif + struct kse_upcall * upcall_alloc(void) { @@ -873,7 +898,6 @@ return (0); } - /* * This function is intended to be used to initialize a spare thread * for upcall. Initialize thread's large data area outside sched_lock @@ -1272,3 +1296,14 @@ return (error); /* go sync */ } +#if 0 +int +thread_upcall_check(struct thread *td) +{ + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + if (td->td_kflags & TDK_WAKEUP) + return (1); + else + return (0); +} +#endif From owner-p4-projects@FreeBSD.ORG Fri Jun 11 01:05:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3446F16A4D1; Fri, 11 Jun 2004 01:05:13 +0000 (GMT) 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 E75E816A4CE for ; Fri, 11 Jun 2004 01:05:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E006E43D1D for ; Fri, 11 Jun 2004 01:05:12 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5B15Cj7057798 for ; Fri, 11 Jun 2004 01:05:12 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5B15CDG057795 for perforce@freebsd.org; Fri, 11 Jun 2004 01:05:12 GMT (envelope-from julian@freebsd.org) Date: Fri, 11 Jun 2004 01:05:12 GMT Message-Id: <200406110105.i5B15CDG057795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 54602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 01:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=54602 Change 54602 by julian@julian_ref on 2004/06/11 01:04:35 compile Affected files ... .. //depot/projects/nsched/sys/kern/kern_kse.c#11 edit .. //depot/projects/nsched/sys/kern/kern_thread.c#20 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_kse.c#11 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -53,6 +52,7 @@ /* DEBUG ONLY */ extern int virtual_cpu; extern int thread_debug; + extern int max_threads_per_proc; extern int max_groups_per_proc; extern int max_threads_hits; @@ -67,48 +67,6 @@ static int thread_update_usr_ticks(struct thread *td, int user); static void thread_alloc_spare(struct thread *td, struct thread *spare); -#if 0 -/* move to proc.h */ -extern void kse_purge(struct proc *p, struct thread *td); -extern void kse_purge_group(struct thread *td); -void kseinit(void); -void kse_GC(void); - -static int virtual_cpu; -SYSCTL_DECL(_kern_threads); - -static int -sysctl_kse_virtual_cpu(SYSCTL_HANDLER_ARGS) -{ - int error, new_val; - int def_val; - -#ifdef SMP - def_val = mp_ncpus; -#else - def_val = 1; -#endif - if (virtual_cpu == 0) - new_val = def_val; - else - new_val = virtual_cpu; - error = sysctl_handle_int(oidp, &new_val, 0, req); - if (error != 0 || req->newptr == NULL) - return (error); - if (new_val < 0) - return (EINVAL); - virtual_cpu = new_val; - return (0); -} - -/* DEBUG ONLY */ -SYSCTL_PROC(_kern_threads, OID_AUTO, virtual_cpu, CTLTYPE_INT|CTLFLAG_RW, - 0, sizeof(virtual_cpu), sysctl_kse_virtual_cpu, "I", - "debug virtual cpus"); - - -#endif - struct kse_upcall * upcall_alloc(void) { @@ -1296,7 +1254,6 @@ return (error); /* go sync */ } -#if 0 int thread_upcall_check(struct thread *td) { @@ -1306,4 +1263,4 @@ else return (0); } -#endif + ==== //depot/projects/nsched/sys/kern/kern_thread.c#20 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -69,19 +70,43 @@ SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_hits, CTLFLAG_RD, &max_threads_hits, 0, ""); +int virtual_cpu; +#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) + TAILQ_HEAD(, thread) zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); TAILQ_HEAD(, ksegrp) zombie_ksegrps = TAILQ_HEAD_INITIALIZER(zombie_ksegrps); struct mtx kse_zombie_lock; MTX_SYSINIT(kse_zombie_lock, &kse_zombie_lock, "kse zombie lock", MTX_SPIN); -void kse_purge(struct proc *p, struct thread *td); -void kse_purge_group(struct thread *td); +static int +sysctl_kse_virtual_cpu(SYSCTL_HANDLER_ARGS) +{ + int error, new_val; + int def_val; -/* move to proc.h */ -extern void kseinit(void); -extern void kse_GC(void); +#ifdef SMP + def_val = mp_ncpus; +#else + def_val = 1; +#endif + if (virtual_cpu == 0) + new_val = def_val; + else + new_val = virtual_cpu; + error = sysctl_handle_int(oidp, &new_val, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (new_val < 0) + return (EINVAL); + virtual_cpu = new_val; + return (0); +} +/* DEBUG ONLY */ +SYSCTL_PROC(_kern_threads, OID_AUTO, virtual_cpu, CTLTYPE_INT|CTLFLAG_RW, + 0, sizeof(virtual_cpu), sysctl_kse_virtual_cpu, "I", + "debug virtual cpus"); /* * Thread ID allocator. The allocator keeps track of assigned IDs by From owner-p4-projects@FreeBSD.ORG Fri Jun 11 04:56:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1084F16A4D1; Fri, 11 Jun 2004 04:56:56 +0000 (GMT) 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 D84C216A4CE; Fri, 11 Jun 2004 04:56:55 +0000 (GMT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6EE0C43D45; Fri, 11 Jun 2004 04:56:55 +0000 (GMT) (envelope-from hmp@freebsd.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.12.11/8.12.11) with ESMTP id i5B4tk3N052749; Fri, 11 Jun 2004 00:55:46 -0400 (EDT) (envelope-from hmp@freebsd.org) Received: from localhost (hmp@localhost)i5B4tkYl052746; Fri, 11 Jun 2004 00:55:46 -0400 (EDT) (envelope-from hmp@freebsd.org) X-Authentication-Warning: fledge.watson.org: hmp owned process doing -bs Date: Fri, 11 Jun 2004 00:55:46 -0400 (EDT) From: Hiten Pandya X-X-Sender: hmp@fledge.watson.org To: Julian Elischer In-Reply-To: <200406102316.i5ANGpBw027544@repoman.freebsd.org> Message-ID: <20040611005415.K52581@fledge.watson.org> References: <200406102316.i5ANGpBw027544@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 54591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 04:56:56 -0000 ROFL! :-) -Hiten On Thu, 10 Jun 2004, Julian Elischer wrote: :http://perforce.freebsd.org/chv.cgi?CH=54591 : :Change 54591 by julian@julian_ref on 2004/06/10 23:16:29 : : IFC and sir merge-alot : From owner-p4-projects@FreeBSD.ORG Fri Jun 11 05:12:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 845A716A4D1; Fri, 11 Jun 2004 05:12:41 +0000 (GMT) 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 5AD7516A4CE for ; Fri, 11 Jun 2004 05:12:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5335543D39 for ; Fri, 11 Jun 2004 05:12:41 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5B5CebK019294 for ; Fri, 11 Jun 2004 05:12:40 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5B5CYOK019290 for perforce@freebsd.org; Fri, 11 Jun 2004 05:12:34 GMT (envelope-from marcel@freebsd.org) Date: Fri, 11 Jun 2004 05:12:34 GMT Message-Id: <200406110512.i5B5CYOK019290@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 Subject: PERFORCE change 54619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 05:12:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=54619 Change 54619 by marcel@marcel_nfs on 2004/06/11 05:12:16 IFC @54617 Affected files ... .. //depot/projects/gdb/UPDATING#14 integrate .. //depot/projects/gdb/bin/ls/ls.c#4 integrate .. //depot/projects/gdb/bin/ls/print.c#8 integrate .. //depot/projects/gdb/bin/test/test.1#3 integrate .. //depot/projects/gdb/contrib/cvs/BUGS#3 integrate .. //depot/projects/gdb/contrib/cvs/ChangeLog#3 integrate .. //depot/projects/gdb/contrib/cvs/FREEBSD-Xlist#1 branch .. //depot/projects/gdb/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/cvs/HACKING#2 integrate .. //depot/projects/gdb/contrib/cvs/INSTALL#3 integrate .. //depot/projects/gdb/contrib/cvs/Makefile.am#3 integrate .. //depot/projects/gdb/contrib/cvs/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/cvs/NEWS#3 integrate .. //depot/projects/gdb/contrib/cvs/acinclude.m4#3 integrate .. //depot/projects/gdb/contrib/cvs/aclocal.m4#3 integrate .. //depot/projects/gdb/contrib/cvs/config.h.in#3 integrate .. //depot/projects/gdb/contrib/cvs/configure#3 integrate .. //depot/projects/gdb/contrib/cvs/configure.in#3 integrate .. //depot/projects/gdb/contrib/cvs/diff/ChangeLog#3 integrate .. //depot/projects/gdb/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/cvs/diff/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/cvs/doc/ChangeLog#3 integrate .. //depot/projects/gdb/contrib/cvs/doc/Makefile.am#3 integrate .. //depot/projects/gdb/contrib/cvs/doc/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/cvs/doc/cvs.1#1 branch .. //depot/projects/gdb/contrib/cvs/doc/cvs.man.footer#1 branch .. //depot/projects/gdb/contrib/cvs/doc/cvs.man.header#1 branch .. //depot/projects/gdb/contrib/cvs/doc/cvs.texinfo#3 integrate .. //depot/projects/gdb/contrib/cvs/doc/mkman.in#1 branch .. //depot/projects/gdb/contrib/cvs/doc/stamp-1#3 integrate .. //depot/projects/gdb/contrib/cvs/doc/stamp-vti#3 integrate .. //depot/projects/gdb/contrib/cvs/doc/version-client.texi#3 integrate .. //depot/projects/gdb/contrib/cvs/doc/version.texi#3 integrate .. //depot/projects/gdb/contrib/cvs/lib/ChangeLog#3 integrate .. //depot/projects/gdb/contrib/cvs/lib/Makefile.am#3 integrate .. //depot/projects/gdb/contrib/cvs/lib/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/cvs/lib/system.h#3 integrate .. //depot/projects/gdb/contrib/cvs/lib/xsize.h#1 branch .. //depot/projects/gdb/contrib/cvs/man/ChangeLog#3 integrate .. //depot/projects/gdb/contrib/cvs/man/Makefile.am#3 integrate .. //depot/projects/gdb/contrib/cvs/man/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/cvs/src/ChangeLog#3 integrate .. //depot/projects/gdb/contrib/cvs/src/add.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/client.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/commit.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/cvs.h#3 integrate .. //depot/projects/gdb/contrib/cvs/src/filesubr.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/history.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/ignore.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/log.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/sanity.sh#3 integrate .. //depot/projects/gdb/contrib/cvs/src/server.c#6 integrate .. //depot/projects/gdb/contrib/cvs/src/subr.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/update.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/vers_ts.c#3 integrate .. //depot/projects/gdb/contrib/cvs/src/wrapper.c#3 integrate .. //depot/projects/gdb/etc/bluetooth/hcsecd.conf#2 integrate .. //depot/projects/gdb/etc/csh.login#2 integrate .. //depot/projects/gdb/etc/defaults/pccard.conf#3 integrate .. //depot/projects/gdb/etc/devd.conf#4 integrate .. //depot/projects/gdb/etc/devfs.conf#2 integrate .. //depot/projects/gdb/etc/disktab#2 integrate .. //depot/projects/gdb/etc/gettytab#2 integrate .. //depot/projects/gdb/etc/hosts.allow#2 integrate .. //depot/projects/gdb/etc/inetd.conf#6 integrate .. //depot/projects/gdb/etc/isdn/isdnd.rates.D#2 integrate .. //depot/projects/gdb/etc/isdn/isdnd.rates.F#2 integrate .. //depot/projects/gdb/etc/isdn/isdnd.rates.L#2 integrate .. //depot/projects/gdb/etc/isdn/isdnd.rc.sample#2 integrate .. //depot/projects/gdb/etc/isdn/unknown_incoming#2 integrate .. //depot/projects/gdb/etc/login.access#2 integrate .. //depot/projects/gdb/etc/login.conf#2 integrate .. //depot/projects/gdb/etc/mail/Makefile#2 integrate .. //depot/projects/gdb/etc/namedb/named.conf#2 integrate .. //depot/projects/gdb/etc/namedb/named.root#3 integrate .. //depot/projects/gdb/etc/network.subr#2 integrate .. //depot/projects/gdb/etc/pam.d/README#2 integrate .. //depot/projects/gdb/etc/pam.d/convert.pl#2 integrate .. //depot/projects/gdb/etc/pccard_ether#4 integrate .. //depot/projects/gdb/etc/pf.os#2 integrate .. //depot/projects/gdb/etc/printcap#2 integrate .. //depot/projects/gdb/etc/profile#2 integrate .. //depot/projects/gdb/etc/rc#4 integrate .. //depot/projects/gdb/etc/rc.d/initdiskless#8 integrate .. //depot/projects/gdb/etc/rc.d/preseedrandom#2 integrate .. //depot/projects/gdb/etc/rc.shutdown#2 integrate .. //depot/projects/gdb/etc/rc.subr#5 integrate .. //depot/projects/gdb/etc/remote#3 integrate .. //depot/projects/gdb/etc/rpc#2 integrate .. //depot/projects/gdb/etc/termcap.small#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/gdb/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#1 branch .. //depot/projects/gdb/include/wchar.h#3 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#11 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#14 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#14 integrate .. //depot/projects/gdb/lib/libc/gen/fts.c#5 integrate .. //depot/projects/gdb/lib/libc/gen/signal.3#4 integrate .. //depot/projects/gdb/lib/libc/stdio/fvwrite.c#3 integrate .. //depot/projects/gdb/lib/libc/stdio/local.h#4 integrate .. //depot/projects/gdb/lib/libc/stdio/vfprintf.c#6 integrate .. //depot/projects/gdb/lib/libc/stdio/vfwprintf.c#6 integrate .. //depot/projects/gdb/lib/libc/stdio/wbuf.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/gdb/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/gdb/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/wait.2#2 integrate .. //depot/projects/gdb/lib/libkvm/kvm.c#2 integrate .. //depot/projects/gdb/lib/libpthread/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/gdb/lib/libvgl/main.c#2 integrate .. //depot/projects/gdb/lib/msun/Makefile#4 integrate .. //depot/projects/gdb/lib/msun/alpha/fenv.c#1 branch .. //depot/projects/gdb/lib/msun/alpha/fenv.h#1 branch .. //depot/projects/gdb/lib/msun/amd64/fenv.c#1 branch .. //depot/projects/gdb/lib/msun/amd64/fenv.h#1 branch .. //depot/projects/gdb/lib/msun/arm/fenv.c#1 branch .. //depot/projects/gdb/lib/msun/arm/fenv.h#1 branch .. //depot/projects/gdb/lib/msun/i387/fenv.c#1 branch .. //depot/projects/gdb/lib/msun/i387/fenv.h#1 branch .. //depot/projects/gdb/lib/msun/ia64/fenv.c#1 branch .. //depot/projects/gdb/lib/msun/ia64/fenv.h#1 branch .. //depot/projects/gdb/lib/msun/man/feclearexcept.3#1 branch .. //depot/projects/gdb/lib/msun/man/fegetenv.3#1 branch .. //depot/projects/gdb/lib/msun/man/fegetround.3#1 branch .. //depot/projects/gdb/lib/msun/man/fenv.3#1 branch .. //depot/projects/gdb/lib/msun/man/round.3#1 branch .. //depot/projects/gdb/lib/msun/powerpc/fenv.c#1 branch .. //depot/projects/gdb/lib/msun/powerpc/fenv.h#1 branch .. //depot/projects/gdb/lib/msun/sparc64/fenv.c#1 branch .. //depot/projects/gdb/lib/msun/sparc64/fenv.h#1 branch .. //depot/projects/gdb/lib/msun/src/math.h#5 integrate .. //depot/projects/gdb/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/gdb/lib/msun/src/s_round.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_roundf.c#1 branch .. //depot/projects/gdb/release/Makefile#6 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/gdb/share/examples/kld/cdev/module/cdev.c#2 integrate .. //depot/projects/gdb/share/man/man3/fpgetround.3#3 integrate .. //depot/projects/gdb/share/man/man4/acpi.4#6 integrate .. //depot/projects/gdb/share/man/man4/bge.4#3 integrate .. //depot/projects/gdb/share/man/man7/tuning.7#2 integrate .. //depot/projects/gdb/share/man/man9/Makefile#9 integrate .. //depot/projects/gdb/share/man/man9/ifnet.9#3 integrate .. //depot/projects/gdb/share/termcap/termcap.src#6 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/gdb/sys/alpha/alpha/support.s#3 integrate .. //depot/projects/gdb/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/gdb/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/gdb/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/gdb/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/gdb/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/mpboot.S#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/gdb/sys/amd64/include/asm.h#3 integrate .. //depot/projects/gdb/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/gdb/sys/amd64/include/param.h#2 integrate .. //depot/projects/gdb/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/gdb/sys/amd64/include/profile.h#5 integrate .. //depot/projects/gdb/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/gdb/sys/arm/arm/exception.S#2 integrate .. //depot/projects/gdb/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/gdb/sys/arm/arm/locore.S#2 integrate .. //depot/projects/gdb/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/gdb/sys/compat/ndis/kern_ndis.c#15 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#13 integrate .. //depot/projects/gdb/sys/conf/NOTES#22 integrate .. //depot/projects/gdb/sys/conf/files#27 integrate .. //depot/projects/gdb/sys/conf/files.sparc64#6 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#7 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#19 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#10 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_powerres.c#6 integrate .. //depot/projects/gdb/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/gdb/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/gdb/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/gdb/sys/dev/ciss/cissreg.h#7 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/gdb/sys/dev/drm/drm.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/drm_drv.h#4 integrate .. //depot/projects/gdb/sys/dev/drm/drm_linux_list.h#1 branch .. //depot/projects/gdb/sys/dev/drm/drm_os_freebsd.h#3 integrate .. //depot/projects/gdb/sys/dev/drm/drm_pciids.h#1 branch .. //depot/projects/gdb/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/mga.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/r128.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/gdb/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/gdb/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/gdb/sys/dev/drm/sis.h#2 integrate .. //depot/projects/gdb/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/gdb/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/gdb/sys/dev/drm/tdfx.h#2 integrate .. //depot/projects/gdb/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/gdb/sys/dev/eisa/eisa_if.m#1 branch .. //depot/projects/gdb/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/gdb/sys/dev/eisa/eisaconf.h#2 integrate .. //depot/projects/gdb/sys/dev/esp/esp_sbus.c#1 branch .. //depot/projects/gdb/sys/dev/esp/lsi64854.c#1 branch .. //depot/projects/gdb/sys/dev/esp/lsi64854reg.h#1 branch .. //depot/projects/gdb/sys/dev/esp/lsi64854var.h#1 branch .. //depot/projects/gdb/sys/dev/esp/ncr53c9x.c#1 branch .. //depot/projects/gdb/sys/dev/esp/ncr53c9xreg.h#1 branch .. //depot/projects/gdb/sys/dev/esp/ncr53c9xvar.h#1 branch .. //depot/projects/gdb/sys/dev/fb/vga.c#3 integrate .. //depot/projects/gdb/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/gdb/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/gdb/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/gdb/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc.c#6 integrate .. //depot/projects/gdb/sys/dev/my/if_my.c#4 integrate .. //depot/projects/gdb/sys/dev/nge/if_nge.c#7 integrate .. //depot/projects/gdb/sys/dev/ofw/ofw_console.c#6 integrate .. //depot/projects/gdb/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/gdb/sys/dev/pcf/pcf_ebus.c#1 branch .. //depot/projects/gdb/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/gdb/sys/dev/re/if_re.c#6 integrate .. //depot/projects/gdb/sys/dev/sab/sab.c#8 integrate .. //depot/projects/gdb/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/gdb/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/gdb/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uftdi.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#12 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#12 integrate .. //depot/projects/gdb/sys/dev/wi/if_wi_pccard.c#5 integrate .. //depot/projects/gdb/sys/dev/xe/if_xe.c#5 integrate .. //depot/projects/gdb/sys/geom/geom_io.c#4 integrate .. //depot/projects/gdb/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/gdb/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/gdb/sys/i386/bios/mca_machdep.c#2 integrate .. //depot/projects/gdb/sys/i386/bios/smapi.c#4 integrate .. //depot/projects/gdb/sys/i386/bios/smbios.c#3 integrate .. //depot/projects/gdb/sys/i386/bios/vpd.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/bios.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/gdb/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/gdb/sys/i386/i386/symbols.raw#2 integrate .. //depot/projects/gdb/sys/i386/include/md_var.h#3 integrate .. //depot/projects/gdb/sys/i386/include/pc/bios.h#3 integrate .. //depot/projects/gdb/sys/i386/isa/npx.c#6 integrate .. //depot/projects/gdb/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/gdb/sys/i386/pci/pci_pir.c#5 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/gdb/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#10 integrate .. //depot/projects/gdb/sys/kern/kern_intr.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_kse.c#1 branch .. //depot/projects/gdb/sys/kern/kern_proc.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_sig.c#9 integrate .. //depot/projects/gdb/sys/kern/kern_synch.c#11 integrate .. //depot/projects/gdb/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#12 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#9 integrate .. //depot/projects/gdb/sys/kern/tty.c#7 integrate .. //depot/projects/gdb/sys/kern/tty_conf.c#3 integrate .. //depot/projects/gdb/sys/kern/tty_pty.c#7 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/gdb/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/gdb/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/em/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/esp/Makefile#1 branch .. //depot/projects/gdb/sys/modules/ipfilter/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/ixgb/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/vx/Makefile#2 integrate .. //depot/projects/gdb/sys/net/bpf.c#5 integrate .. //depot/projects/gdb/sys/net/if_sl.c#5 integrate .. //depot/projects/gdb/sys/net/netisr.h#3 integrate .. //depot/projects/gdb/sys/net/raw_cb.c#3 integrate .. //depot/projects/gdb/sys/net/rtsock.c#10 integrate .. //depot/projects/gdb/sys/netatm/atm_ioctl.h#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_message.h#3 integrate .. //depot/projects/gdb/sys/netinet/igmp.c#3 integrate .. //depot/projects/gdb/sys/netinet/in.h#3 integrate .. //depot/projects/gdb/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/gdb/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/gdb/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/gdb/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/gdb/sys/pc98/i386/machdep.c#6 integrate .. //depot/projects/gdb/sys/pc98/pc98/clock.c#5 integrate .. //depot/projects/gdb/sys/pc98/pc98/mse.c#4 integrate .. //depot/projects/gdb/sys/pc98/pc98/olpt.c#4 integrate .. //depot/projects/gdb/sys/pc98/pc98/pc98gdc.c#3 integrate .. //depot/projects/gdb/sys/pc98/pc98/ppc.c#3 integrate .. //depot/projects/gdb/sys/pci/if_dc.c#6 integrate .. //depot/projects/gdb/sys/pci/if_de.c#4 integrate .. //depot/projects/gdb/sys/pci/if_pcn.c#4 integrate .. //depot/projects/gdb/sys/pci/if_rl.c#8 integrate .. //depot/projects/gdb/sys/pci/if_sf.c#4 integrate .. //depot/projects/gdb/sys/pci/if_sis.c#6 integrate .. //depot/projects/gdb/sys/pci/if_sk.c#8 integrate .. //depot/projects/gdb/sys/pci/if_ste.c#11 integrate .. //depot/projects/gdb/sys/pci/if_vr.c#6 integrate .. //depot/projects/gdb/sys/pci/if_wb.c#4 integrate .. //depot/projects/gdb/sys/pci/if_xl.c#5 integrate .. //depot/projects/gdb/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/gdb/sys/sparc64/include/asmacros.h#3 integrate .. //depot/projects/gdb/sys/sys/linedisc.h#2 integrate .. //depot/projects/gdb/sys/sys/mbuf.h#11 integrate .. //depot/projects/gdb/sys/sys/systm.h#6 integrate .. //depot/projects/gdb/sys/sys/tty.h#5 integrate .. //depot/projects/gdb/sys/sys/vmmeter.h#3 integrate .. //depot/projects/gdb/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/gdb/sys/vm/uma_core.c#7 integrate .. //depot/projects/gdb/sys/vm/vm_page.h#7 integrate .. //depot/projects/gdb/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/gdb/tools/regression/lib/msun/Makefile#1 branch .. //depot/projects/gdb/tools/regression/lib/msun/test-fenv.c#1 branch .. //depot/projects/gdb/tools/tools/tinderbox/tbmaster.pl#4 integrate .. //depot/projects/gdb/usr.bin/printf/printf.1#2 integrate .. //depot/projects/gdb/usr.bin/printf/printf.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#7 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#16 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#8 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#8 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#12 integrate .. //depot/projects/gdb/usr.bin/top/machine.c#2 integrate .. //depot/projects/gdb/usr.sbin/IPXrouted/IPXrouted.8#2 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidb/acpidb.8#2 integrate .. //depot/projects/gdb/usr.sbin/adduser/adduser.8#5 integrate .. //depot/projects/gdb/usr.sbin/adduser/adduser.sh#4 integrate .. //depot/projects/gdb/usr.sbin/adduser/rmuser.8#2 integrate .. //depot/projects/gdb/usr.sbin/arp/arp.c#4 integrate .. //depot/projects/gdb/usr.sbin/bootparamd/bootparamd/main.c#2 integrate .. //depot/projects/gdb/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/gdb/usr.sbin/jail/jail.8#7 integrate .. //depot/projects/gdb/usr.sbin/lpr/lpr/printcap.5#3 integrate .. //depot/projects/gdb/usr.sbin/ndp/ndp.8#3 integrate .. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.c#5 integrate .. //depot/projects/gdb/usr.sbin/newsyslog/ptimes.c#2 integrate .. //depot/projects/gdb/usr.sbin/nghook/nghook.8#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/gdb/usr.sbin/pstat/pstat.c#4 integrate .. //depot/projects/gdb/usr.sbin/setkey/setkey.8#3 integrate .. //depot/projects/gdb/usr.sbin/traceroute6/traceroute6.8#2 integrate .. //depot/projects/gdb/usr.sbin/wicontrol/wicontrol.8#3 integrate Differences ... ==== //depot/projects/gdb/UPDATING#14 (text+ko) ==== @@ -17,6 +17,10 @@ developers choose to disable these features on build machines to maximize performance. +20040607: + Splitting kern_thread.c into 2 files (adding kern_kse.c) + requires that you re-run config after updating your tree. + 20040601: The MIDI drivers have been removed. Until the new module-friendly ones are merged, remove or comment out midi and seq from your @@ -1607,4 +1611,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.308 2004/06/04 15:24:12 tanimura Exp $ +$FreeBSD: src/UPDATING,v 1.309 2004/06/07 21:37:40 julian Exp $ ==== //depot/projects/gdb/bin/ls/ls.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.77 2004/06/03 15:04:00 le Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.78 2004/06/08 09:30:10 das Exp $"); #include #include @@ -452,7 +452,13 @@ fts_open(argv, options, f_nosort ? NULL : mastercmp)) == NULL) err(1, "fts_open"); - display(NULL, fts_children(ftsp, 0), options); + /* + * We ignore errors from fts_children here since they will be + * replicated and signalled on the next call to fts_read() below. + */ + chp = fts_children(ftsp, 0); + if (chp != NULL) + display(NULL, chp, options); if (f_listdir) return; @@ -533,16 +539,6 @@ char ngroup[STRBUF_SIZEOF(uid_t) + 1]; char nuser[STRBUF_SIZEOF(gid_t) + 1]; - /* - * If list is NULL there are two possibilities: that the parent - * directory p has no children, or that fts_children() returned an - * error. We ignore the error case since it will be replicated - * on the next call to fts_read() on the post-order visit to the - * directory p, and will be signaled in traverse(). - */ - if (list == NULL) - return; - needstats = f_inode || f_longform || f_size; flen = 0; btotal = 0; @@ -784,7 +780,13 @@ ++entries; } - if (!entries) + /* + * If there are no entries to display, we normally stop right + * here. However, we must continue if we have to display the + * total block count. In this case, we display the total only + * on the second (p != NULL) pass. + */ + if (!entries && (!(f_longform || f_size) || p == NULL)) return; d.list = list; ==== //depot/projects/gdb/bin/ls/print.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.72 2004/05/25 14:53:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.73 2004/06/08 09:27:42 das Exp $"); #include #include @@ -142,8 +142,10 @@ int haveacls; dev_t prevdev; - if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) + if ((dp->list == NULL || dp->list->fts_level != FTS_ROOTLEVEL) && + (f_longform || f_size)) { (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); + } haveacls = 1; prevdev = (dev_t)-1; @@ -294,8 +296,10 @@ if (num % numcols) ++numrows; - if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) + if ((dp->list == NULL || dp->list->fts_level != FTS_ROOTLEVEL) && + (f_longform || f_size)) { (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); + } base = 0; for (row = 0; row < numrows; ++row) { ==== //depot/projects/gdb/bin/test/test.1#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.18 2004/04/06 20:06:54 markm Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.20 2004/06/07 12:47:31 yar Exp $ .\" .Dd May 31, 1993 .Dt TEST 1 @@ -210,11 +210,6 @@ comes after .Ar \&s\&2 based on the ASCII value of their characters. -.It Ar \&s\&1 -True if -.Ar \&s\&1 -is not the null -string. .It Ar \&n\&1 Fl \&eq Ar \&n\&2 True if the integers .Ar \&n\&1 @@ -255,6 +250,17 @@ .Ar \&n\&2 . .El .Pp +If +.Ar file +is a symbolic link, +.Nm +will fully dereference it and then evaluate the expression +against the file referenced, except for the +.Fl h +and +.Fl L +primaries. +.Pp These primaries can be combined with the following operators: .Bl -tag -width Ar .It Cm \&! Ar expression @@ -315,7 +321,8 @@ .Sh SEE ALSO .Xr builtin 1 , .Xr expr 1 , -.Xr sh 1 +.Xr sh 1 , +.Xr symlink 7 .Sh STANDARDS The .Nm ==== //depot/projects/gdb/contrib/cvs/BUGS#3 (text+ko) ==== @@ -47,12 +47,6 @@ are never a problem, whether or not LockDir is in use. -* "make remotecheck" sometimes fails on test 187a3 with - cvs server: in directory .: - cvs [server aborted]: *PANIC* administration files missing -This does not happen every time. (-kingdon, Nov 96, Red Hat linux 3.0.3). - - * The -m option to "cvs add" does not work with client/server CVS. CVS will accept the option, but it won't actually set the file's description. @@ -84,121 +78,6 @@ P.S. Is anyone working on fixing these bugs? -* From: Roland McGrath - To: Cyclic CVS Hackers - Subject: weird bug - Date: Sat, 25 Mar 1995 16:41:41 -0500 - X-Windows: Even your dog won't like it. - - I just noticed some droppings on my disk from what must be a pretty weird - bug in remote CVS. - - In my home directory on a repository machine I use, I find: - - drwxr-xr-x 4 roland staff 512 Mar 7 14:08 cvs-serv28962 - drwxr-xr-x 4 roland staff 512 Mar 7 14:11 cvs-serv28978 - drwxr-xr-x 4 roland staff 512 Mar 7 15:13 cvs-serv29141 - - OK, so these are leftover cruft from some cvs run that got aborted. - Well, it should clean up after itself, but so what. - - The last one is pretty dull; the real weirdness is the contents of the - first two directories. - - duality 77 # ls -RF cvs-serv28978/ - CVS/ cvs-serv28978/ - - cvs-serv28978/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978: - arpa/ - - cvs-serv28978/cvs-serv28978/arpa: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978: - assert/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978: - bare/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978: - conf/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978: - crypt/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978: - csu/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978: - ctype/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype: - CVS/ cvs-serv28978/ - - [...] - - ls: cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype/cvs-serv28978/dirent/cvs-serv28978/elf/cvs-serv28978/gnu/cvs-serv28978/gnulib/cvs-serv28978/grp/cvs-serv28978/hurd/cvs-serv28978/hurd/hurd/cvs-serv28978/inet/cvs-serv28978/inet/arpa/cvs-serv28978/inet/netinet[...]/cvs-serv28978/posix/cvs-serv28978/posix/glob/cvs-serv28978/posix/gnu/cvs-serv28978/posix/sys/cvs-serv28978/protocols/cvs-serv28978/pwd/cvs-serv28978/resolv/cvs-serv28978/resolv/arpa/cvs-serv28978/resolv/sys/cvs-serv28978/resource/cvs-serv28978/resource/sys/cvs-serv28978/rpc/cvs-serv28978/setjmp/cvs-serv28978/signal/cvs-serv28978/signal/sys/cvs-serv28978/socket/cvs-serv28978/socket: File name too long - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype/cvs-serv28978/dirent/cvs-serv28978/elf/cvs-serv28978/gnu/cvs-serv28978/gnulib/cvs-serv28978/grp/cvs-serv28978/hurd/cvs-serv28978/hurd/hurd/cvs-serv28978/inet/cvs-serv28978/inet/arpa/cvs-serv28978/inet/netinet[...]/cvs-serv28978/posix/glob/cvs-serv28978/posix/gnu/cvs-serv28978/posix/sys/cvs-serv28978/protocols/cvs-serv28978/pwd/cvs-serv28978/resolv/cvs-serv28978/resolv/arpa/cvs-serv28978/resolv/sys/cvs-serv28978/resource/cvs-serv28978/resource/sys/cvs-serv28978/rpc/cvs-serv28978/setjmp/cvs-serv28978/signal/cvs-serv28978/signal/sys/cvs-serv28978/socket/cvs-serv28978: - -* From: Roland McGrath - To: Cyclic CVS Hackers - Subject: bizarre failure mode - Date: Tue, 7 Mar 95 14:17:28 -0500 - - This is pretty weird: - - CVS_SERVER='TMPDIR=. /usr/local/bin/cvs' ../cvs-build/src/cvs update -q - cvs [server aborted]: could not get working directory: Result too large - [Exit 1] - asylum 29 % grep 'Result too large' /usr/include/sys/errno.h - #define ERANGE 34 /* Result too large */ - - Now, getcwd fails with ERANGE when the buffer is too small. But I don't - know why that would be the case; I don't think there are exceptionally long - directory names involved. It would be robust to notice ERANGE and use a - bigger buffer. But I suspect something weirder is going on. - - The repository in question in duality.gnu.ai.mit.edu:/gd4/gnu/cvsroot/libc. - - Send me a PGP-signed message if you want the password to use the machine - where the problem showed up. - * CVS does not always seem to be waiting to the next filesystem timestamp quanta after commits. So far this has only shown up in testing under the BSDI OS. The symptoms are that ocassionally CVS will not notice that modified files @@ -208,18 +87,22 @@ an incorrect value, though this does not explain why symptoms have only been noticed under BSDI. + * Spaces in arguments to `cvs diff' are currently split on spaces and tabs before being passed to diff. This can often cause diff to abort since it can no longer interpret its options string and if it can, coincidentally, interpret its option string, then the problem may be output in unexpected formats. + * `release' of a project subdir does not remove the `subdir' entry from `./CVS/Entries'. -* The Windows Microsoft Visual C++ project files are out of date, but the - project can still be built under Windows using `nmake'. See the INSTALL - file for more. + +* Most of the remote commands are encountering assertion failures when listing + the toplevel of the repository (e.g. `cvs rlog .'). This appears to be + related to the symlinked CVS root fix. + * Status ==== //depot/projects/gdb/contrib/cvs/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,83 @@ +2004-06-09 Derek Price + + * NEWS: Note Stefan & Sebastian's security fixes. + * acinclude.m4 (gl_SIZE_MAX, gl_XSIZE): Import from GNULIB. + * configure.in: Call gl_XSIZE. + +2004-06-09 Derek Price + + * NEWS: Note CAN-2004-0414 fix. + +2004-05-19 Derek Price + + * NEWS: Note CAN-2004-0396 fix. + +2004-05-17 Derek Price + + * BUGS: Note assertion failure of r* commands. + +2004-05-17 Derek Price + + * BUGS: Remove out of date comment about out of date Windows build + files and several bug reports that are so old, without similar recent + reports, that I'm assuming that the problems have been fixed. + +2004-05-15 Derek Price + + * cvsnt.dsp: Header file list updated. + * cvsnt.dep: Regenerated for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + (Patch from Conrad Pino .) + +2004-05-13 Derek Price + + * NEWS: Note MSVC++ project file regeneration. + +2004-05-13 Derek Price + + * cvsnt.dsw: Rename "zlib/zlib.*" to "zlib/libz.*". + Add project "lib/libcvs". + * cvsnt.dsp: Revised for "cvsnt.dsw" changes. Move "lib/*.c" to + project "lib/libcvs". Upgraded to Visual C++ 6.0 format. + * cvsnt.dep: Added for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + (Patch from Conrad Pino .) + + * configure.in: Generate windows-NT/fix-msvc-mak. + +2004-04-30 Derek Price + + * NEWS: Note that man page is generated from cvs.texinfo now. + * configure.in: Build doc/mkman. + * configure, Makefile.in: Regenerated. + +2004-04-26 Derek Price + + * NEWS: Note that :ext: no longer relies on an external transport with + a GNU argument processor. + +2004-04-20 Derek Price + + * NEWS: Note XP directory deletion fix. + +2004-04-16 Derek Price + + * NEWS: Correct CVS name for piped checkout issue now that we have one. + +2004-04-15 Derek Price + + * NEWS: Retroactively add CVE issue name for the piped etc issue. + +2004-04-15 Derek Price + + * NEWS: Retroactively add CVE issue name for the trojan server issue. + +2004-04-14 Derek Price + + * INSTALL (Building from source code under Unix): Move Autoconf & + Automake notes... + * HACKING (Regenerating Build Files): ...here. + 2004-04-13 Derek Price * NEWS: Note validation of paths passed to the client. ==== //depot/projects/gdb/contrib/cvs/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.10 2002/09/02 05:58:30 peter Exp $ +$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $ MAINTAINER= peter@FreeBSD.org @@ -7,39 +7,19 @@ versions or official-patch versions must be imported. To prepare a new cvs dist for import, extract it into a fresh directory; +then delete the files and directories listed in FREEBSD-Xlist. -The following generated files were deleted: -doc/*.ps -doc/*.info* -doc/texinfo.tex -lib/getdate.c -cvsnt.* -cvs.spec* -build.com -*/*.com -*/*.dsp -*/.cvsignore -.cvsignore -README.VMS - -The following non-freebsd-specific directories were deleted: -os2 -emx -windows-NT -vms -zlib - -It is imported from it's top level directory something like this: +CVS is imported from its top level directory something like this: cvs -n import src/contrib/cvs CVSHOME v -The -n option is "dont do anything" so you can see what is about to happen +The -n option is "don't do anything" so you can see what is about to happen first. Remove it when it looks ok. The initial import was done with: cvs import src/contrib/cvs CVSHOME v1_8_1 When new versions are imported, cvs will give instructions on how to merge -the local and vendor changes when/if conflicts arise.. +the local and vendor changes when/if conflicts arise. The developers can be reached at: . Local changes that are suitable for public consumption should be submitted for inclusion ==== //depot/projects/gdb/contrib/cvs/HACKING#2 (text+ko) ==== @@ -104,6 +104,25 @@ (the latter causes Visual C++ 2.1 to create makefiles which Visual C++ 4.0 cannot use). +* Regenerating Build Files + +On UNIX, if you wish to change the Build files, you will need Autoconf and +Automake. + +Some combinations of Automake and Autoconf versions may break the +CVS build if file timestamps aren't set correctly and people don't +have the same versions the developers do, so the rules to run them +automatically aren't included in the generated Makefiles unless you run +configure with the --enable-maintainer-mode option. + +The CVS Makefiles and configure script were built using Automake 1.7.9 and +Autoconf 2.58, respectively. + +There is a known bug in Autoconf 2.57 that will prevent the configure +scripts it generates from working on some platforms. Other combinations of +autotool versions may or may not work. If you get other versions to work, +please send a report to . + * Writing patches (strategy) Only some kinds of changes are suitable for inclusion in the ==== //depot/projects/gdb/contrib/cvs/INSTALL#3 (text+ko) ==== @@ -257,21 +257,7 @@ Building from source code under Unix: -1) Some combinations of Automake and Autoconf versions may break the - CVS build if file timestamps aren't set correctly and people don't - have the same versions the developers do, so the rules to run them - automatically aren't included in the generated Makefiles unless you run - configure with --enable-maintainer-mode. - - The CVS Makefiles and configure script were built using Automake 1.7.9 and - Autoconf 2.58, respectively. - - There is a known bug in Autoconf 2.57 that will prevent the configure - scripts it generates from working on some platforms. Other combinations of - autotool versions may or may not work. If you get other versions to work, - please send a report to . - -2) Run "configure": +1) Run "configure": $ ./configure @@ -385,7 +371,7 @@ END OF NOTE FOR NDBM GUNK. -3) Try to build it: +2) Try to build it: $ make @@ -396,7 +382,7 @@ compiler information, make output, and anything else you think will be helpful. -3a) Run the regression tests (optional). +3) Run the regression tests (optional). You may also wish to validate the correctness of the new binary by running the regression tests. If they succeed, that is nice to ==== //depot/projects/gdb/contrib/cvs/Makefile.am#3 (text+ko) ==== @@ -35,6 +35,7 @@ TESTS \ build.com \ cvs-format.el \ + cvsnt.dep \ cvsnt.dsp \ cvsnt.dsw \ cvsnt.mak \ ==== //depot/projects/gdb/contrib/cvs/Makefile.in#3 (text+ko) ==== @@ -161,6 +161,7 @@ TESTS \ build.com \ cvs-format.el \ + cvsnt.dep \ cvsnt.dsp \ cvsnt.dsw \ cvsnt.mak \ @@ -372,7 +373,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/zlib + $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ ==== //depot/projects/gdb/contrib/cvs/NEWS#3 (text+ko) ==== @@ -1,18 +1,62 @@ -Changes since 1.11.14: +Changes since 1.11.16: ********************** +SERVER SECURITY FIXES + +* Thanks to Stefan Esser & Sebastian Krahmer, several potential security + problems have been fixed. The ones which were considered dangerous enough + to catalogue were assigned issue numbers CAN-2004-0416, CAN-2004-0417, & + CAN-2004-0418 by the Common Vulnerabilities and Exposures Project. Please + see for more information. + +* A potential buffer overflow vulnerability in the server has been fixed. + This addresses the Common Vulnerabilities and Exposures Project's issue + #CAN-2004-0414. Please see for more information. + +Changes from 1.11.15 to 1.11.16: +******************************** + +SERVER SECURITY FIXES + +* A potential buffer overflow vulnerability in the server has been fixed. + Prior to this patch, a malicious client could potentially use carefully + crafted server requests to run arbitrary programs on the CVS server machine. + This addresses the Common Vulnerabilities and Exposures Project's issue + #CAN-2004-0396. Please see for more information. + +BUG FIXES + +* The Microsoft Visual C++ workspace and project files have been repaired and + regenerated with MSVC++ 6.0. + +* The cvs.1 man page is now generated automatically from a section of the CVS + Manual. + +* Thanks to a report from Mark Andrews at the Internet Systems Consortium, the + :ext: connection method no longer relies on a transparent transport that uses + an argument processor that can handle arbitrary ordering of options and other + arguments when using a username other than the caller's. + +* Thanks to Ken Raeburn at MIT, directory deletion, whether via `cvs release' + or empty directory pruning, now works on network shares under Windows XP. + +Changes from 1.11.14 to 1.11.15: +******************************** + SERVER SECURITY ISSUES >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 11 05:58:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2440916A4D1; Fri, 11 Jun 2004 05:58:37 +0000 (GMT) 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 D62EC16A4CE for ; Fri, 11 Jun 2004 05:58:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D02BA43D2F for ; Fri, 11 Jun 2004 05:58:36 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5B5wavN027921 for ; Fri, 11 Jun 2004 05:58:36 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5B5waNX027918 for perforce@freebsd.org; Fri, 11 Jun 2004 05:58:36 GMT (envelope-from marcel@freebsd.org) Date: Fri, 11 Jun 2004 05:58:36 GMT Message-Id: <200406110558.i5B5waNX027918@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 Subject: PERFORCE change 54621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 05:58:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=54621 Change 54621 by marcel@marcel_nfs on 2004/06/11 05:57:42 o Add kthr.c. It will contain kernel thread support functions. The functions are dummies for now. o Handle the gdb packets. This is mostly untested, but taken from the kernel which is known to work. o Add command line processing: + Add option -n, which takes an integer and instructs kgdb to open /var/crash/vmcore. and parse /var/crash/info. for the corresponding kernel. If kernel.debug exists, it is used. Otherwise kernel is used. If no kernel is found, the user has to enter the kernel file name explicitly. + Accept [kernel [core]]. If -n has been given, kernel takes precedence and core cannot be given directly. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/Makefile#5 edit .. //depot/projects/gdb/usr.bin/kgdb/kgdb.h#2 edit .. //depot/projects/gdb/usr.bin/kgdb/kthr.c#1 add .. //depot/projects/gdb/usr.bin/kgdb/main.c#6 edit .. //depot/projects/gdb/usr.bin/kgdb/md_i386.c#2 edit .. //depot/projects/gdb/usr.bin/kgdb/packet.c#2 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= kgdb -SRCS= main.c md_${MACHINE_ARCH}.c packet.c +SRCS= kthr.c main.c md_${MACHINE_ARCH}.c packet.c DPADD= ${LIBKVM} ${LIBUTIL} LDADD= -lkvm -lutil ==== //depot/projects/gdb/usr.bin/kgdb/kgdb.h#2 (text+ko) ==== @@ -31,7 +31,6 @@ extern size_t gdb_rxsz; extern char *gdb_txp; -void gdb_packet(void); void gdb_packet_data(const char *, size_t); int gdb_packet_recv(char *, size_t); int gdb_packet_send(const char *, size_t); @@ -108,9 +107,15 @@ extern kvm_t *kvm; struct kthr { - void *frame; + void *td_frame; + int td_tid; }; extern struct kthr *curkthr; +struct kthr *kgdb_thr_first(void); +struct kthr *kgdb_thr_lookup(int); +struct kthr *kgdb_thr_next(struct kthr *); +struct kthr *kgdb_thr_select(struct kthr *); + #endif /* _KGDB_H_ */ ==== //depot/projects/gdb/usr.bin/kgdb/main.c#6 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +#include +#include #include #include #include @@ -54,8 +56,11 @@ char *gdb_rp_dev; pid_t gdb_pid; +int dumpnr; +char crashdir[PATH_MAX]; +char *kernel; +char *vmcore; kvm_t *kvm; -struct kthr *curkthr; char *cmdfile_name; int cmdfile_fd; @@ -63,6 +68,14 @@ static const char cmd_set_prompt[] = "set prompt (kgdb) \n"; static void +usage(void) +{ + fprintf(stderr, "usage: %s [-d dumpno] [kernel] [core]\n", + getprogname()); + exit(1); +} + +static void atexit_unlink_cmdfile(void) { close(cmdfile_fd); /* Is likely closed already. */ @@ -93,19 +106,100 @@ return (write(gdb_rp_fd, p, sz)); } -void gdb_packet(void) +static void +parse_dump(void) { - printf("`%s'\n", gdb_rxp); + char path[PATH_MAX]; + FILE *info; + char *s; + struct stat st; + int l; + + snprintf(path, sizeof(path), "%s/vmcore.%d", crashdir, dumpnr); + if (stat(path, &st) == -1) + err(1, path); + vmcore = strdup(path); + snprintf(path, sizeof(path), "%s/info.%d", crashdir, dumpnr); + info = fopen(path, "r"); + if (info == NULL) { + warn(path); + return; + } + while (fgets(path, sizeof(path), info) != NULL) { + l = strlen(path); + if (l > 0 && path[l - 1] == '\n') + path[--l] = '\0'; + if (strncmp(path, " ", 4) == 0) { + s = strchr(path, ':'); + s = (s == NULL) ? path + 4 : s + 1; + l = snprintf(path, sizeof(path), "%s/kernel.debug", s); + if (stat(path, &st) == -1) { + path[l - 6] = '\0'; + if (stat(path, &st) == -1) + break; + } + kernel = strdup(path); + break; + } + } + fclose(info); } int -main(int argc __unused, char *argv[] __unused) +main(int argc, char *argv[]) { char buf[256]; fd_set rfds, wfds, xfds; + char *s; ssize_t sz; int fdin, fdout; int f, nfds, status; + int ch; + + strcpy(crashdir, "/var/crash"); + while ((ch = getopt(argc, argv, "n:")) != -1) { + switch (ch) { + case 'n': + if (dumpnr) { + warnx("option %c specified multiple times", + optopt); + usage(); + /* NOTREACHED */ + } + dumpnr = strtol(optarg, &s, 0); + if (dumpnr == 0 || *s != '\0') { + warnx("option %c: invalid kernel dump number", + optopt); + usage(); + /* NOTREACHED */ + } + parse_dump(); + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if (argc > 0) { + if (kernel != NULL) + free(kernel); + kernel = strdup(*argv++); + argc--; + } + while (argc > 0) { + if (vmcore != NULL) + errx(1, "multiple core files specified"); + vmcore = strdup(*argv++); + argc--; + } + + if (kernel == NULL) + errx(1, "kernel not specified"); + if (vmcore == NULL) + errx(1, "core file not specified"); cmdfile_name = strdup("/tmp/kgdb.XXXXXXXX"); if (cmdfile_name == NULL) ==== //depot/projects/gdb/usr.bin/kgdb/md_i386.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ gdb_cpu_getreg(int regnum, size_t *regsz) { static register_t synth; - struct trapframe *tf = curkthr->frame; + struct trapframe *tf = curkthr->td_frame; *regsz = gdb_cpu_regsz(regnum); switch (regnum) { @@ -73,7 +73,7 @@ void gdb_cpu_setreg(int regnum, register_t val) { - struct trapframe *tf = curkthr->frame; + struct trapframe *tf = curkthr->td_frame; switch (regnum) { case GDB_REG_PC: tf->tf_eip = val; break; ==== //depot/projects/gdb/usr.bin/kgdb/packet.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -53,6 +54,114 @@ 10 + (((c) < 'a') ? (c) - 'A' : (c) - 'a')) #define N2C(n) (((n) < 10) ? (n) + '0' : (n) + 'a' - 10) +static void +gdb_packet(void) +{ + struct kthr *thr_iter; + + thr_iter = NULL; + printf("GDB: got '%s'\n", gdb_rxp); + switch (gdb_rx_char()) { + case '?': /* Last signal. */ + gdb_tx_begin('S'); + gdb_tx_hex(gdb_cpu_signal(0, 0), 2); + gdb_tx_end(); + break; + case 'g': { /* Read registers. */ + size_t r; + gdb_tx_begin(0); + for (r = 0; r < GDB_NREGS; r++) + gdb_tx_reg(r); + gdb_tx_end(); + break; + } + case 'G': /* Write registers. */ + gdb_tx_err(0); + break; + case 'H': { /* Set thread. */ + intmax_t tid; + struct kthr *thr; + gdb_rx_char(); + gdb_rx_varhex(&tid); + if (tid > 0) { + thr = kgdb_thr_lookup(tid); + if (thr == NULL) { + gdb_tx_err(ENOENT); + break; + } + kgdb_thr_select(thr); + } + gdb_tx_ok(); + break; + } + case 'm': { /* Read memory. */ + uintmax_t addr, size; + if (gdb_rx_varhex(&addr) || gdb_rx_char() != ',' || + gdb_rx_varhex(&size)) { + gdb_tx_err(EINVAL); + break; + } + gdb_tx_begin(0); + gdb_tx_mem((char *)(uintptr_t)addr, size); + gdb_tx_end(); + break; + } + case 'M': /* Write memory. */ + gdb_tx_err(0); + break; + case 'P': { /* Write register. */ + uintmax_t reg, val; + if (gdb_rx_varhex(®) || gdb_rx_char() != '=' || + gdb_rx_varhex(&val)) { + gdb_tx_err(EINVAL); + break; + } + gdb_cpu_setreg(reg, val); + gdb_tx_ok(); + break; + } + case 'q': /* General query. */ + if (gdb_rx_equal("fThreadInfo")) { + thr_iter = kgdb_thr_first(); + gdb_tx_begin('m'); + gdb_tx_hex(thr_iter->td_tid, 8); + gdb_tx_end(); + } else if (gdb_rx_equal("sThreadInfo")) { + if (thr_iter == NULL) { + gdb_tx_err(ENXIO); + break; + } + thr_iter = kgdb_thr_next(thr_iter); + if (thr_iter != NULL) { + gdb_tx_begin('m'); + gdb_tx_hex(thr_iter->td_tid, 8); + gdb_tx_end(); + } else { + gdb_tx_begin('l'); + gdb_tx_end(); + } + } else if (!gdb_cpu_query()) + gdb_tx_empty(); + break; + case 'T': { /* Thread alive. */ + intmax_t tid; + gdb_rx_varhex(&tid); + if (kgdb_thr_lookup(tid) != NULL) + gdb_tx_ok(); + else + gdb_tx_err(ENOENT); + break; + } + case -1: + /* Empty command. Treat as unknown command. */ + /* FALLTHROUGH */ + default: + /* Unknown command. Send empty response. */ + gdb_tx_empty(); + break; + } +} + /* * Functions to receive and extract from a packet. */ From owner-p4-projects@FreeBSD.ORG Fri Jun 11 13:21:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F001416A4D1; Fri, 11 Jun 2004 13:21:35 +0000 (GMT) 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 98F3D16A4CE for ; Fri, 11 Jun 2004 13:21:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 910C043D1F for ; Fri, 11 Jun 2004 13:21:35 +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.12.11/8.12.11) with ESMTP id i5BDLJNe031610 for ; Fri, 11 Jun 2004 13:21:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5BDLIRr031595 for perforce@freebsd.org; Fri, 11 Jun 2004 13:21:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 11 Jun 2004 13:21:18 GMT Message-Id: <200406111321.i5BDLIRr031595@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 Subject: PERFORCE change 54633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 13:21:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=54633 Change 54633 by rwatson@rwatson_paprika on 2004/06/11 13:21:03 Integrate netperf_socket to loop back changes merged to CVS: - Loop back of NET_{LOCK,UNLOCK}_GIANT() around if_output in BPF from rwatson_netperf. - Loop back const raw_{send,recv}space from rwatson_netperf. - Loop back igmp_mtx from rwatson_netperf. - Loop back removal of Giant acquisition/comment about it in divert_packet(). Also: - COMPAT_SUNOS removed. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#20 integrate .. //depot/projects/netperf_socket/sys/conf/options#13 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_drv.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_linux_list.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_pciids.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/tdfx.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_prot.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_resource.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/tty_compat.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/netperf_socket/sys/net/bpf.c#6 integrate .. //depot/projects/netperf_socket/sys/net/raw_cb.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/igmp.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#9 integrate .. //depot/projects/netperf_socket/sys/sys/ioctl.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/signal.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#5 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.219 2004/04/01 20:56:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.220 2004/06/11 11:16:17 phk Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1180,7 +1180,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - rndfsize); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else @@ -1304,7 +1304,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sfp = (struct sigframe4 *)((caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - rndfsize); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else @@ -1428,7 +1428,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sfp = (struct sigframe *)((caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - rndfsize); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else @@ -1543,7 +1543,7 @@ return (EINVAL); PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) /* * Restore the user-supplied information */ @@ -1633,7 +1633,7 @@ alpha_pal_wrusp(uc.uc_mcontext.mc_regs[R_SP]); PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) if (uc.uc_mcontext.mc_onstack & 1) td->td_sigstk.ss_flags |= SS_ONSTACK; else @@ -1709,7 +1709,7 @@ alpha_pal_wrusp(uc.uc_mcontext.mc_regs[R_SP]); PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) if (uc.uc_mcontext.mc_onstack & 1) td->td_sigstk.ss_flags |= SS_ONSTACK; else ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.609 2004/06/10 20:30:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.610 2004/06/11 11:16:18 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -262,7 +262,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sp = td->td_sigstk.ss_sp + td->td_sigstk.ss_size - sizeof(struct sigframe); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else @@ -403,7 +403,7 @@ bcopy(&ucp->uc_mcontext.mc_rdi, regs, sizeof(*regs)); PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) if (ucp->uc_mcontext.mc_onstack & 1) td->td_sigstk.ss_flags |= SS_ONSTACK; else ==== //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#3 (text+ko) ==== @@ -13,7 +13,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.8 2004/05/14 20:28:31 ru Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.9 2004/06/11 09:45:18 phk Exp $ */ /* A 512-byte boot manager. */ @@ -94,15 +94,11 @@ main: #ifdef SIO /* - * Initialize the serial port. - * Must save DX (contains drive number) + * Initialize the serial port. bioscom preserves the driver number in DX. */ - pushw %dx # Save - xorw %dx,%dx # Port: COM1 movb COMSPEED,%al # defined by Makefile movb $0x00,%ah # BIOS: Set COM Port - int $0x14 # Parameters - popw %dx # Restore + call bioscom #endif /* SIO */ /* * Check what flags were loaded with us, specifically, Use a predefined Drive. @@ -199,23 +195,21 @@ callw putx # item /* * Now that we've printed the drive (if we needed to), display a prompt. - * Get ready for the input by noting the time. */ main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default callw putkey # key -main.7_1: +/* + * Start of input loop. Beep and take note of time + */ +main.10: movb $ASCII_BEL,%al # Signal + callw putchr # beep! xorb %ah,%ah # BIOS: Get int $0x1a # system time -#ifndef SIO movw %dx,%di # Ticks when - addw _TICKS(%bp),%di # timeout -#else /* SIO */ - movw %dx,%si # Ticks when - addw _TICKS(%bp),%si # timeout -#endif /* SIO */ + addw _TICKS(%bp),%di # timeout /* * Busy loop, looking for keystrokes but * keeping one eye on the time. @@ -226,19 +220,14 @@ int $0x16 # for keypress jnz main.11 # Have one #else /* SIO */ - xorw %dx,%dx # Use COM1 movb $0x03,%ah # BIOS: Read COM - int $0x14 # Status + call bioscom testb $0x01,%ah # Check line status jnz main.11 # (bit 1 indicates input) #endif /* SIO */ xorb %ah,%ah # BIOS: Get int $0x1a # system time -#ifndef SIO cmpw %di,%dx # Timeout? -#else /* SIO */ - cmpw %si,%dx # Timeout? -#endif /* SIO */ jb main.8 # No /* * If timed out or defaulting, come here. @@ -246,18 +235,6 @@ main.9: movb _OPT(%bp),%al # Load default jmp main.12 # Join common code /* - * User's last try was bad, beep in displeasure. - * Since nothing was printed, just continue on as if the user - * hadn't done anything. This gives the effect of the user getting a beep - * for all bad keystrokes but no action until either the timeout - * occurs or the user hits a good key. - */ -main.10: movb $ASCII_BEL,%al # Signal - callw putchr # error -#ifdef SIO - jmp main.7_1 # Go back -#endif /* SIO */ -/* * Get the keystroke. */ main.11: @@ -267,7 +244,7 @@ movb %ah,%al # Scan code #else /* SIO */ movb $0x02,%ah # BIOS: Receive - int $0x14 # COM Byte + call bioscom #endif /* SIO */ /* * If it's CR act as if timed out. @@ -384,22 +361,25 @@ jmp putstr # Continue putstr.2: andb $~0x80,%al # Clear MSB +#ifndef SIO putchr: -#ifndef SIO pushw %bx # Save movw $0x7,%bx # Page:attribute movb $0xe,%ah # BIOS: Display int $0x10 # character popw %bx # Restore + retw # To caller #else /* SIO */ +putchr: + movb $0x01,%ah # BIOS: Send + xorw %cx,%cx # No timeout +bioscom: pushw %dx # Save xorw %dx,%dx # Use COM1 - xorw %cx,%cx # No timeout - movb $0x01,%ah # BIOS: Send int $0x14 # Character popw %dx # Restore + retw # To caller #endif /* SIO */ - retw # To caller /* One-sector disk I/O routine */ @@ -426,13 +406,8 @@ /* Menu strings */ -#ifndef SIO item: .ascii " "; .byte ' '|0x80 prompt: .ascii "\nDefault:"; .byte ' '|0x80 -#else /* SIO */ -item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDef:"; .byte ' '|0x80 -#endif /* SIO */ crlf: .ascii "\r"; .byte '\n'|0x80 /* Partition type tables */ ==== //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.153 2004/03/17 19:59:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.154 2004/06/11 11:16:18 phk Exp $"); #include "opt_mac.h" @@ -1299,7 +1299,7 @@ /* * The FreeBSD native getpid(2), getgid(2) and getuid(2) also modify - * td->td_retval[1] when COMPAT_43 or COMPAT_SUNOS is defined. This + * td->td_retval[1] when COMPAT_43 is defined. This * globbers registers that are assumed to be preserved. The following * lightweight syscalls fixes this. See also linux_getgid16() and * linux_getuid16() in linux_uid16.c. ==== //depot/projects/netperf_socket/sys/compat/linux/linux_uid16.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.12 2003/10/21 11:00:33 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.13 2004/06/11 11:16:18 phk Exp $"); #include #include @@ -190,7 +190,7 @@ /* * The FreeBSD native getgid(2) and getuid(2) also modify td->td_retval[1] - * when COMPAT_43 or COMPAT_SUNOS is defined. This globbers registers that + * when COMPAT_43 is defined. This globbers registers that * are assumed to be preserved. The following lightweight syscalls fixes * this. See also linux_getpid(2), linux_getgid(2) and linux_getuid(2) in * linux_misc.c ==== //depot/projects/netperf_socket/sys/conf/NOTES#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1229 2004/06/10 05:43:36 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1230 2004/06/11 11:16:19 phk Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -210,12 +210,6 @@ # options COMPAT_43 -# -# Be compatible with SunOS. The COMPAT_43 option above pulls in most -# (all?) of the changes that this option turns on. -# -options COMPAT_SUNOS - # Enable FreeBSD4 compatibility syscalls options COMPAT_FREEBSD4 ==== //depot/projects/netperf_socket/sys/conf/options#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.451 2004/05/20 10:37:11 pjd Exp $ +# $FreeBSD: src/sys/conf/options,v 1.452 2004/06/11 11:16:19 phk Exp $ # # On the handling of kernel options # @@ -52,7 +52,6 @@ CODA_COMPAT_5 opt_coda.h COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h -COMPAT_SUNOS opt_compat.h COMPILING_LINT opt_global.h CONSPEED opt_comconsole.h CY_PCI_FASTINTR ==== //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.37 2004/06/01 11:34:46 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.38 2004/06/11 07:39:15 sos Exp $"); #include "opt_ata.h" #include @@ -532,7 +532,7 @@ ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); DELAY(10); ostat0 = ATA_IDX_INB(ch, ATA_STATUS); - if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5 && ostat0 != 0x7f) { + if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5) { stat0 = ATA_S_BUSY; mask |= 0x01; } @@ -543,7 +543,7 @@ /* in some setups we dont want to test for a slave */ if (!(ch->flags & ATA_NO_SLAVE)) { - if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5 && ostat1 != 0x7f) { + if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5) { stat1 = ATA_S_BUSY; mask |= 0x02; } @@ -637,15 +637,10 @@ DELAY(100000); } - if (stat0 & ATA_S_BUSY) - mask &= ~0x01; - if (stat1 & ATA_S_BUSY) - mask &= ~0x02; - if (bootverbose) ata_printf(ch, -1, - "reset tp2 mask=%02x stat0=%02x stat1=%02x devices=0x%b\n", - mask, stat0, stat1, ch->devices, + "reset tp2 stat0=%02x stat1=%02x devices=0x%b\n", + stat0, stat1, ch->devices, "\20\4ATAPI_SLAVE\3ATAPI_MASTER\2ATA_SLAVE\1ATA_MASTER"); } ==== //depot/projects/netperf_socket/sys/dev/cy/cy.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.150 2004/06/04 21:55:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.151 2004/06/11 11:16:20 phk Exp $"); #include "opt_compat.h" @@ -1539,7 +1539,7 @@ int mynor; int s; struct tty *tp; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) int oldcmd; struct termios term; #endif @@ -1580,7 +1580,7 @@ } } tp = com->tp; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; error = ttsetcompat(tp, &cmd, data, &term); ==== //depot/projects/netperf_socket/sys/dev/digi/digi.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.c,v 1.45 2004/06/04 21:55:49 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.46 2004/06/11 11:16:20 phk Exp $ */ /*- @@ -1072,7 +1072,7 @@ struct digi_softc *sc; struct digi_p *port; struct tty *tp; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) int oldcmd; struct termios term; #endif @@ -1226,7 +1226,7 @@ } tp = port->tp; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; error = ttsetcompat(tp, &cmd, data, &term); ==== //depot/projects/netperf_socket/sys/dev/drm/drm.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm.h,v 1.6 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm.h,v 1.7 2004/06/11 03:26:59 anholt Exp $ */ @@ -137,6 +137,18 @@ unsigned int age; } drm_tex_region_t; +/** + * Hardware lock. + * + * The lock structure is a simple cache-line aligned integer. To avoid + * processor bus contention on a multiprocessor system, there should not be any + * other data stored in the same cache line. + */ +typedef struct drm_hw_lock { + __volatile__ unsigned int lock; /**< lock variable */ + char padding[60]; /**< Pad to cache line */ +} drm_hw_lock_t; + /** * DRM_IOCTL_VERSION ioctl argument type. ==== //depot/projects/netperf_socket/sys/dev/drm/drmP.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.9 2004/01/06 04:34:52 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.10 2004/06/11 03:26:59 anholt Exp $ */ #ifndef _DRM_P_H_ @@ -197,11 +197,6 @@ drm_freelist_t freelist; } drm_buf_entry_t; -typedef struct drm_hw_lock { - __volatile__ unsigned int lock; - char padding[60]; /* Pad to cache line */ -} drm_hw_lock_t; - typedef TAILQ_HEAD(drm_file_list, drm_file) drm_file_list_t; struct drm_file { TAILQ_ENTRY(drm_file) link; ==== //depot/projects/netperf_socket/sys/dev/drm/drm_drv.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.23 2004/03/03 08:27:33 obrien Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.24 2004/06/11 03:26:59 anholt Exp $ */ /* @@ -79,16 +79,16 @@ #endif #ifndef DRIVER_PREINIT -#define DRIVER_PREINIT() +#define DRIVER_PREINIT(dev) do {} while (0) #endif #ifndef DRIVER_POSTINIT -#define DRIVER_POSTINIT() +#define DRIVER_POSTINIT(dev) do {} while (0) #endif #ifndef DRIVER_PRERELEASE #define DRIVER_PRERELEASE() #endif #ifndef DRIVER_PRETAKEDOWN -#define DRIVER_PRETAKEDOWN() +#define DRIVER_PRETAKEDOWN(dev) #endif #ifndef DRIVER_POSTCLEANUP #define DRIVER_POSTCLEANUP() @@ -212,7 +212,9 @@ #ifdef __FreeBSD__ static struct cdevsw DRM(cdevsw) = { +#if __FreeBSD_version >= 502103 .d_version = D_VERSION, +#endif .d_open = DRM( open ), .d_close = DRM( close ), .d_read = DRM( read ), @@ -220,14 +222,21 @@ .d_poll = DRM( poll ), .d_mmap = DRM( mmap ), .d_name = DRIVER_NAME, +#if __FreeBSD_version >= 502103 .d_flags = D_TRACKCLOSE | D_NEEDGIANT, +#else + .d_maj = 145, + .d_flags = D_TRACKCLOSE, +#endif #if __FreeBSD_version < 500000 .d_bmaj = -1 #endif }; +#include "dev/drm/drm_pciids.h" + static drm_pci_id_list_t DRM(pciidlist)[] = { - DRIVER_PCI_IDS + DRM(PCI_IDS) }; static int DRM(probe)(device_t dev) @@ -511,7 +520,7 @@ DRM_DEBUG( "\n" ); - DRIVER_PRETAKEDOWN(); + DRIVER_PRETAKEDOWN(dev); #if __HAVE_IRQ if (dev->irq_enabled) DRM(irq_uninstall)( dev ); @@ -626,7 +635,7 @@ int retcode; #endif DRM_DEBUG( "\n" ); - DRIVER_PREINIT(); + DRIVER_PREINIT(dev); #ifdef __FreeBSD__ unit = device_get_unit(nbdev); @@ -704,7 +713,7 @@ DRIVER_DATE, unit ); - DRIVER_POSTINIT(); + DRIVER_POSTINIT(dev); return 0; ==== //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.18 2004/03/03 06:19:03 obrien Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.19 2004/06/11 03:26:59 anholt Exp $ */ #include @@ -78,6 +78,8 @@ #include #endif +#include "dev/drm/drm_linux_list.h" + #if __FreeBSD_version >= 400006 #define __REALLY_HAVE_AGP __HAVE_AGP #endif @@ -310,6 +312,11 @@ MALLOC_DECLARE(malloctype); #undef malloctype +#if __FreeBSD_version < 502109 +#define bus_alloc_resource_any(dev, type, rid, flags) \ + bus_alloc_resource(dev, type, rid, 0ul, ~0ul, 1, flags) +#endif + #if __FreeBSD_version >= 480000 #define cpu_to_le32(x) htole32(x) #define le32_to_cpu(x) le32toh(x) ==== //depot/projects/netperf_socket/sys/dev/drm/drm_sarea.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * \file drm_sarea.h * \brief SAREA definitions * - * \author Michel Dänzer + * \author Michel D�zer */ /* @@ -28,15 +28,29 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_sarea.h,v 1.2 2003/08/19 02:57:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sarea.h,v 1.3 2004/06/11 03:26:59 anholt Exp $ */ #ifndef _DRM_SAREA_H_ #define _DRM_SAREA_H_ +#include "dev/drm/drm.h" + +/* SAREA area needs to be at least a page */ +#if defined(__alpha__) +#define SAREA_MAX 0x2000 +#elif defined(__ia64__) +#define SAREA_MAX 0x10000 /* 64kB */ +#else +/* Intel 830M driver needs at least 8k SAREA */ +#define SAREA_MAX 0x2000 +#endif + /** Maximum number of drawables in the SAREA */ #define SAREA_MAX_DRAWABLES 256 +#define SAREA_DRAWABLE_CLAIMED_ENTRY 0x80000000 + /** SAREA drawable */ typedef struct drm_sarea_drawable { unsigned int stamp; ==== //depot/projects/netperf_socket/sys/dev/drm/mga.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/mga.h,v 1.4 2003/10/24 01:48:16 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/mga.h,v 1.5 2004/06/11 03:26:59 anholt Exp $ */ #ifndef __MGA_H__ @@ -66,12 +66,6 @@ [DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)] = { mga_dma_blit, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_MGA_GETPARAM)]= { mga_getparam, 1, 0 }, -#define DRIVER_PCI_IDS \ - {0x102b, 0x0521, 0, "Matrox G200 (AGP)"}, \ - {0x102b, 0x0525, 0, "Matrox G400/G450 (AGP)"}, \ - {0x102b, 0x2527, 0, "Matrox G550 (AGP)"}, \ - {0, 0, 0, NULL} - #define __HAVE_COUNTERS 3 #define __HAVE_COUNTER6 _DRM_STAT_IRQ #define __HAVE_COUNTER7 _DRM_STAT_PRIMARY @@ -79,7 +73,7 @@ /* Driver customization: */ -#define DRIVER_PRETAKEDOWN() do { \ +#define DRIVER_PRETAKEDOWN( dev ) do { \ mga_do_cleanup_dma( dev ); \ } while (0) ==== //depot/projects/netperf_socket/sys/dev/drm/mga_drm.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * Rewritten by: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/mga_drm.h,v 1.3 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/mga_drm.h,v 1.4 2004/06/11 03:26:59 anholt Exp $ */ #ifndef __MGA_DRM_H__ @@ -119,6 +119,8 @@ #define MGA_NR_TEX_REGIONS 16 #define MGA_LOG_MIN_TEX_REGION_SIZE 16 +#define DRM_MGA_IDLE_RETRY 2048 + #endif /* __MGA_SAREA_DEFINES__ */ @@ -232,16 +234,27 @@ /* MGA specific ioctls * The device specific ioctl range is 0x40 to 0x79. */ -#define DRM_IOCTL_MGA_INIT DRM_IOW( 0x40, drm_mga_init_t) -#define DRM_IOCTL_MGA_FLUSH DRM_IOW( 0x41, drm_lock_t) -#define DRM_IOCTL_MGA_RESET DRM_IO( 0x42) -#define DRM_IOCTL_MGA_SWAP DRM_IO( 0x43) -#define DRM_IOCTL_MGA_CLEAR DRM_IOW( 0x44, drm_mga_clear_t) -#define DRM_IOCTL_MGA_VERTEX DRM_IOW( 0x45, drm_mga_vertex_t) -#define DRM_IOCTL_MGA_INDICES DRM_IOW( 0x46, drm_mga_indices_t) -#define DRM_IOCTL_MGA_ILOAD DRM_IOW( 0x47, drm_mga_iload_t) -#define DRM_IOCTL_MGA_BLIT DRM_IOW( 0x48, drm_mga_blit_t) -#define DRM_IOCTL_MGA_GETPARAM DRM_IOWR(0x49, drm_mga_getparam_t) +#define DRM_MGA_INIT 0x00 +#define DRM_MGA_FLUSH 0x01 +#define DRM_MGA_RESET 0x02 +#define DRM_MGA_SWAP 0x03 +#define DRM_MGA_CLEAR 0x04 +#define DRM_MGA_VERTEX 0x05 +#define DRM_MGA_INDICES 0x06 +#define DRM_MGA_ILOAD 0x07 +#define DRM_MGA_BLIT 0x08 +#define DRM_MGA_GETPARAM 0x09 + +#define DRM_IOCTL_MGA_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INIT, drm_mga_init_t) +#define DRM_IOCTL_MGA_FLUSH DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, drm_lock_t) +#define DRM_IOCTL_MGA_RESET DRM_IO( DRM_COMMAND_BASE + DRM_MGA_RESET) +#define DRM_IOCTL_MGA_SWAP DRM_IO( DRM_COMMAND_BASE + DRM_MGA_SWAP) +#define DRM_IOCTL_MGA_CLEAR DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_CLEAR, drm_mga_clear_t) +#define DRM_IOCTL_MGA_VERTEX DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_VERTEX, drm_mga_vertex_t) +#define DRM_IOCTL_MGA_INDICES DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INDICES, drm_mga_indices_t) +#define DRM_IOCTL_MGA_ILOAD DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_ILOAD, drm_mga_iload_t) +#define DRM_IOCTL_MGA_BLIT DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_BLIT, drm_mga_blit_t) +#define DRM_IOCTL_MGA_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_GETPARAM, drm_mga_getparam_t) typedef struct _drm_mga_warp_index { int installed; @@ -332,7 +345,7 @@ typedef struct drm_mga_getparam { int param; - int *value; + void *value; } drm_mga_getparam_t; #endif ==== //depot/projects/netperf_socket/sys/dev/drm/r128.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/r128.h,v 1.5 2004/01/06 04:34:53 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/r128.h,v 1.6 2004/06/11 03:26:59 anholt Exp $ */ #ifndef __R128_H__ @@ -81,46 +81,6 @@ [DRM_IOCTL_NR(DRM_IOCTL_R128_INDIRECT)] = { r128_cce_indirect, 1, 1 }, \ [DRM_IOCTL_NR(DRM_IOCTL_R128_GETPARAM)] = { r128_getparam, 1, 0 }, -#define DRIVER_PCI_IDS \ - {0x1002, 0x4c45, 0, "ATI Rage 128 Mobility LE (PCI)"}, \ - {0x1002, 0x4c46, 0, "ATI Rage 128 Mobility LF (AGP)"}, \ - {0x1002, 0x4d46, 0, "ATI Rage 128 Mobility MF (AGP)"}, \ - {0x1002, 0x4d4c, 0, "ATI Rage 128 Mobility ML (AGP)"}, \ - {0x1002, 0x5041, 0, "ATI Rage 128 Pro PA (PCI)"}, \ - {0x1002, 0x5042, 0, "ATI Rage 128 Pro PB (AGP)"}, \ - {0x1002, 0x5043, 0, "ATI Rage 128 Pro PC (AGP)"}, \ - {0x1002, 0x5044, 0, "ATI Rage 128 Pro PD (PCI)"}, \ - {0x1002, 0x5045, 0, "ATI Rage 128 Pro PE (AGP)"}, \ - {0x1002, 0x5046, 0, "ATI Rage 128 Pro PF (AGP)"}, \ - {0x1002, 0x5047, 0, "ATI Rage 128 Pro PG (PCI)"}, \ - {0x1002, 0x5048, 0, "ATI Rage 128 Pro PH (AGP)"}, \ - {0x1002, 0x5049, 0, "ATI Rage 128 Pro PI (AGP)"}, \ - {0x1002, 0x504A, 0, "ATI Rage 128 Pro PJ (PCI)"}, \ - {0x1002, 0x504B, 0, "ATI Rage 128 Pro PK (AGP)"}, \ - {0x1002, 0x504C, 0, "ATI Rage 128 Pro PL (AGP)"}, \ - {0x1002, 0x504D, 0, "ATI Rage 128 Pro PM (PCI)"}, \ - {0x1002, 0x504E, 0, "ATI Rage 128 Pro PN (AGP)"}, \ - {0x1002, 0x504F, 0, "ATI Rage 128 Pro PO (AGP)"}, \ - {0x1002, 0x5050, 0, "ATI Rage 128 Pro PP (PCI)"}, \ - {0x1002, 0x5051, 0, "ATI Rage 128 Pro PQ (AGP)"}, \ - {0x1002, 0x5052, 0, "ATI Rage 128 Pro PR (PCI)"}, \ - {0x1002, 0x5053, 0, "ATI Rage 128 Pro PS (PCI)"}, \ - {0x1002, 0x5054, 0, "ATI Rage 128 Pro PT (AGP)"}, \ - {0x1002, 0x5055, 0, "ATI Rage 128 Pro PU (AGP)"}, \ - {0x1002, 0x5056, 0, "ATI Rage 128 Pro PV (PCI)"}, \ - {0x1002, 0x5057, 0, "ATI Rage 128 Pro PW (AGP)"}, \ - {0x1002, 0x5058, 0, "ATI Rage 128 Pro PX (AGP)"}, \ - {0x1002, 0x5245, 0, "ATI Rage 128 RE (PCI)"}, \ - {0x1002, 0x5246, 0, "ATI Rage 128 RF (AGP)"}, \ - {0x1002, 0x5247, 0, "ATI Rage 128 RG (AGP)"}, \ - {0x1002, 0x524b, 0, "ATI Rage 128 RK (PCI)"}, \ - {0x1002, 0x524c, 0, "ATI Rage 128 RL (AGP)"}, \ - {0x1002, 0x534d, 0, "ATI Rage 128 SM (AGP)"}, \ - {0x1002, 0x5446, 0, "ATI Rage 128 Pro Ultra TF (AGP)"}, \ - {0x1002, 0x544C, 0, "ATI Rage 128 Pro Ultra TL (AGP)"}, \ - {0x1002, 0x5452, 0, "ATI Rage 128 Pro Ultra TR (AGP)"}, \ - {0, 0, 0, NULL} - /* Driver customization: */ #define DRIVER_PRERELEASE() do { \ @@ -132,7 +92,7 @@ } \ } while (0) -#define DRIVER_PRETAKEDOWN() do { \ +#define DRIVER_PRETAKEDOWN(dev) do { \ r128_do_cleanup_cce( dev ); \ } while (0) ==== //depot/projects/netperf_socket/sys/dev/drm/r128_drm.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * Gareth Hughes * Kevin E. Martin * - * $FreeBSD: src/sys/dev/drm/r128_drm.h,v 1.4 2003/08/19 02:57:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/r128_drm.h,v 1.5 2004/06/11 03:26:59 anholt Exp $ */ #ifndef __R128_DRM_H__ @@ -178,24 +178,47 @@ /* Rage 128 specific ioctls * The device specific ioctl range is 0x40 to 0x79. */ -#define DRM_IOCTL_R128_INIT DRM_IOW( 0x40, drm_r128_init_t) -#define DRM_IOCTL_R128_CCE_START DRM_IO( 0x41) -#define DRM_IOCTL_R128_CCE_STOP DRM_IOW( 0x42, drm_r128_cce_stop_t) -#define DRM_IOCTL_R128_CCE_RESET DRM_IO( 0x43) -#define DRM_IOCTL_R128_CCE_IDLE DRM_IO( 0x44) -#define DRM_IOCTL_R128_RESET DRM_IO( 0x46) -#define DRM_IOCTL_R128_SWAP DRM_IO( 0x47) -#define DRM_IOCTL_R128_CLEAR DRM_IOW( 0x48, drm_r128_clear_t) -#define DRM_IOCTL_R128_VERTEX DRM_IOW( 0x49, drm_r128_vertex_t) -#define DRM_IOCTL_R128_INDICES DRM_IOW( 0x4a, drm_r128_indices_t) -#define DRM_IOCTL_R128_BLIT DRM_IOW( 0x4b, drm_r128_blit_t) -#define DRM_IOCTL_R128_DEPTH DRM_IOW( 0x4c, drm_r128_depth_t) -#define DRM_IOCTL_R128_STIPPLE DRM_IOW( 0x4d, drm_r128_stipple_t) -#define DRM_IOCTL_R128_INDIRECT DRM_IOWR(0x4f, drm_r128_indirect_t) -#define DRM_IOCTL_R128_FULLSCREEN DRM_IOW( 0x50, drm_r128_fullscreen_t) -#define DRM_IOCTL_R128_CLEAR2 DRM_IOW( 0x51, drm_r128_clear2_t) -#define DRM_IOCTL_R128_GETPARAM DRM_IOW( 0x52, drm_r128_getparam_t) -#define DRM_IOCTL_R128_FLIP DRM_IO( 0x53) +#define DRM_R128_INIT 0x00 +#define DRM_R128_CCE_START 0x01 +#define DRM_R128_CCE_STOP 0x02 +#define DRM_R128_CCE_RESET 0x03 +#define DRM_R128_CCE_IDLE 0x04 +/* 0x05 not used */ +#define DRM_R128_RESET 0x06 +#define DRM_R128_SWAP 0x07 +#define DRM_R128_CLEAR 0x08 +#define DRM_R128_VERTEX 0x09 +#define DRM_R128_INDICES 0x0a +#define DRM_R128_BLIT 0x0b +#define DRM_R128_DEPTH 0x0c +#define DRM_R128_STIPPLE 0x0d +/* 0x0e not used */ +#define DRM_R128_INDIRECT 0x0f +#define DRM_R128_FULLSCREEN 0x10 +#define DRM_R128_CLEAR2 0x11 +#define DRM_R128_GETPARAM 0x12 +#define DRM_R128_FLIP 0x13 + +#define DRM_IOCTL_R128_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_R128_INIT, drm_r128_init_t) +#define DRM_IOCTL_R128_CCE_START DRM_IO( DRM_COMMAND_BASE + DRM_R128_CCE_START) +#define DRM_IOCTL_R128_CCE_STOP DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CCE_STOP, drm_r128_cce_stop_t) +#define DRM_IOCTL_R128_CCE_RESET DRM_IO( DRM_COMMAND_BASE + DRM_R128_CCE_RESET) +#define DRM_IOCTL_R128_CCE_IDLE DRM_IO( DRM_COMMAND_BASE + DRM_R128_CCE_IDLE) +/* 0x05 not used */ +#define DRM_IOCTL_R128_RESET DRM_IO( DRM_COMMAND_BASE + DRM_R128_RESET) +#define DRM_IOCTL_R128_SWAP DRM_IO( DRM_COMMAND_BASE + DRM_R128_SWAP) +#define DRM_IOCTL_R128_CLEAR DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR, drm_r128_clear_t) +#define DRM_IOCTL_R128_VERTEX DRM_IOW( DRM_COMMAND_BASE + DRM_R128_VERTEX, drm_r128_vertex_t) +#define DRM_IOCTL_R128_INDICES DRM_IOW( DRM_COMMAND_BASE + DRM_R128_INDICES, drm_r128_indices_t) +#define DRM_IOCTL_R128_BLIT DRM_IOW( DRM_COMMAND_BASE + DRM_R128_BLIT, drm_r128_blit_t) +#define DRM_IOCTL_R128_DEPTH DRM_IOW( DRM_COMMAND_BASE + DRM_R128_DEPTH, drm_r128_depth_t) +#define DRM_IOCTL_R128_STIPPLE DRM_IOW( DRM_COMMAND_BASE + DRM_R128_STIPPLE, drm_r128_stipple_t) +/* 0x0e not used */ +#define DRM_IOCTL_R128_INDIRECT DRM_IOWR(DRM_COMMAND_BASE + DRM_R128_INDIRECT, drm_r128_indirect_t) +#define DRM_IOCTL_R128_FULLSCREEN DRM_IOW( DRM_COMMAND_BASE + DRM_R128_FULLSCREEN, drm_r128_fullscreen_t) +#define DRM_IOCTL_R128_CLEAR2 DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR2, drm_r128_clear2_t) +#define DRM_IOCTL_R128_GETPARAM DRM_IOW( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t) +#define DRM_IOCTL_R128_FLIP DRM_IO( DRM_COMMAND_BASE + DRM_R128_FLIP) typedef struct drm_r128_init { enum { @@ -318,7 +341,7 @@ typedef struct drm_r128_getparam { int param; - int *value; + void *value; } drm_r128_getparam_t; #endif ==== //depot/projects/netperf_socket/sys/dev/drm/r128_state.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 11 20:01:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABD0B16A4D1; Fri, 11 Jun 2004 20:01:44 +0000 (GMT) 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 84F7816A4CE for ; Fri, 11 Jun 2004 20:01:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BEA843D5D for ; Fri, 11 Jun 2004 20:01:44 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5BK1eam026889 for ; Fri, 11 Jun 2004 20:01:40 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5BK1d37026877 for perforce@freebsd.org; Fri, 11 Jun 2004 20:01:39 GMT (envelope-from julian@freebsd.org) Date: Fri, 11 Jun 2004 20:01:39 GMT Message-Id: <200406112001.i5BK1d37026877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 54654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 20:01:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=54654 Change 54654 by julian@julian_ref on 2004/06/11 20:01:30 IFC (and merge in changes originally from here). Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/nsched/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/nsched/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/nsched/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/nsched/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/nsched/sys/conf/NOTES#5 integrate .. //depot/projects/nsched/sys/conf/options#6 integrate .. //depot/projects/nsched/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/nsched/sys/dev/bktr/bktr_mem.c#3 integrate .. //depot/projects/nsched/sys/dev/cy/cy.c#4 integrate .. //depot/projects/nsched/sys/dev/digi/digi.c#4 integrate .. //depot/projects/nsched/sys/dev/drm/drm.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/drm_drv.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/drm_linux_list.h#1 branch .. //depot/projects/nsched/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/drm_pciids.h#1 branch .. //depot/projects/nsched/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/mga.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/r128.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/nsched/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/nsched/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/nsched/sys/dev/drm/sis.h#2 integrate .. //depot/projects/nsched/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/nsched/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/nsched/sys/dev/drm/tdfx.h#2 integrate .. //depot/projects/nsched/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/nsched/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/nsched/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/nsched/sys/dev/rp/rp.c#3 integrate .. //depot/projects/nsched/sys/dev/si/si.c#3 integrate .. //depot/projects/nsched/sys/dev/sio/sio.c#5 integrate .. //depot/projects/nsched/sys/dev/sx/sx.c#3 integrate .. //depot/projects/nsched/sys/dev/twe/twe.c#3 integrate .. //depot/projects/nsched/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/nsched/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/nsched/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/nsched/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_kse.c#12 integrate .. //depot/projects/nsched/sys/kern/kern_prot.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_resource.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_sig.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#21 integrate .. //depot/projects/nsched/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/nsched/sys/kern/tty.c#4 integrate .. //depot/projects/nsched/sys/kern/tty_compat.c#4 integrate .. //depot/projects/nsched/sys/kern/tty_pty.c#4 integrate .. //depot/projects/nsched/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/nsched/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/nsched/sys/net/bpf.c#3 integrate .. //depot/projects/nsched/sys/net/raw_cb.c#3 integrate .. //depot/projects/nsched/sys/netinet/igmp.c#3 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/nsched/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/nsched/sys/pc98/pc98/sio.c#5 integrate .. //depot/projects/nsched/sys/sys/ioctl.h#3 integrate .. //depot/projects/nsched/sys/sys/signal.h#3 integrate .. //depot/projects/nsched/sys/vm/vm_mmap.c#4 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/machdep.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.219 2004/04/01 20:56:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.220 2004/06/11 11:16:17 phk Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1180,7 +1180,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - rndfsize); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else @@ -1304,7 +1304,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sfp = (struct sigframe4 *)((caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - rndfsize); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else @@ -1428,7 +1428,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sfp = (struct sigframe *)((caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - rndfsize); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else @@ -1543,7 +1543,7 @@ return (EINVAL); PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) /* * Restore the user-supplied information */ @@ -1633,7 +1633,7 @@ alpha_pal_wrusp(uc.uc_mcontext.mc_regs[R_SP]); PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) if (uc.uc_mcontext.mc_onstack & 1) td->td_sigstk.ss_flags |= SS_ONSTACK; else @@ -1709,7 +1709,7 @@ alpha_pal_wrusp(uc.uc_mcontext.mc_regs[R_SP]); PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) if (uc.uc_mcontext.mc_onstack & 1) td->td_sigstk.ss_flags |= SS_ONSTACK; else ==== //depot/projects/nsched/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.609 2004/06/10 20:30:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.610 2004/06/11 11:16:18 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -262,7 +262,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sp = td->td_sigstk.ss_sp + td->td_sigstk.ss_size - sizeof(struct sigframe); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else @@ -403,7 +403,7 @@ bcopy(&ucp->uc_mcontext.mc_rdi, regs, sizeof(*regs)); PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) if (ucp->uc_mcontext.mc_onstack & 1) td->td_sigstk.ss_flags |= SS_ONSTACK; else ==== //depot/projects/nsched/sys/boot/i386/boot0/boot0.S#3 (text+ko) ==== @@ -13,7 +13,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.8 2004/05/14 20:28:31 ru Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.9 2004/06/11 09:45:18 phk Exp $ */ /* A 512-byte boot manager. */ @@ -94,15 +94,11 @@ main: #ifdef SIO /* - * Initialize the serial port. - * Must save DX (contains drive number) + * Initialize the serial port. bioscom preserves the driver number in DX. */ - pushw %dx # Save - xorw %dx,%dx # Port: COM1 movb COMSPEED,%al # defined by Makefile movb $0x00,%ah # BIOS: Set COM Port - int $0x14 # Parameters - popw %dx # Restore + call bioscom #endif /* SIO */ /* * Check what flags were loaded with us, specifically, Use a predefined Drive. @@ -199,23 +195,21 @@ callw putx # item /* * Now that we've printed the drive (if we needed to), display a prompt. - * Get ready for the input by noting the time. */ main.7: movw $prompt,%si # Display callw putstr # prompt movb _OPT(%bp),%dl # Display decw %si # default callw putkey # key -main.7_1: +/* + * Start of input loop. Beep and take note of time + */ +main.10: movb $ASCII_BEL,%al # Signal + callw putchr # beep! xorb %ah,%ah # BIOS: Get int $0x1a # system time -#ifndef SIO movw %dx,%di # Ticks when - addw _TICKS(%bp),%di # timeout -#else /* SIO */ - movw %dx,%si # Ticks when - addw _TICKS(%bp),%si # timeout -#endif /* SIO */ + addw _TICKS(%bp),%di # timeout /* * Busy loop, looking for keystrokes but * keeping one eye on the time. @@ -226,19 +220,14 @@ int $0x16 # for keypress jnz main.11 # Have one #else /* SIO */ - xorw %dx,%dx # Use COM1 movb $0x03,%ah # BIOS: Read COM - int $0x14 # Status + call bioscom testb $0x01,%ah # Check line status jnz main.11 # (bit 1 indicates input) #endif /* SIO */ xorb %ah,%ah # BIOS: Get int $0x1a # system time -#ifndef SIO cmpw %di,%dx # Timeout? -#else /* SIO */ - cmpw %si,%dx # Timeout? -#endif /* SIO */ jb main.8 # No /* * If timed out or defaulting, come here. @@ -246,18 +235,6 @@ main.9: movb _OPT(%bp),%al # Load default jmp main.12 # Join common code /* - * User's last try was bad, beep in displeasure. - * Since nothing was printed, just continue on as if the user - * hadn't done anything. This gives the effect of the user getting a beep - * for all bad keystrokes but no action until either the timeout - * occurs or the user hits a good key. - */ -main.10: movb $ASCII_BEL,%al # Signal - callw putchr # error -#ifdef SIO - jmp main.7_1 # Go back -#endif /* SIO */ -/* * Get the keystroke. */ main.11: @@ -267,7 +244,7 @@ movb %ah,%al # Scan code #else /* SIO */ movb $0x02,%ah # BIOS: Receive - int $0x14 # COM Byte + call bioscom #endif /* SIO */ /* * If it's CR act as if timed out. @@ -384,22 +361,25 @@ jmp putstr # Continue putstr.2: andb $~0x80,%al # Clear MSB +#ifndef SIO putchr: -#ifndef SIO pushw %bx # Save movw $0x7,%bx # Page:attribute movb $0xe,%ah # BIOS: Display int $0x10 # character popw %bx # Restore + retw # To caller #else /* SIO */ +putchr: + movb $0x01,%ah # BIOS: Send + xorw %cx,%cx # No timeout +bioscom: pushw %dx # Save xorw %dx,%dx # Use COM1 - xorw %cx,%cx # No timeout - movb $0x01,%ah # BIOS: Send int $0x14 # Character popw %dx # Restore + retw # To caller #endif /* SIO */ - retw # To caller /* One-sector disk I/O routine */ @@ -426,13 +406,8 @@ /* Menu strings */ -#ifndef SIO item: .ascii " "; .byte ' '|0x80 prompt: .ascii "\nDefault:"; .byte ' '|0x80 -#else /* SIO */ -item: .ascii " "; .byte ' '|0x80 -prompt: .ascii "\nDef:"; .byte ' '|0x80 -#endif /* SIO */ crlf: .ascii "\r"; .byte '\n'|0x80 /* Partition type tables */ ==== //depot/projects/nsched/sys/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.153 2004/03/17 19:59:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.154 2004/06/11 11:16:18 phk Exp $"); #include "opt_mac.h" @@ -1299,7 +1299,7 @@ /* * The FreeBSD native getpid(2), getgid(2) and getuid(2) also modify - * td->td_retval[1] when COMPAT_43 or COMPAT_SUNOS is defined. This + * td->td_retval[1] when COMPAT_43 is defined. This * globbers registers that are assumed to be preserved. The following * lightweight syscalls fixes this. See also linux_getgid16() and * linux_getuid16() in linux_uid16.c. ==== //depot/projects/nsched/sys/compat/linux/linux_uid16.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.12 2003/10/21 11:00:33 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.13 2004/06/11 11:16:18 phk Exp $"); #include #include @@ -190,7 +190,7 @@ /* * The FreeBSD native getgid(2) and getuid(2) also modify td->td_retval[1] - * when COMPAT_43 or COMPAT_SUNOS is defined. This globbers registers that + * when COMPAT_43 is defined. This globbers registers that * are assumed to be preserved. The following lightweight syscalls fixes * this. See also linux_getpid(2), linux_getgid(2) and linux_getuid(2) in * linux_misc.c ==== //depot/projects/nsched/sys/conf/NOTES#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1229 2004/06/10 05:43:36 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1230 2004/06/11 11:16:19 phk Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -210,12 +210,6 @@ # options COMPAT_43 -# -# Be compatible with SunOS. The COMPAT_43 option above pulls in most -# (all?) of the changes that this option turns on. -# -options COMPAT_SUNOS - # Enable FreeBSD4 compatibility syscalls options COMPAT_FREEBSD4 ==== //depot/projects/nsched/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.451 2004/05/20 10:37:11 pjd Exp $ +# $FreeBSD: src/sys/conf/options,v 1.452 2004/06/11 11:16:19 phk Exp $ # # On the handling of kernel options # @@ -52,7 +52,6 @@ CODA_COMPAT_5 opt_coda.h COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h -COMPAT_SUNOS opt_compat.h COMPILING_LINT opt_global.h CONSPEED opt_comconsole.h CY_PCI_FASTINTR ==== //depot/projects/nsched/sys/dev/ata/ata-lowlevel.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.37 2004/06/01 11:34:46 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.38 2004/06/11 07:39:15 sos Exp $"); #include "opt_ata.h" #include @@ -532,7 +532,7 @@ ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); DELAY(10); ostat0 = ATA_IDX_INB(ch, ATA_STATUS); - if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5 && ostat0 != 0x7f) { + if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5) { stat0 = ATA_S_BUSY; mask |= 0x01; } @@ -543,7 +543,7 @@ /* in some setups we dont want to test for a slave */ if (!(ch->flags & ATA_NO_SLAVE)) { - if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5 && ostat1 != 0x7f) { + if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5) { stat1 = ATA_S_BUSY; mask |= 0x02; } @@ -637,15 +637,10 @@ DELAY(100000); } - if (stat0 & ATA_S_BUSY) - mask &= ~0x01; - if (stat1 & ATA_S_BUSY) - mask &= ~0x02; - if (bootverbose) ata_printf(ch, -1, - "reset tp2 mask=%02x stat0=%02x stat1=%02x devices=0x%b\n", - mask, stat0, stat1, ch->devices, + "reset tp2 stat0=%02x stat1=%02x devices=0x%b\n", + stat0, stat1, ch->devices, "\20\4ATAPI_SLAVE\3ATAPI_MASTER\2ATA_SLAVE\1ATA_MASTER"); } ==== //depot/projects/nsched/sys/dev/bktr/bktr_mem.c#3 (text+ko) ==== @@ -1,9 +1,5 @@ - - -#include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.8 2004/05/30 20:08:27 phk Exp $"); /* - * This is prt of the Driver for Video Capture Cards (Frame grabbers) + * This is part of the Driver for Video Capture Cards (Frame grabbers) * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879 * chipset. * Copyright Roger Hardiman. @@ -47,6 +43,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.10 2004/06/11 18:47:44 schweikh Exp $"); #include #include @@ -55,12 +53,12 @@ #include struct memory_pointers { - int addresses_stored; - vm_offset_t dma_prog; - vm_offset_t odd_dma_prog; - vm_offset_t vbidata; - vm_offset_t vbibuffer; - vm_offset_t buf; + int addresses_stored; + vm_offset_t dma_prog; + vm_offset_t odd_dma_prog; + vm_offset_t vbidata; + vm_offset_t vbibuffer; + vm_offset_t buf; } memory_pointers; static struct memory_pointers memory_list[BKTR_MEM_MAX_DEVICES]; @@ -72,39 +70,37 @@ switch (type) { case MOD_LOAD: + printf("bktr_mem: memory holder loaded\n"); + /* + * bzero((caddr_t)memory_list, sizeof(memory_list)); + * causes a panic. So use a simple for loop for now. + */ { - printf("bktr_mem: memory holder loaded\n"); -/* - * bzero causes a panic. - bzero((caddr_t)memory_list, sizeof(memory_list)); - * So use a simple for loop for now. -*/ - {int x; - unsigned char *d = (unsigned char *)memory_list; - for (x=0; x< sizeof(memory_list); x++) { - d[x]=0; - } + int x; + unsigned char *d; + + d = (unsigned char *)memory_list; + for (x = 0; x < sizeof(memory_list); x++) + d[x] = 0; } return 0; - } case MOD_UNLOAD: - { printf("bktr_mem: memory holder cannot be unloaded\n"); return EBUSY; - } default: break; } - return 0; -}; + return (0); +} /*************************************************************/ int -bktr_has_stored_addresses(int unit) { +bktr_has_stored_addresses(int unit) +{ - if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) { - printf("bktr_mem: Unit number %d invalid\n",unit); + if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) { + printf("bktr_mem: Unit number %d invalid\n", unit); return 0; } @@ -114,64 +110,83 @@ /*************************************************************/ void -bktr_store_address(int unit, int type, vm_offset_t addr) { +bktr_store_address(int unit, int type, vm_offset_t addr) +{ - if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) { - printf("bktr_mem: Unit number %d invalid for memory type %d, address 0x%x\n" - ,unit,type,addr); + if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) { + printf("bktr_mem: Unit number %d invalid for memory type %d, address 0x%x\n", + unit, type, addr); return; } switch (type) { - case BKTR_MEM_DMA_PROG: memory_list[unit].dma_prog = addr; - memory_list[unit].addresses_stored = 1; - break; - case BKTR_MEM_ODD_DMA_PROG: memory_list[unit].odd_dma_prog = addr; - memory_list[unit].addresses_stored = 1; - break; - case BKTR_MEM_VBIDATA: memory_list[unit].vbidata = addr; - memory_list[unit].addresses_stored = 1; - break; - case BKTR_MEM_VBIBUFFER: memory_list[unit].vbibuffer = addr; - memory_list[unit].addresses_stored = 1; - break; - case BKTR_MEM_BUF: memory_list[unit].buf = addr; - memory_list[unit].addresses_stored = 1; - break; - default: printf("bktr_mem: Invalid memory type %d for bktr%d, address 0x%xn", - type,unit,addr); - break; + case BKTR_MEM_DMA_PROG: + memory_list[unit].dma_prog = addr; + memory_list[unit].addresses_stored = 1; + break; + case BKTR_MEM_ODD_DMA_PROG: + memory_list[unit].odd_dma_prog = addr; + memory_list[unit].addresses_stored = 1; + break; + case BKTR_MEM_VBIDATA: + memory_list[unit].vbidata = addr; + memory_list[unit].addresses_stored = 1; + break; + case BKTR_MEM_VBIBUFFER: + memory_list[unit].vbibuffer = addr; + memory_list[unit].addresses_stored = 1; + break; + case BKTR_MEM_BUF: + memory_list[unit].buf = addr; + memory_list[unit].addresses_stored = 1; + break; + default: + printf("bktr_mem: Invalid memory type %d for bktr%d, address 0x%xn", + type, unit, addr); + break; } } /*************************************************************/ vm_offset_t -bktr_retrieve_address(int unit, int type) { +bktr_retrieve_address(int unit, int type) +{ - if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) { - printf("bktr_mem: Unit number %d too large for memory type %d\n",unit,type); - return NULL; + if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) { + printf("bktr_mem: Unit number %d too large for memory type %d\n", + unit, type); + return (0); } switch (type) { - case BKTR_MEM_DMA_PROG: return memory_list[unit].dma_prog; - case BKTR_MEM_ODD_DMA_PROG: return memory_list[unit].odd_dma_prog; - case BKTR_MEM_VBIDATA: return memory_list[unit].vbidata; - case BKTR_MEM_VBIBUFFER: return memory_list[unit].vbibuffer; - case BKTR_MEM_BUF: return memory_list[unit].buf; - default: printf("bktr_mem: Invalid memory type %d for bktr%d",type,unit); - return NULL; + case BKTR_MEM_DMA_PROG: + return memory_list[unit].dma_prog; + case BKTR_MEM_ODD_DMA_PROG: + return memory_list[unit].odd_dma_prog; + case BKTR_MEM_VBIDATA: + return memory_list[unit].vbidata; + case BKTR_MEM_VBIBUFFER: + return memory_list[unit].vbibuffer; + case BKTR_MEM_BUF: + return memory_list[unit].buf; + default: + printf("bktr_mem: Invalid memory type %d for bktr%d", + type, unit); + return (0); } } /*************************************************************/ static moduledata_t bktr_mem_mod = { - "bktr_mem", - bktr_mem_modevent, - 0 + "bktr_mem", + bktr_mem_modevent, + 0 }; -/* The load order is First and module type is Driver to make sure bktr_mem - loads (and initialises) before bktr when both are loaded together */ + +/* + * The load order is First and module type is Driver to make sure bktr_mem + * loads (and initialises) before bktr when both are loaded together. + */ DECLARE_MODULE(bktr_mem, bktr_mem_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(bktr_mem, 1); ==== //depot/projects/nsched/sys/dev/cy/cy.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.150 2004/06/04 21:55:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.151 2004/06/11 11:16:20 phk Exp $"); #include "opt_compat.h" @@ -1539,7 +1539,7 @@ int mynor; int s; struct tty *tp; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) int oldcmd; struct termios term; #endif @@ -1580,7 +1580,7 @@ } } tp = com->tp; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; error = ttsetcompat(tp, &cmd, data, &term); ==== //depot/projects/nsched/sys/dev/digi/digi.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.c,v 1.45 2004/06/04 21:55:49 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.46 2004/06/11 11:16:20 phk Exp $ */ /*- @@ -1072,7 +1072,7 @@ struct digi_softc *sc; struct digi_p *port; struct tty *tp; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) int oldcmd; struct termios term; #endif @@ -1226,7 +1226,7 @@ } tp = port->tp; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#if defined(COMPAT_43) term = tp->t_termios; oldcmd = cmd; error = ttsetcompat(tp, &cmd, data, &term); ==== //depot/projects/nsched/sys/dev/drm/drm.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm.h,v 1.6 2003/11/12 20:56:30 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm.h,v 1.7 2004/06/11 03:26:59 anholt Exp $ */ @@ -137,6 +137,18 @@ unsigned int age; } drm_tex_region_t; +/** + * Hardware lock. + * + * The lock structure is a simple cache-line aligned integer. To avoid + * processor bus contention on a multiprocessor system, there should not be any + * other data stored in the same cache line. + */ +typedef struct drm_hw_lock { + __volatile__ unsigned int lock; /**< lock variable */ + char padding[60]; /**< Pad to cache line */ +} drm_hw_lock_t; + /** * DRM_IOCTL_VERSION ioctl argument type. ==== //depot/projects/nsched/sys/dev/drm/drmP.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.9 2004/01/06 04:34:52 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.10 2004/06/11 03:26:59 anholt Exp $ */ #ifndef _DRM_P_H_ @@ -197,11 +197,6 @@ drm_freelist_t freelist; } drm_buf_entry_t; -typedef struct drm_hw_lock { - __volatile__ unsigned int lock; - char padding[60]; /* Pad to cache line */ -} drm_hw_lock_t; - typedef TAILQ_HEAD(drm_file_list, drm_file) drm_file_list_t; struct drm_file { TAILQ_ENTRY(drm_file) link; ==== //depot/projects/nsched/sys/dev/drm/drm_drv.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.23 2004/03/03 08:27:33 obrien Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.24 2004/06/11 03:26:59 anholt Exp $ */ /* @@ -79,16 +79,16 @@ #endif #ifndef DRIVER_PREINIT -#define DRIVER_PREINIT() +#define DRIVER_PREINIT(dev) do {} while (0) #endif #ifndef DRIVER_POSTINIT -#define DRIVER_POSTINIT() +#define DRIVER_POSTINIT(dev) do {} while (0) #endif #ifndef DRIVER_PRERELEASE #define DRIVER_PRERELEASE() #endif #ifndef DRIVER_PRETAKEDOWN -#define DRIVER_PRETAKEDOWN() +#define DRIVER_PRETAKEDOWN(dev) #endif #ifndef DRIVER_POSTCLEANUP #define DRIVER_POSTCLEANUP() @@ -212,7 +212,9 @@ #ifdef __FreeBSD__ static struct cdevsw DRM(cdevsw) = { +#if __FreeBSD_version >= 502103 .d_version = D_VERSION, +#endif .d_open = DRM( open ), .d_close = DRM( close ), .d_read = DRM( read ), @@ -220,14 +222,21 @@ .d_poll = DRM( poll ), .d_mmap = DRM( mmap ), .d_name = DRIVER_NAME, +#if __FreeBSD_version >= 502103 .d_flags = D_TRACKCLOSE | D_NEEDGIANT, +#else + .d_maj = 145, + .d_flags = D_TRACKCLOSE, +#endif #if __FreeBSD_version < 500000 .d_bmaj = -1 #endif }; +#include "dev/drm/drm_pciids.h" + static drm_pci_id_list_t DRM(pciidlist)[] = { - DRIVER_PCI_IDS + DRM(PCI_IDS) }; static int DRM(probe)(device_t dev) @@ -511,7 +520,7 @@ DRM_DEBUG( "\n" ); - DRIVER_PRETAKEDOWN(); + DRIVER_PRETAKEDOWN(dev); #if __HAVE_IRQ if (dev->irq_enabled) DRM(irq_uninstall)( dev ); @@ -626,7 +635,7 @@ int retcode; #endif DRM_DEBUG( "\n" ); - DRIVER_PREINIT(); + DRIVER_PREINIT(dev); #ifdef __FreeBSD__ unit = device_get_unit(nbdev); @@ -704,7 +713,7 @@ DRIVER_DATE, unit ); - DRIVER_POSTINIT(); + DRIVER_POSTINIT(dev); return 0; ==== //depot/projects/nsched/sys/dev/drm/drm_os_freebsd.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.18 2004/03/03 06:19:03 obrien Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.19 2004/06/11 03:26:59 anholt Exp $ */ #include @@ -78,6 +78,8 @@ #include #endif +#include "dev/drm/drm_linux_list.h" + #if __FreeBSD_version >= 400006 #define __REALLY_HAVE_AGP __HAVE_AGP #endif @@ -310,6 +312,11 @@ MALLOC_DECLARE(malloctype); #undef malloctype +#if __FreeBSD_version < 502109 +#define bus_alloc_resource_any(dev, type, rid, flags) \ + bus_alloc_resource(dev, type, rid, 0ul, ~0ul, 1, flags) +#endif + #if __FreeBSD_version >= 480000 #define cpu_to_le32(x) htole32(x) #define le32_to_cpu(x) le32toh(x) ==== //depot/projects/nsched/sys/dev/drm/drm_sarea.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * \file drm_sarea.h * \brief SAREA definitions * - * \author Michel Dänzer + * \author Michel D�zer */ /* @@ -28,15 +28,29 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * - * $FreeBSD: src/sys/dev/drm/drm_sarea.h,v 1.2 2003/08/19 02:57:31 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_sarea.h,v 1.3 2004/06/11 03:26:59 anholt Exp $ */ #ifndef _DRM_SAREA_H_ #define _DRM_SAREA_H_ +#include "dev/drm/drm.h" + +/* SAREA area needs to be at least a page */ +#if defined(__alpha__) +#define SAREA_MAX 0x2000 +#elif defined(__ia64__) +#define SAREA_MAX 0x10000 /* 64kB */ +#else +/* Intel 830M driver needs at least 8k SAREA */ +#define SAREA_MAX 0x2000 +#endif + /** Maximum number of drawables in the SAREA */ #define SAREA_MAX_DRAWABLES 256 +#define SAREA_DRAWABLE_CLAIMED_ENTRY 0x80000000 + /** SAREA drawable */ typedef struct drm_sarea_drawable { unsigned int stamp; ==== //depot/projects/nsched/sys/dev/drm/mga.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/mga.h,v 1.4 2003/10/24 01:48:16 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/mga.h,v 1.5 2004/06/11 03:26:59 anholt Exp $ */ #ifndef __MGA_H__ @@ -66,12 +66,6 @@ [DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)] = { mga_dma_blit, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_MGA_GETPARAM)]= { mga_getparam, 1, 0 }, -#define DRIVER_PCI_IDS \ - {0x102b, 0x0521, 0, "Matrox G200 (AGP)"}, \ - {0x102b, 0x0525, 0, "Matrox G400/G450 (AGP)"}, \ - {0x102b, 0x2527, 0, "Matrox G550 (AGP)"}, \ - {0, 0, 0, NULL} - #define __HAVE_COUNTERS 3 #define __HAVE_COUNTER6 _DRM_STAT_IRQ #define __HAVE_COUNTER7 _DRM_STAT_PRIMARY @@ -79,7 +73,7 @@ /* Driver customization: */ -#define DRIVER_PRETAKEDOWN() do { \ +#define DRIVER_PRETAKEDOWN( dev ) do { \ mga_do_cleanup_dma( dev ); \ } while (0) ==== //depot/projects/nsched/sys/dev/drm/mga_drm.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * Rewritten by: * Gareth Hughes * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 11 20:10:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3727B16A4D1; Fri, 11 Jun 2004 20:10:57 +0000 (GMT) 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 0C5E216A4CE for ; Fri, 11 Jun 2004 20:10:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E379043D2D for ; Fri, 11 Jun 2004 20:10:56 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5BKApsc029321 for ; Fri, 11 Jun 2004 20:10:51 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5BKApIO029318 for perforce@freebsd.org; Fri, 11 Jun 2004 20:10:51 GMT (envelope-from julian@freebsd.org) Date: Fri, 11 Jun 2004 20:10:51 GMT Message-Id: <200406112010.i5BKApIO029318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 54655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 20:10:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=54655 Change 54655 by julian@julian_ref on 2004/06/11 20:10:32 We now always have a mp_ncpus Affected files ... .. //depot/projects/nsched/sys/kern/kern_thread.c#22 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_thread.c#22 (text+ko) ==== @@ -85,11 +85,7 @@ int error, new_val; int def_val; -#ifdef SMP def_val = mp_ncpus; -#else - def_val = 1; -#endif if (virtual_cpu == 0) new_val = def_val; else From owner-p4-projects@FreeBSD.ORG Fri Jun 11 21:44:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81A8A16A4D1; Fri, 11 Jun 2004 21:44:13 +0000 (GMT) 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 3B56716A4CE for ; Fri, 11 Jun 2004 21:44:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 323BF43D41 for ; Fri, 11 Jun 2004 21:44:13 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5BLhjvY056607 for ; Fri, 11 Jun 2004 21:43:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5BLhilp056604 for perforce@freebsd.org; Fri, 11 Jun 2004 21:43:44 GMT (envelope-from marcel@freebsd.org) Date: Fri, 11 Jun 2004 21:43:44 GMT Message-Id: <200406112143.i5BLhilp056604@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 Subject: PERFORCE change 54657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 21:44:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=54657 Change 54657 by marcel@marcel_nfs on 2004/06/11 21:43:15 IFC @54656 Affected files ... .. //depot/projects/gdb/etc/etc.arm/ttys#1 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#4 integrate .. //depot/projects/gdb/sbin/md5/Makefile#3 integrate .. //depot/projects/gdb/sbin/md5/md5.1#3 integrate .. //depot/projects/gdb/sbin/md5/md5.c#2 integrate .. //depot/projects/gdb/sbin/sunlabel/sunlabel.c#4 integrate .. //depot/projects/gdb/sys/alpha/alpha/machdep.c#10 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#8 integrate .. //depot/projects/gdb/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/gdb/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/gdb/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/gdb/sys/conf/NOTES#23 integrate .. //depot/projects/gdb/sys/conf/files.alpha#6 integrate .. //depot/projects/gdb/sys/conf/options#21 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_mem.c#3 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#6 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#6 integrate .. //depot/projects/gdb/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/gdb/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/gdb/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/gdb/sys/dev/rp/rp.c#5 integrate .. //depot/projects/gdb/sys/dev/si/si.c#5 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#13 integrate .. //depot/projects/gdb/sys/dev/sx/sx.c#4 integrate .. //depot/projects/gdb/sys/dev/twe/twe.c#5 integrate .. //depot/projects/gdb/sys/dev/twe/twe_freebsd.c#6 integrate .. //depot/projects/gdb/sys/dev/twe/twevar.h#5 integrate .. //depot/projects/gdb/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/gdb/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/gdb/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/gdb/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_kse.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_prot.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_resource.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_sig.c#10 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#13 integrate .. //depot/projects/gdb/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/gdb/sys/kern/tty.c#8 integrate .. //depot/projects/gdb/sys/kern/tty_compat.c#4 integrate .. //depot/projects/gdb/sys/kern/tty_pty.c#8 integrate .. //depot/projects/gdb/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/gdb/sys/pc98/i386/machdep.c#7 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#11 integrate .. //depot/projects/gdb/sys/sys/ioctl.h#4 integrate .. //depot/projects/gdb/sys/sys/signal.h#3 integrate .. //depot/projects/gdb/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/gdb/usr.bin/truss/syscalls.c#3 integrate .. //depot/projects/gdb/usr.bin/xinstall/install.1#2 integrate Differences ... ==== //depot/projects/gdb/gnu/usr.bin/binutils/gdb/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # ex:ts=8 -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.79 2004/03/17 07:40:42 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.80 2004/06/11 16:09:38 obrien Exp $ .include "../Makefile.inc0" @@ -45,7 +45,7 @@ scm-exp.c scm-lang.c scm-valprint.c \ coffread.c dbxread.c dwarfread.c dwarf2read.c elfread.c \ solib.c solib-svr4.c solib-legacy.c -XSRCS+= freebsd-uthread.c kvm-fbsd.c solib-fbsd-kld.c +XSRCS+= freebsd-uthread.c kvm-fbsd.c kvm-fbsd-machine.h solib-fbsd-kld.c SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h .include "${.CURDIR}/Makefile.${TARGET_ARCH}" @@ -73,7 +73,7 @@ LDADD+= ${RELTOP}/libiberty/libiberty.a LDADD+= -lreadline -ltermcap -CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h +CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h kvm-fbsd-machine.h # We do this by grepping through sources. If that turns out to be too slow, # maybe we could just require every .o file to have an initialization routine @@ -127,6 +127,9 @@ ln -sf ${GDBDIR}/gdb/config/${GDB_CPU}/${H}.h ${.TARGET} .endfor +kvm-fbsd-machine.h: + ln -sf ${.CURDIR}/kvm-fbsd-${TARGET_ARCH}.h ${.TARGET} + GDB_VERSION= "5.2.1 (FreeBSD)" gdbversion.c: Makefile @echo '#include "version.h"' > ${.TARGET} ==== //depot/projects/gdb/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#4 (text+ko) ==== @@ -19,7 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.48 2004/05/10 17:45:51 obrien Exp $ */ +#include +__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.49 2004/06/11 16:09:38 obrien Exp $"); /* * This works like "remote" but, you use it like this: @@ -33,31 +34,27 @@ */ #include -#include -#include #include -#include -#include +#include #include #include #include #include -#include -#include #include "defs.h" +#include #include "gdb_string.h" #include "frame.h" /* required by inferior.h */ #include "inferior.h" -#include "symtab.h" #include "symfile.h" #include "objfiles.h" #include "command.h" #include "bfd.h" -#include "target.h" #include "gdbcore.h" #include "solist.h" +#include "kvm-fbsd-machine.h" + static void kcore_files_info (struct target_ops *); @@ -68,10 +65,6 @@ get_kcore_registers (int); static int -xfer_mem (CORE_ADDR, char *, int, int, struct mem_attrib *, - struct target_ops *); - -static int xfer_umem (CORE_ADDR, char *, int, int); #ifdef SOLIB_ADD @@ -116,7 +109,7 @@ #define KERNOFF (ksym_kernbase ()) #define INKERNEL(x) ((x) >= KERNOFF) -CORE_ADDR +static CORE_ADDR ksym_lookup(const char *name) { struct minimal_symbol *sym; @@ -190,8 +183,6 @@ static int set_context (CORE_ADDR addr) { - CORE_ADDR procaddr = 0; - if (kvread (addr, &cur_pcb)) error ("cannot read pcb at %#x", addr); @@ -349,253 +340,6 @@ printf_filtered ("No kernel core file now.\n"); } -#ifdef __alpha__ - -#include "alpha/tm-alpha.h" -#ifndef S0_REGNUM -#define S0_REGNUM (T7_REGNUM+1) -#endif - -fetch_kcore_registers (struct pcb *pcbp) -{ - - /* First clear out any garbage. */ - memset (registers, '\0', REGISTER_BYTES); - - /* SP */ - *(long *) ®isters[REGISTER_BYTE (SP_REGNUM)] = - pcbp->pcb_hw.apcb_ksp; - - /* S0 through S6 */ - memcpy (®isters[REGISTER_BYTE (S0_REGNUM)], - &pcbp->pcb_context[0], 7 * sizeof (long)); - - /* PC */ - *(long *) ®isters[REGISTER_BYTE (PC_REGNUM)] = - pcbp->pcb_context[7]; - - registers_fetched (); -} - - -CORE_ADDR -fbsd_kern_frame_saved_pc (struct frame_info *fi) -{ - struct minimal_symbol *sym; - CORE_ADDR this_saved_pc; - - this_saved_pc = alpha_frame_saved_pc (fi); - - sym = lookup_minimal_symbol_by_pc (this_saved_pc); - - if (sym != NULL && - (strcmp (SYMBOL_NAME (sym), "XentArith") == 0 || - strcmp (SYMBOL_NAME (sym), "XentIF") == 0 || - strcmp (SYMBOL_NAME (sym), "XentInt") == 0 || - strcmp (SYMBOL_NAME (sym), "XentMM") == 0 || - strcmp (SYMBOL_NAME (sym), "XentSys") == 0 || - strcmp (SYMBOL_NAME (sym), "XentUna") == 0 || - strcmp (SYMBOL_NAME (sym), "XentRestart") == 0)) - { - return (read_memory_integer (fi->frame + 32 * 8, 8)); - } - else - { - return (this_saved_pc); - } -} - -#endif /* __alpha__ */ - -#ifdef __i386__ - -static CORE_ADDR -ksym_maxuseraddr (void) -{ - static CORE_ADDR maxuseraddr; - struct minimal_symbol *sym; - - if (maxuseraddr == 0) - { - sym = lookup_minimal_symbol ("PTmap", NULL, NULL); - if (sym == NULL) { - maxuseraddr = VM_MAXUSER_ADDRESS; - } else { - maxuseraddr = SYMBOL_VALUE_ADDRESS (sym); - } - } - return maxuseraddr; -} - - -/* Symbol names of kernel entry points. Use special frames. */ -#define KSYM_TRAP "calltrap" -#define KSYM_INTR "Xintr" -#define KSYM_FASTINTR "Xfastintr" -#define KSYM_OLDSYSCALL "Xlcall_syscall" -#define KSYM_SYSCALL "Xint0x80_syscall" - -/* The following is FreeBSD-specific hackery to decode special frames - and elide the assembly-language stub. This could be made faster by - defining a frame_type field in the machine-dependent frame information, - but we don't think that's too important right now. */ -enum frametype { tf_normal, tf_trap, tf_interrupt, tf_syscall }; - -CORE_ADDR -fbsd_kern_frame_saved_pc (struct frame_info *fi) -{ - struct minimal_symbol *sym; - CORE_ADDR this_saved_pc; - enum frametype frametype; - - this_saved_pc = read_memory_integer (fi->frame + 4, 4); - sym = lookup_minimal_symbol_by_pc (this_saved_pc); - frametype = tf_normal; - if (sym != NULL) - { - if (strcmp (SYMBOL_NAME (sym), KSYM_TRAP) == 0) - frametype = tf_trap; - else - if (strncmp (SYMBOL_NAME (sym), KSYM_INTR, - strlen (KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym), - KSYM_FASTINTR, strlen (KSYM_FASTINTR)) == 0) - frametype = tf_interrupt; - else - if (strcmp (SYMBOL_NAME (sym), KSYM_SYSCALL) == 0 || - strcmp (SYMBOL_NAME (sym), KSYM_OLDSYSCALL) == 0) - frametype = tf_syscall; - } - - switch (frametype) - { - case tf_normal: - return (this_saved_pc); -#define oEIP offsetof (struct trapframe, tf_eip) - - case tf_trap: - return (read_memory_integer (fi->frame + 8 + oEIP, 4)); - - case tf_interrupt: - return (read_memory_integer (fi->frame + 12 + oEIP, 4)); - - case tf_syscall: - return (read_memory_integer (fi->frame + 8 + oEIP, 4)); -#undef oEIP - } -} - -static int -fetch_kcore_registers (struct pcb *pcb) -{ - int i; - int noreg; - - /* Get the register values out of the sys pcb and store them where - `read_register' will find them. */ - /* - * XXX many registers aren't available. - * XXX for the non-core case, the registers are stale - they are for - * the last context switch to the debugger. - * XXX gcc's register numbers aren't all #defined in tm-i386.h. - */ - noreg = 0; - for (i = 0; i < 3; ++i) /* eax,ecx,edx */ - supply_register (i, (char *)&noreg); - - supply_register (3, (char *) &pcb->pcb_ebx); - supply_register (SP_REGNUM, (char *) &pcb->pcb_esp); - supply_register (FP_REGNUM, (char *) &pcb->pcb_ebp); - supply_register (6, (char *) &pcb->pcb_esi); - supply_register (7, (char *) &pcb->pcb_edi); - supply_register (PC_REGNUM, (char *) &pcb->pcb_eip); - - for (i = 9; i < 14; ++i) /* eflags, cs, ss, ds, es, fs */ - supply_register (i, (char *) &noreg); - supply_register (15, (char *) &pcb->pcb_gs); - - /* XXX 80387 registers? */ -} - -#endif /* __i386__ */ - -#ifdef __sparc64__ - -#define SPARC_INTREG_SIZE 8 - -static void -fetch_kcore_registers (struct pcb *pcbp) -{ - static struct frame top; - CORE_ADDR f_addr; - int i; - - /* Get the register values out of the sys pcb and store them where - `read_register' will find them. */ - /* - * XXX many registers aren't available. - * XXX for the non-core case, the registers are stale - they are for - * the last context switch to the debugger. - * XXX do something with the floating-point registers? - */ - supply_register (SP_REGNUM, (char *)&pcbp->pcb_ufp); - supply_register (PC_REGNUM, (char *)&pcbp->pcb_pc); - f_addr = extract_address (&pcbp->pcb_ufp, SPARC_INTREG_SIZE); - /* Load the previous frame by hand (XXX) and supply it. */ - read_memory (f_addr + SPOFF, (char *)&top, sizeof (top)); - for (i = 0; i < 8; i++) - supply_register (i + L0_REGNUM, (char *)&top.fr_local[i]); - for (i = 0; i < 8; i++) - supply_register (i + I0_REGNUM, (char *)&top.fr_in[i]); -} - -CORE_ADDR -fbsd_kern_frame_saved_pc (struct frame_info *fi) -{ - struct minimal_symbol *sym; - CORE_ADDR frame, pc_addr, pc; - char *buf; - - buf = alloca (MAX_REGISTER_RAW_SIZE); - /* XXX: duplicates fi->extra_info->bottom. */ - frame = (fi->next != NULL) ? fi->next->frame : read_sp (); - pc_addr = frame + offsetof (struct frame, fr_in[7]); - -#define READ_PC(pc, a, b) do { \ - read_memory (a, b, SPARC_INTREG_SIZE); \ - pc = extract_address (b, SPARC_INTREG_SIZE); \ -} while (0) - - READ_PC (pc, pc_addr, buf); - - sym = lookup_minimal_symbol_by_pc (pc); - if (sym != NULL) - { - if (strncmp (SYMBOL_NAME (sym), "tl0_", 4) == 0 || - strcmp (SYMBOL_NAME (sym), "btext") == 0 || - strcmp (SYMBOL_NAME (sym), "mp_startup") == 0 || - strcmp (SYMBOL_NAME (sym), "fork_trampoline") == 0) - { - /* - * Ugly kluge: user space addresses aren't separated from kernel - * ones by range; if encountering a trap from user space, just - * return a 0 to stop the trace. - * Do the same for entry points of kernel processes to avoid - * printing garbage. - */ - pc = 0; - } - if (strncmp (SYMBOL_NAME (sym), "tl1_", 4) == 0) - { - pc_addr = fi->frame + sizeof (struct frame) + - offsetof (struct trapframe, tf_tpc); - READ_PC (pc, pc_addr, buf); - } - } - return (pc); -} - -#endif /* __sparc64__ */ - /* Get the registers out of a core file. This is the machine- independent part. Fetch_core_registers is the machine-dependent part, typically implemented in the xm-file for each architecture. */ @@ -623,16 +367,7 @@ printf_filtered ("\t`%s'\n", core_file); } -/* If mourn is being called in all the right places, this could be say - `gdb internal error' (since generic_mourn calls breakpoint_init_inferior). */ - static int -ignore (CORE_ADDR addr, char *contents) -{ - return 0; -} - -static int xfer_kmem (CORE_ADDR memaddr, char *myaddr, int len, int write, struct mem_attrib *attrib, struct target_ops *target) { @@ -651,7 +386,7 @@ n = kvm_read (core_kd, memaddr, myaddr, len) ; if (n < 0) { fprintf_unfiltered (gdb_stderr, "can not access 0x%x, %s\n", - memaddr, kvm_geterr (core_kd)); + (unsigned)memaddr, kvm_geterr (core_kd)); n = 0; } ==== //depot/projects/gdb/sbin/md5/Makefile#3 (text+ko) ==== @@ -1,9 +1,18 @@ # @(#)Makefile 8.1 (Berkeley) 6/9/93 -# $FreeBSD: src/sbin/md5/Makefile,v 1.8 2004/02/05 22:44:23 ru Exp $ +# $FreeBSD: src/sbin/md5/Makefile,v 1.9 2004/06/11 16:07:02 eik Exp $ PROG= md5 +LINKS= ${BINDIR}/md5 ${BINDIR}/rmd160 \ + ${BINDIR}/md5 ${BINDIR}/sha1 + +MLINKS= md5.1 rmd160.1 \ + md5.1 sha1.1 + +WARNS?= 6 +WFORMAT?= 1 + +DPADD= ${LIBMD} LDADD= -lmd -DPADD= ${LIBMD} .include ==== //depot/projects/gdb/sbin/md5/md5.1#3 (text+ko) ==== @@ -1,20 +1,30 @@ -.\" $FreeBSD: src/sbin/md5/md5.1,v 1.20 2004/05/17 08:35:41 ru Exp $ -.Dd February 14, 1994 +.\" $FreeBSD: src/sbin/md5/md5.1,v 1.21 2004/06/11 16:07:02 eik Exp $ +.Dd June 6, 2004 .Dt MD5 1 .Os .Sh NAME -.Nm md5 +.Nm md5 , sha1 , rmd160 .Nd calculate a message-digest fingerprint (checksum) for a file .Sh SYNOPSIS -.Nm +.Nm md5 +.Op Fl pqrtx +.Op Fl s Ar string +.Op Ar +.Nm sha1 +.Op Fl pqrtx +.Op Fl s Ar string +.Op Ar +.Nm rmd160 .Op Fl pqrtx .Op Fl s Ar string .Op Ar .Sh DESCRIPTION -The -.Nm -utility takes as input a message of arbitrary length and produces -as output a 128-bit +The +.Nm md5 , sha1 +and +.Nm rmd160 +utilities take as input a message of arbitrary length and produce as +output a .Dq fingerprint or .Dq message digest @@ -22,17 +32,23 @@ It is conjectured that it is computationally infeasible to produce two messages having the same message digest, or to produce any message having a given prespecified target message digest. -The MD5 algorithm is intended for digital signature applications, where a +The +.Tn MD5 , SHA-1 +and +.Tn RIPEMD-160 +algorithms are intended for digital signature applications, where a large file must be .Dq compressed in a secure manner before being encrypted with a private (secret) key under a public-key cryptosystem such as -.Em RSA . +.Tn RSA . .Pp -MD5 has not yet (2001-09-03) been broken, but sufficient attacks have been +.Tn MD5 +has not yet (2001-09-03) been broken, but sufficient attacks have been made that its security is in some doubt. -The attacks on MD5 +The attacks on +.Tn MD5 are in the nature of finding .Dq collisions \(em that is, multiple @@ -41,17 +57,16 @@ .Pp The following options may be used in any combination and must precede any files named on the command line. -The MD5 -sum of each file listed on the command line is printed after the options -are processed. +The hexadecimal checksum of each file listed on the command line is printed +after the options are processed. .Bl -tag -width indent .It Fl s Ar string Print a checksum of the given .Ar string . .It Fl p -Echo stdin to stdout and appends the MD5 sum to stdout. +Echo stdin to stdout and append the checksum to stdout. .It Fl q -Quiet mode - only the MD5 sum is printed out. +Quiet mode - only the checksum is printed out. Overrides the .Fl r option. @@ -69,16 +84,44 @@ .El .Sh DIAGNOSTICS The -.Nm -utility exits 0 on success, +.Nm md5 , sha1 +and +.Nm rmd160 +utilities exit 0 on success, and 1 if at least one of the input files could not be read. .Sh SEE ALSO -.Xr cksum 1 +.Xr cksum 1 , +.Xr md5 3 , +.Xr ripemd 3 , +.Xr sha 3 .Rs .%A R. Rivest .%T The MD5 Message-Digest Algorithm .%O RFC1321 .Re +.Rs +.%A J. Burrows +.%T The Secure Hash Standard +.%O FIPS PUB 180-1 +.Re +.Rs +.%A D. Eastlake and P. Jones +.%T US Secure Hash Algorithm 1 +.%O RFC 3174 +.Re +.Pp +RIPEMD-160 is part of the ISO draft standard +.Qq ISO/IEC DIS 10118-3 +on dedicated hash functions. +.Pp +Secure Hash Standard (SHS): +.Pa http://csrc.nist.gov/cryptval/shs.html . +.Pp +The RIPEMD-160 page: +.Pa http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html . .Sh ACKNOWLEDGMENTS This program is placed in the public domain for free general use by RSA Data Security. +.Pp +Support for SHA-1 and RIPEMD-160 has been added by +.An Oliver Eikemeier Aq eik@FreeBSD.org . ==== //depot/projects/gdb/sbin/md5/md5.c#2 (text+ko) ==== @@ -18,13 +18,15 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/md5/md5.c,v 1.31 2003/11/02 23:12:08 se Exp $"); +__FBSDID("$FreeBSD: src/sbin/md5/md5.c,v 1.32 2004/06/11 16:07:02 eik Exp $"); #include #include #include #include #include +#include +#include #include #include #include @@ -36,16 +38,66 @@ */ #define TEST_BLOCK_LEN 10000 #define TEST_BLOCK_COUNT 100000 +#define MDTESTCOUNT 8 int qflag; int rflag; int sflag; -static void MDString(const char *); -static void MDTimeTrial(void); -static void MDTestSuite(void); -static void MDFilter(int); -static void usage(void); +typedef void (DIGEST_Init)(void *); +typedef void (DIGEST_Update)(void *, const unsigned char *, size_t); +typedef char *(DIGEST_End)(void *, char *); + +extern const char *MD5TestOutput[MDTESTCOUNT]; +extern const char *SHA1_TestOutput[MDTESTCOUNT]; +extern const char *RIPEMD160_TestOutput[MDTESTCOUNT]; + +typedef struct Algorithm_t { + const char *progname; + const char *name; + const char *(*TestOutput)[MDTESTCOUNT]; + DIGEST_Init *Init; + DIGEST_Update *Update; + DIGEST_End *End; + char *(*Data)(const unsigned char *, unsigned int, char *); + char *(*File)(const char *, char *); +} Algorithm_t; + +static void MD5_Update(MD5_CTX *, const unsigned char *, size_t); +static void MDString(Algorithm_t *, const char *); +static void MDTimeTrial(Algorithm_t *); +static void MDTestSuite(Algorithm_t *); +static void MDFilter(Algorithm_t *, int); +static void usage(Algorithm_t *); + +typedef union { + MD5_CTX md5; + SHA1_CTX sha1; + RIPEMD160_CTX ripemd160; +} DIGEST_CTX; + +/* max(MD5_DIGEST_LENGTH, SHA_DIGEST_LENGTH, RIPEMD160_DIGEST_LENGTH)*2+1 */ +#define HEX_DIGEST_LENGTH 41 + +/* algorithm function table */ + +struct Algorithm_t Algorithm[] = { + { "md5", "MD5", &MD5TestOutput, (DIGEST_Init*)&MD5Init, + (DIGEST_Update*)&MD5_Update, (DIGEST_End*)&MD5End, + &MD5Data, &MD5File }, + { "sha1", "SHA1", &SHA1_TestOutput, (DIGEST_Init*)&SHA1_Init, + (DIGEST_Update*)&SHA1_Update, (DIGEST_End*)&SHA1_End, + &SHA1_Data, &SHA1_File }, + { "rmd160", "RMD160", &RIPEMD160_TestOutput, + (DIGEST_Init*)&RIPEMD160_Init, (DIGEST_Update*)&RIPEMD160_Update, + (DIGEST_End*)&RIPEMD160_End, &RIPEMD160_Data, &RIPEMD160_File } +}; + +static void +MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len) +{ + MD5Update(c, data, len); +} /* Main driver. @@ -61,14 +113,28 @@ { int ch; char *p; - char buf[33]; + char buf[HEX_DIGEST_LENGTH]; int failed; + unsigned digest; + const char* progname; + + if ((progname = strrchr(argv[0], '/')) == NULL) + progname = argv[0]; + else + progname++; + + for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++) + if (strcasecmp(Algorithm[digest].progname, progname) == 0) + break; + + if (Algorithm[digest].progname == NULL) + digest = 0; failed = 0; while ((ch = getopt(argc, argv, "pqrs:tx")) != -1) switch (ch) { case 'p': - MDFilter(1); + MDFilter(&Algorithm[digest], 1); break; case 'q': qflag = 1; @@ -78,23 +144,23 @@ break; case 's': sflag = 1; - MDString(optarg); + MDString(&Algorithm[digest], optarg); break; case 't': - MDTimeTrial(); + MDTimeTrial(&Algorithm[digest]); break; case 'x': - MDTestSuite(); + MDTestSuite(&Algorithm[digest]); break; default: - usage(); + usage(&Algorithm[digest]); } argc -= optind; argv += optind; if (*argv) { do { - p = MD5File(*argv, buf); + p = Algorithm[digest].File(*argv, buf); if (!p) { warn("%s", *argv); failed++; @@ -104,11 +170,11 @@ else if (rflag) printf("%s %s\n", p, *argv); else - printf("MD5 (%s) = %s\n", *argv, p); + printf("%s (%s) = %s\n", Algorithm[digest].name, *argv, p); } } while (*++argv); } else if (!sflag && (optind == 1 || qflag || rflag)) - MDFilter(0); + MDFilter(&Algorithm[digest], 0); if (failed != 0) return (1); @@ -119,35 +185,35 @@ * Digests a string and prints the result. */ static void -MDString(const char *string) +MDString(Algorithm_t *alg, const char *string) { size_t len = strlen(string); - char buf[33]; + char buf[HEX_DIGEST_LENGTH]; if (qflag) - printf("%s\n", MD5Data(string, len, buf)); + printf("%s\n", alg->Data(string, len, buf)); else if (rflag) - printf("%s \"%s\"\n", MD5Data(string, len, buf), string); + printf("%s \"%s\"\n", alg->Data(string, len, buf), string); else - printf("MD5 (\"%s\") = %s\n", string, MD5Data(string, len, buf)); + printf("%s (\"%s\") = %s\n", alg->name, string, alg->Data(string, len, buf)); } /* * Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks. */ static void -MDTimeTrial(void) +MDTimeTrial(Algorithm_t *alg) { - MD5_CTX context; + DIGEST_CTX context; struct rusage before, after; struct timeval total; float seconds; unsigned char block[TEST_BLOCK_LEN]; unsigned int i; - char *p, buf[33]; + char *p, buf[HEX_DIGEST_LENGTH]; printf - ("MD5 time trial. Digesting %d %d-byte blocks ...", - TEST_BLOCK_COUNT, TEST_BLOCK_LEN); + ("%s time trial. Digesting %d %d-byte blocks ...", + alg->name, TEST_BLOCK_COUNT, TEST_BLOCK_LEN); fflush(stdout); /* Initialize block */ @@ -158,10 +224,10 @@ getrusage(0, &before); /* Digest blocks */ - MD5Init(&context); + alg->Init(&context); for (i = 0; i < TEST_BLOCK_COUNT; i++) - MD5Update(&context, block, TEST_BLOCK_LEN); - p = MD5End(&context,buf); + alg->Update(&context, block, TEST_BLOCK_LEN); + p = alg->End(&context, buf); /* Stop timer */ getrusage(0, &after); @@ -179,9 +245,7 @@ * Digests a reference suite of strings and prints the results. */ -#define MD5TESTCOUNT 8 - -char *MDTestInput[] = { +const char *MDTestInput[MDTESTCOUNT] = { "", "a", "abc", @@ -189,10 +253,11 @@ "abcdefghijklmnopqrstuvwxyz", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", "12345678901234567890123456789012345678901234567890123456789012345678901234567890", - "MD5 has not yet (2001-09-03) been broken, but sufficient attacks have been made that its security is in some doubt" + "MD5 has not yet (2001-09-03) been broken, but sufficient attacks have been made \ +that its security is in some doubt" }; -char *MDTestOutput[MD5TESTCOUNT] = { +const char *MD5TestOutput[MDTESTCOUNT] = { "d41d8cd98f00b204e9800998ecf8427e", "0cc175b9c0f1b6a831c399e269772661", "900150983cd24fb0d6963f7d28e17f72", @@ -203,17 +268,39 @@ "b50663f41d44d92171cb9976bc118538" }; +const char *SHA1_TestOutput[MDTESTCOUNT] = { + "da39a3ee5e6b4b0d3255bfef95601890afd80709", + "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8", + "a9993e364706816aba3e25717850c26c9cd0d89d", + "c12252ceda8be8994d5fa0290a47231c1d16aae3", + "32d10c7b8cf96570ca04ce37f2a19d84240d3a89", + "761c457bf73b14d27e9e9265c46f4b4dda11f940", + "50abf5706a150990a08b2c5ea40fa0e585554732", + "18eca4333979c4181199b7b4fab8786d16cf2846" +}; + +const char *RIPEMD160_TestOutput[MDTESTCOUNT] = { + "9c1185a5c5e9fc54612808977ee8f548b2258d31", + "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe", + "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc", + "5d0689ef49d2fae572b881b123a85ffa21595f36", + "f71c27109c692c1b56bbdceb5b9d2865b3708dbc", + "b0e20b6e3116640286ed3a87a5713079b21f5189", + "9b752e45573d4b39f4dbd3323cab82bf63326bfb", + "5feb69c6bf7c29d95715ad55f57d8ac5b2b7dd32" +}; + static void -MDTestSuite(void) +MDTestSuite(Algorithm_t *alg) { int i; - char buffer[33]; + char buffer[HEX_DIGEST_LENGTH]; - printf("MD5 test suite:\n"); - for (i = 0; i < MD5TESTCOUNT; i++) { - MD5Data(MDTestInput[i], strlen(MDTestInput[i]), buffer); - printf("MD5 (\"%s\") = %s", MDTestInput[i], buffer); - if (strcmp(buffer, MDTestOutput[i]) == 0) + printf("%s test suite:\n", alg->name); + for (i = 0; i < MDTESTCOUNT; i++) { + (*alg->Data)(MDTestInput[i], strlen(MDTestInput[i]), buffer); + printf("%s (\"%s\") = %s", alg->name, MDTestInput[i], buffer); + if (strcmp(buffer, (*alg->TestOutput)[i]) == 0) printf(" - verified correct\n"); else printf(" - INCORRECT RESULT!\n"); @@ -224,26 +311,26 @@ * Digests the standard input and prints the result. */ static void -MDFilter(int tee) +MDFilter(Algorithm_t *alg, int tee) { - MD5_CTX context; + DIGEST_CTX context; unsigned int len; unsigned char buffer[BUFSIZ]; - char buf[33]; + char buf[HEX_DIGEST_LENGTH]; - MD5Init(&context); + alg->Init(&context); while ((len = fread(buffer, 1, BUFSIZ, stdin))) { if (tee && len != fwrite(buffer, 1, len, stdout)) err(1, "stdout"); - MD5Update(&context, buffer, len); + alg->Update(&context, buffer, len); } - printf("%s\n", MD5End(&context,buf)); + printf("%s\n", alg->End(&context, buf)); } static void -usage(void) +usage(Algorithm_t *alg) { - fprintf(stderr, "usage: md5 [-pqrtx] [-s string] [files ...]\n"); + fprintf(stderr, "usage: %s [-pqrtx] [-s string] [files ...]\n", alg->progname); exit(1); } ==== //depot/projects/gdb/sbin/sunlabel/sunlabel.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.9 2004/06/01 20:32:36 joerg Exp $"); +__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.10 2004/06/11 11:41:33 joerg Exp $"); #include #include @@ -805,9 +805,9 @@ if (hflag) { fprintf(out, " %c: %10s", 'a' + i, - make_h_number(sl->sl_part[i].sdkp_nsectors * 512)); + make_h_number((uintmax_t)sl->sl_part[i].sdkp_nsectors * 512)); fprintf(out, " %10s", - make_h_number(sl->sl_part[i].sdkp_cyloffset * + make_h_number((uintmax_t)sl->sl_part[i].sdkp_cyloffset * 512 * secpercyl)); } else { fprintf(out, " %c: %10ju %10u", ==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#10 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.219 2004/04/01 20:56:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.220 2004/06/11 11:16:17 phk Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1165,7 +1165,7 @@ SIGISMEMBER(psp->ps_sigonstack, sig)) { sip = (osiginfo_t *)((caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - rndfsize); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 11 22:56:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D235016A4D2; Fri, 11 Jun 2004 22:56:58 +0000 (GMT) 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 9586416A4CE for ; Fri, 11 Jun 2004 22:56:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 788C143D1F for ; Fri, 11 Jun 2004 22:56:58 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5BMUjDQ066461 for ; Fri, 11 Jun 2004 22:30:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5BMUi29066458 for perforce@freebsd.org; Fri, 11 Jun 2004 22:30:44 GMT (envelope-from marcel@freebsd.org) Date: Fri, 11 Jun 2004 22:30:44 GMT Message-Id: <200406112230.i5BMUi29066458@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 Subject: PERFORCE change 54661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2004 22:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=54661 Change 54661 by marcel@marcel_nfs on 2004/06/11 22:30:01 o Add option -v so that we can add a bit of chatter to help diagnosing behavior. o Add option -d so that the user can specify an alternative crash directory. This can be given to savecore, so we should allow it too. o Add environment variable KGDB_CRASH_DIR so that kgdb(1) can be used in environments where the crash directory is non- standard and without having to specify the -d option all the time. o Also look for kernel. in the crashdir. This helps to keep keep core and kernel in sync. Note that kernel. can also be a directory. We expect the kernel image to be in that directory and named kernel. o Fix and update the usage() Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/main.c#7 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/main.c#7 (text+ko) ==== @@ -57,6 +57,8 @@ pid_t gdb_pid; int dumpnr; +int verbose; + char crashdir[PATH_MAX]; char *kernel; char *vmcore; @@ -70,7 +72,8 @@ static void usage(void) { - fprintf(stderr, "usage: %s [-d dumpno] [kernel] [core]\n", + fprintf(stderr, + "usage: %s [-v] [-d crashdir] [-n dumpnr] [kernel [core]]\n", getprogname()); exit(1); } @@ -107,7 +110,7 @@ } static void -parse_dump(void) +use_dump(int nr) { char path[PATH_MAX]; FILE *info; @@ -115,11 +118,41 @@ struct stat st; int l; - snprintf(path, sizeof(path), "%s/vmcore.%d", crashdir, dumpnr); + snprintf(path, sizeof(path), "%s/vmcore.%d", crashdir, nr); if (stat(path, &st) == -1) err(1, path); + if (!S_ISREG(st.st_mode)) + errx(1, "%s: not a regular file", path); + vmcore = strdup(path); - snprintf(path, sizeof(path), "%s/info.%d", crashdir, dumpnr); + + /* + * See if there's a kernel image right here, use it. The kernel + * image is either called kernel. or is in a subdirectory + * kernel. and called kernel. + */ + snprintf(path, sizeof(path), "%s/kernel.%d", crashdir, nr); + if (stat(path, &st) == 0) { + if (S_ISREG(st.st_mode)) { + kernel = strdup(path); + return; + } + if (S_ISDIR(st.st_mode)) { + snprintf(path, sizeof(path), "%s/kernel.%d/kernel", + crashdir, nr); + if (stat(path, &st) == 0 && S_ISREG(st.st_mode)) { + kernel = strdup(path); + return; + } + } + } + + /* + * No kernel image here. Parse the dump header. The kernel object + * directory can be found there and we probably have the kernel + * image in it still. + */ + snprintf(path, sizeof(path), "%s/info.%d", crashdir, nr); info = fopen(path, "r"); if (info == NULL) { warn(path); @@ -133,9 +166,10 @@ s = strchr(path, ':'); s = (s == NULL) ? path + 4 : s + 1; l = snprintf(path, sizeof(path), "%s/kernel.debug", s); - if (stat(path, &st) == -1) { + if (stat(path, &st) == -1 || !S_ISREG(st.st_mode)) { path[l - 6] = '\0'; - if (stat(path, &st) == -1) + if (stat(path, &st) == -1 || + !S_ISREG(st.st_mode)) break; } kernel = strdup(path); @@ -143,6 +177,9 @@ } } fclose(info); + + if (verbose && kernel == NULL) + warnx("dump %d: no kernel found", nr); } int @@ -156,16 +193,17 @@ int f, nfds, status; int ch; - strcpy(crashdir, "/var/crash"); - while ((ch = getopt(argc, argv, "n:")) != -1) { + strlcpy(crashdir, "/var/crash", sizeof(crashdir)); + s = getenv("KGDB_CRASH_DIR"); + if (s != NULL) + strlcpy(crashdir, s, sizeof(crashdir)); + + while ((ch = getopt(argc, argv, "d:n:v")) != -1) { switch (ch) { + case 'd': + strlcpy(crashdir, optarg, sizeof(crashdir)); + break; case 'n': - if (dumpnr) { - warnx("option %c specified multiple times", - optopt); - usage(); - /* NOTREACHED */ - } dumpnr = strtol(optarg, &s, 0); if (dumpnr == 0 || *s != '\0') { warnx("option %c: invalid kernel dump number", @@ -173,7 +211,9 @@ usage(); /* NOTREACHED */ } - parse_dump(); + break; + case 'v': + verbose++; break; case '?': default: @@ -183,6 +223,12 @@ argc -= optind; argv += optind; + if (verbose > 1) + warnx("using %s as the crash directory", crashdir); + + if (dumpnr) + use_dump(dumpnr); + if (argc > 0) { if (kernel != NULL) free(kernel); @@ -201,6 +247,11 @@ if (vmcore == NULL) errx(1, "core file not specified"); + if (verbose) { + warnx("kernel image: %s", kernel); + warnx("core file: %s", vmcore); + } + cmdfile_name = strdup("/tmp/kgdb.XXXXXXXX"); if (cmdfile_name == NULL) err(1, "strdup(3)"); From owner-p4-projects@FreeBSD.ORG Sat Jun 12 01:33:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9795116A4D1; Sat, 12 Jun 2004 01:33:32 +0000 (GMT) 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 D53E216A4CE for ; Sat, 12 Jun 2004 01:33:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE73F43D1D for ; Sat, 12 Jun 2004 01:33:31 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C1WbaK013874 for ; Sat, 12 Jun 2004 01:32:37 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C1WbUm013871 for perforce@freebsd.org; Sat, 12 Jun 2004 01:32:37 GMT (envelope-from julian@freebsd.org) Date: Sat, 12 Jun 2004 01:32:37 GMT Message-Id: <200406120132.i5C1WbUm013871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 54668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 01:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=54668 Change 54668 by julian@julian_ref on 2004/06/12 01:32:19 slight cleanups Affected files ... .. //depot/projects/nsched/sys/kern/kern_kse.c#13 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#13 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_kse.c#13 (text+ko) ==== @@ -919,7 +919,6 @@ td2->td_inhibitors = 0; SIGFILLSET(td2->td_sigmask); SIG_CANTMASK(td2->td_sigmask); - sched_fork_thread(td, td2); return (td2); /* bogus.. should be a void function */ } ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#13 (text+ko) ==== @@ -61,7 +61,9 @@ #include #include -/* +/******************************************************************** + * Definitions of the "KSE" structure. + * * This is a scheduler private structure that it uses (for now) * to implement the thread fairness algorythm. * The threads are made runnable by the rest of the system, but @@ -116,8 +118,9 @@ #define KEF_EXIT 0x00002 /* KSE is being killed. */ #define KEF_DIDRUN 0x00004 /* KSE actually ran. */ -/* +/*************************************************************** * Scheduler private extensions to thread, ksegrp and proc structures. + * * These are invisile outside the scheduler. * They are usually allocated beyond the end of the proc, thread or ksegrp * structure and always accessed via an indirection. @@ -160,16 +163,19 @@ #define FIRST_KSE_IN_KSEGRP(kg) TAILQ_FIRST(&(kg)->kg_kseq) #define FIRST_KSE_IN_PROC(p) FIRST_KSE_IN_KSEGRP(FIRST_KSEGRP_IN_PROC(p)) -void kse_free(struct kse *ke); -void kse_stash(struct kse *ke); -void kse_reassign(struct kse *ke); -void sched_fork_kse(struct thread *parenttd, struct kse *newke); -void sched_unrun_kse(struct proc *parent, struct thread *childtd); + +/**************************************************************** + * function prototypes + */ +static void kse_free(struct kse *ke); +static void kse_stash(struct kse *ke); +static void kse_reassign(struct kse *ke); static struct kse * kse_alloc(void); static void kse_link(struct kse *ke, struct ksegrp *kg); static void kse_unlink(struct kse *ke); #define KTR_4BSD 0x0 +#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) /* * INVERSE_ESTCPU_WEIGHT is only suitable for statclock() frequencies in @@ -579,10 +585,6 @@ sched_tdcnt++; } - - - - /******************************************************************* * These functions represent entrypoints that a scheduler needs to * * Supply in order to give the rest of the system opportunities to * @@ -673,18 +675,10 @@ sched_set_concurrancy(td->td_ksegrp, 0); } -/* - * XXX make sure that for the last thread we - * leave it linked to its kse.. - */ void sched_thread_exit(struct thread *td) { struct kse *ke; -#if 0 - struct ksegrp *kg; - struct proc *p; -#endif ke = td->td_kse; @@ -696,18 +690,6 @@ if ((td->td_proc->p_flag & P_NOLOAD) == 0) sched_tdcnt--; -#if 0 /* need to account for kg_idleq etc. */ - p = td->td_proc; - if ((p->p_numthreads == 1) && - ((kg = td->td_ksegrp)->kg_numthreads == 1)) { - /* We are the last thread/kseg.. */ - proc_linkup(p, kg, td); - kse_link(ke, kg); - ke.ke_thread = td; - td.td_kse = ke; /* we are running */ - ke.ke_state = KES_THREAD; - } -#endif } /* @@ -732,35 +714,26 @@ void -sched_fork(struct thread *parenttd, struct proc *child) +sched_fork(struct thread *td, struct proc *child) { - struct thread *td2; - struct kse *ke2; + struct thread *newtd; + struct kse *newke; - td2 = FIRST_THREAD_IN_PROC(child); - ke2 = FIRST_KSE_IN_PROC(child); - sched_fork_kse(parenttd, ke2); - sched_fork_ksegrp(parenttd, FIRST_KSEGRP_IN_PROC(child)); - ke2->ke_thread = td2; - td2->td_kse = ke2; - /* sched_fork_thread(parenttd, td2);*/ + newtd = FIRST_THREAD_IN_PROC(child); + newke = FIRST_KSE_IN_PROC(child); + bzero(&newke->ke_startzero, + (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); + newke->ke_state = KES_THREAD; + newke->ke_cpticks = 0; + sched_fork_ksegrp(td, FIRST_KSEGRP_IN_PROC(child)); + newke->ke_thread = newtd; + newtd->td_kse = newke; } void -sched_fork_ksegrp(struct thread *parent, struct ksegrp *child) +sched_fork_ksegrp(struct thread *td, struct ksegrp *newkg) { - struct ksegrp *kg; - - mtx_assert(&sched_lock, MA_OWNED); - kg = parent->td_ksegrp; - child->kg_estcpu = kg->kg_estcpu; -} - - - -void -sched_fork_thread(struct thread *parent, struct thread *child) -{ + newkg->kg_estcpu = td->td_ksegrp->kg_estcpu; } void @@ -1110,37 +1083,36 @@ * for now have special thr code * later on, clean these up into common code. */ -#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) int -sched_thr_newthread(struct thread *td, struct thread *td0, int flags) +sched_thr_newthread(struct thread *td, struct thread *newtd, int flags) { - struct kse *ke0; + struct kse *newke; /* Initialize our kse structure. */ - ke0 = kse_alloc(); - bzero(&ke0->ke_startzero, + newke = kse_alloc(); + bzero(&newke->ke_startzero, RANGEOF(struct kse, ke_startzero, ke_endzero)); /* Link the thread and kse into the ksegrp and make it runnable. */ mtx_lock_spin(&sched_lock); - thread_link(td0, td->td_ksegrp); - kse_link(ke0, td->td_ksegrp); + thread_link(newtd, td->td_ksegrp); + kse_link(newke, td->td_ksegrp); /* Bind this thread and kse together. */ - td0->td_kse = ke0; - ke0->ke_thread = td0; + newtd->td_kse = newke; + newke->ke_thread = newtd; + bzero(&newke->ke_startzero, + (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); + newke->ke_state = KES_THREAD; + newke->ke_cpticks = 0; - sched_fork_kse(td, td->td_kse); - sched_fork_thread(td, td0); - - TD_SET_CAN_RUN(td0); + TD_SET_CAN_RUN(newtd); if ((flags & THR_SUSPENDED) == 0) - setrunqueue(td0); + setrunqueue(newtd); mtx_unlock_spin(&sched_lock); return (0); /* the API could fail but not in this case */ } -#undef RANGEOF /* * Allocate a kse. @@ -1248,53 +1220,6 @@ kse_stash(ke); } -#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) - -/* new version of sched-fork() */ -void -sched_fork_kse(struct thread *parenttd, struct kse *ke2) -{ - struct ksegrp *kg2; - - kg2 = ke2->ke_ksegrp; - bzero(&ke2->ke_startzero, - (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); - ke2->ke_state = KES_THREAD; - ke2->ke_cpticks = 0; - kg2->kg_estcpu = parenttd->td_ksegrp->kg_estcpu; -} - -/* - * Try handle the generic case where there may be > 1 kseg even - * though that should never happen. It should be cheap to do so. - */ -void -sched_destroyproc(struct proc *p) -{ - struct ksegrp *kg; - struct kse *ke; - - /* remove all the kses we can find and free them */ - FOREACH_KSEGRP_IN_PROC(p, kg) { - while (!TAILQ_EMPTY(&kg->kg_kseq)) { - ke = TAILQ_FIRST(&kg->kg_kseq); - TAILQ_REMOVE(&kg->kg_kseq, ke, ke_kglist); - if (ke->ke_thread) - ke->ke_thread->td_kse = NULL; - kse_free(ke); - } - } -} - -/* - * The current KSE is being dumped. Clear stuff and - * look to see if another thread needs us. - */ -void -sched_unrun_kse(struct proc *parent, struct thread *childtd) -{ -} - /* * Whenever we have idle KSEs and there are too many for the concurrancy, * then free as many as we can. Don't free too many if we have threads @@ -1303,12 +1228,34 @@ #define REDUCE_KSES(kg, skg) \ do { \ while ((skg->skg_concurrancy < skg->skg_kses) && \ - (skg->skg_idle_kses > 0) && \ - (skg->skg_kses > kg->kg_numthreads)) { \ + (skg->skg_idle_kses > 0) && \ + (skg->skg_kses > kg->kg_numthreads)) { \ kse_unlink(TAILQ_FIRST(&skg->skg_iq)); \ } \ } while (0) + +/* + * Called by the uma process fini routine.. + * undo anything we may have done in the uma_init method. + * Panic if it's not all 1:1:1:1 + */ +void +sched_destroyproc(struct proc *p) +{ + struct ksegrp *kg; + struct kg_sched *skg; + + KASSERT((p->p_numthreads == 1), ("Cached proc with > 1 thread ")); + KASSERT((p->p_numksegrps == 1), ("Cached proc with > 1 ksegrp ")); + + kg = FIRST_KSEGRP_IN_PROC(p); + KASSERT((kg->kg_kses == 1), ("Cached proc with > 1 kse ")); + + skg = kg->kg_sched; + kse_unlink(TAILQ_FIRST(&skg->skg_iq)); \ +} + void sched_set_concurrancy(struct ksegrp *kg, int concurrancy) { @@ -1330,7 +1277,10 @@ #endif mtx_lock_spin(&sched_lock); kse_link(newke, kg); - sched_fork_kse(curthread, newke); + bzero(&newke->ke_startzero, + (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); + newke->ke_state = KES_THREAD; + newke->ke_cpticks = 0; /* Add engine */ kse_reassign(newke); mtx_unlock_spin(&sched_lock); From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:00:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A9D116A4D2; Sat, 12 Jun 2004 03:00:07 +0000 (GMT) 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 D54A616A4D0 for ; Sat, 12 Jun 2004 03:00:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF7F343D1D for ; Sat, 12 Jun 2004 03:00:06 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C2wktO031149 for ; Sat, 12 Jun 2004 02:58:46 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C2wkWc031146 for perforce@freebsd.org; Sat, 12 Jun 2004 02:58:46 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 02:58:46 GMT Message-Id: <200406120258.i5C2wkWc031146@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 Subject: PERFORCE change 54672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:00:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=54672 Change 54672 by marcel@marcel_nfs on 2004/06/12 02:58:43 Add some makefile foo to allow the source files to include , even though the header is not yet installed. It's too inconvenient at this time to have to copy the header... Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/Makefile#6 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/Makefile#6 (text+ko) ==== @@ -8,4 +8,11 @@ WARNS?= 4 +CFLAGS+= -I. +CLEANFILES+=machine +beforedepend: machine +machine: + rm -f ${.TARGET} + ln -s ../../sys/${MACHINE_ARCH}/include ${.TARGET} + .include From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:01:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 825B116A4D1; Sat, 12 Jun 2004 03:01:15 +0000 (GMT) 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 5C54A16A4CE for ; Sat, 12 Jun 2004 03:01:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F9DC43D1D for ; Sat, 12 Jun 2004 03:01:15 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C2xmxH031195 for ; Sat, 12 Jun 2004 02:59:48 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C2xmTX031191 for perforce@freebsd.org; Sat, 12 Jun 2004 02:59:48 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 02:59:48 GMT Message-Id: <200406120259.i5C2xmTX031191@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 Subject: PERFORCE change 54673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:01:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=54673 Change 54673 by marcel@marcel_nfs on 2004/06/12 02:59:34 Include . Don't get it from the kernel source tree directly. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/packet.c#3 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/packet.c#3 (text+ko) ==== @@ -38,7 +38,8 @@ #include #include -#include "../../sys/i386/include/gdb_machdep.h" +#include + #include "kgdb.h" static char gdb_rxbuf[GDB_BUFSZ]; From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:02:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 486AB16A4D1; Sat, 12 Jun 2004 03:02:48 +0000 (GMT) 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 1994516A4CE for ; Sat, 12 Jun 2004 03:02:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E197D43D5C for ; Sat, 12 Jun 2004 03:02:47 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C30oVR031284 for ; Sat, 12 Jun 2004 03:00:50 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C30oxY031281 for perforce@freebsd.org; Sat, 12 Jun 2004 03:00:50 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 03:00:50 GMT Message-Id: <200406120300.i5C30oxY031281@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 Subject: PERFORCE change 54674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=54674 Change 54674 by marcel@marcel_nfs on 2004/06/12 03:00:15 Include . Don't get it from the kernel source tree directly. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/md_i386.c#3 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/md_i386.c#3 (text+ko) ==== @@ -34,10 +34,10 @@ #include #include #include +#include #include #include -#include "../../sys/i386/include/gdb_machdep.h" #include "kgdb.h" void * From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:02:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0743C16A4D2; Sat, 12 Jun 2004 03:02:56 +0000 (GMT) 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 99B2616A4CE for ; Sat, 12 Jun 2004 03:02:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6303E43D1D for ; Sat, 12 Jun 2004 03:02:55 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C31qg7032282 for ; Sat, 12 Jun 2004 03:01:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C31q2A032276 for perforce@freebsd.org; Sat, 12 Jun 2004 03:01:52 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 03:01:52 GMT Message-Id: <200406120301.i5C31q2A032276@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 Subject: PERFORCE change 54675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:02:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=54675 Change 54675 by marcel@marcel_nfs on 2004/06/12 03:01:31 Port kgdb(1) to ia64 to help keep the source code clean. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/md_ia64.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:04:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C123116A4D1; Sat, 12 Jun 2004 03:04:49 +0000 (GMT) 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 92ECC16A4CE for ; Sat, 12 Jun 2004 03:04:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8648643D1F for ; Sat, 12 Jun 2004 03:04:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C33tR1034304 for ; Sat, 12 Jun 2004 03:03:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C33tTu034301 for perforce@freebsd.org; Sat, 12 Jun 2004 03:03:55 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 03:03:55 GMT Message-Id: <200406120303.i5C33tTu034301@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 Subject: PERFORCE change 54676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:04:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=54676 Change 54676 by marcel@marcel_nfs on 2004/06/12 03:03:31 o Change the type of td_frame to struct trapframe *. o Add td_kstack. We need it on ia64. o Add prototype for kgdb_thr_init(). Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/kgdb.h#3 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/kgdb.h#3 (text+ko) ==== @@ -106,14 +106,18 @@ extern kvm_t *kvm; +struct trapframe; + struct kthr { - void *td_frame; + struct trapframe *td_frame; + uintptr_t td_kstack; int td_tid; }; extern struct kthr *curkthr; struct kthr *kgdb_thr_first(void); +struct kthr *kgdb_thr_init(void); struct kthr *kgdb_thr_lookup(int); struct kthr *kgdb_thr_next(struct kthr *); struct kthr *kgdb_thr_select(struct kthr *); From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:05:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 407B816A4D1; Sat, 12 Jun 2004 03:05:35 +0000 (GMT) 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 0A2AD16A4CE for ; Sat, 12 Jun 2004 03:05:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1C8743D31 for ; Sat, 12 Jun 2004 03:05:34 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C34vAN034339 for ; Sat, 12 Jun 2004 03:04:57 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C34vt6034336 for perforce@freebsd.org; Sat, 12 Jun 2004 03:04:57 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 03:04:57 GMT Message-Id: <200406120304.i5C34vt6034336@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 Subject: PERFORCE change 54677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:05:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=54677 Change 54677 by marcel@marcel_nfs on 2004/06/12 03:04:23 Add dummy implementation got kgdb_thr_init(). Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/kthr.c#2 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/kthr.c#2 (text+ko) ==== @@ -46,6 +46,12 @@ } struct kthr * +kgdb_thr_init(void) +{ + return (NULL); +} + +struct kthr * kgdb_thr_lookup(int tid __unused) { return (NULL); From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:07:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94F6416A4D2; Sat, 12 Jun 2004 03:07:18 +0000 (GMT) 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 7809716A4D1 for ; Sat, 12 Jun 2004 03:07:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D18943D1F for ; Sat, 12 Jun 2004 03:07:16 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C370jF034468 for ; Sat, 12 Jun 2004 03:07:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C370VK034461 for perforce@freebsd.org; Sat, 12 Jun 2004 03:07:00 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 03:07:00 GMT Message-Id: <200406120307.i5C370VK034461@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 Subject: PERFORCE change 54678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=54678 Change 54678 by marcel@marcel_nfs on 2004/06/12 03:06:44 o Actually call kvm_openfiles(). o Call kgdb_thr_init() after opening the core file, but before we spawn the gdb(1). Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/main.c#8 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/main.c#8 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -252,6 +253,14 @@ warnx("core file: %s", vmcore); } + s = malloc(_POSIX2_LINE_MAX); + kvm = kvm_openfiles(kernel, vmcore, NULL, O_RDONLY, s); + if (kvm == NULL) + errx(1, s); + free(s); + + kgdb_thr_init(); + cmdfile_name = strdup("/tmp/kgdb.XXXXXXXX"); if (cmdfile_name == NULL) err(1, "strdup(3)"); From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:31:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15D2916A4E5; Sat, 12 Jun 2004 03:31:08 +0000 (GMT) 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 D56BE16A4D0 for ; Sat, 12 Jun 2004 03:31:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B76CE43D53 for ; Sat, 12 Jun 2004 03:31:07 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C3UWIu038691 for ; Sat, 12 Jun 2004 03:30:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C3UWF7038688 for perforce@freebsd.org; Sat, 12 Jun 2004 03:30:32 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 03:30:32 GMT Message-Id: <200406120330.i5C3UWF7038688@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 Subject: PERFORCE change 54683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:31:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=54683 Change 54683 by marcel@marcel_nfs on 2004/06/12 03:30:17 Speculatively rename the executable from gdb6 to gdb. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#15 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#15 (text+ko) ==== @@ -5,7 +5,7 @@ .PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \ ${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR} -PROG= gdb6 +PROG= gdb NOMAN= yes GENSRCS=version.c nm.h tm.h SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c \ From owner-p4-projects@FreeBSD.ORG Sat Jun 12 03:35:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8898116A4D1; Sat, 12 Jun 2004 03:35:57 +0000 (GMT) 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 6107D16A4CE for ; Sat, 12 Jun 2004 03:35:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42D2A43D1D for ; Sat, 12 Jun 2004 03:35:57 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C3YbGG040464 for ; Sat, 12 Jun 2004 03:34:37 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C3YbwG040459 for perforce@freebsd.org; Sat, 12 Jun 2004 03:34:37 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 03:34:37 GMT Message-Id: <200406120334.i5C3YbwG040459@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 Subject: PERFORCE change 54684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 03:35:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=54684 Change 54684 by marcel@marcel_nfs on 2004/06/12 03:34:28 Create the link relative to the source directory so that we can have an object directory different from the source directory. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/Makefile#7 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/Makefile#7 (text+ko) ==== @@ -13,6 +13,6 @@ beforedepend: machine machine: rm -f ${.TARGET} - ln -s ../../sys/${MACHINE_ARCH}/include ${.TARGET} + ln -s ${.CURDIR}/../../sys/${MACHINE_ARCH}/include ${.TARGET} .include From owner-p4-projects@FreeBSD.ORG Sat Jun 12 04:22:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1465A16A4D1; Sat, 12 Jun 2004 04:22:23 +0000 (GMT) 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 C0DCB16A4CE for ; Sat, 12 Jun 2004 04:22:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F91843D53 for ; Sat, 12 Jun 2004 04:22:22 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C4LZQ6050876 for ; Sat, 12 Jun 2004 04:21:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C4LZf0050867 for perforce@freebsd.org; Sat, 12 Jun 2004 04:21:35 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 04:21:35 GMT Message-Id: <200406120421.i5C4LZf0050867@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 Subject: PERFORCE change 54686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 04:22:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=54686 Change 54686 by marcel@marcel_nfs on 2004/06/12 04:21:33 Make this header WARNS=4 clean. Affected files ... .. //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#6 edit Differences ... ==== //depot/projects/gdb/sys/ia64/include/gdb_machdep.h#6 (text+ko) ==== @@ -41,7 +41,7 @@ } static __inline int -gdb_cpu_signal(int vector, int _) +gdb_cpu_signal(int vector, int dummy __unused) { return (vector); } From owner-p4-projects@FreeBSD.ORG Sat Jun 12 04:31:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE14E16A4D1; Sat, 12 Jun 2004 04:31:04 +0000 (GMT) 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 743B116A4CE for ; Sat, 12 Jun 2004 04:31:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CD4543D1F for ; Sat, 12 Jun 2004 04:31:04 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C4UlRZ051913 for ; Sat, 12 Jun 2004 04:30:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C4UkNS051910 for perforce@freebsd.org; Sat, 12 Jun 2004 04:30:46 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 04:30:46 GMT Message-Id: <200406120430.i5C4UkNS051910@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 Subject: PERFORCE change 54687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 04:31:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=54687 Change 54687 by marcel@marcel_nfs on 2004/06/12 04:30:17 The very first kernel dump will be saved as dump 0, not 1. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/main.c#9 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/main.c#9 (text+ko) ==== @@ -194,6 +194,8 @@ int f, nfds, status; int ch; + dumpnr = -1; + strlcpy(crashdir, "/var/crash", sizeof(crashdir)); s = getenv("KGDB_CRASH_DIR"); if (s != NULL) @@ -206,7 +208,7 @@ break; case 'n': dumpnr = strtol(optarg, &s, 0); - if (dumpnr == 0 || *s != '\0') { + if (dumpnr < 0 || *s != '\0') { warnx("option %c: invalid kernel dump number", optopt); usage(); @@ -227,7 +229,7 @@ if (verbose > 1) warnx("using %s as the crash directory", crashdir); - if (dumpnr) + if (dumpnr >= 0) use_dump(dumpnr); if (argc > 0) { From owner-p4-projects@FreeBSD.ORG Sat Jun 12 06:05:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAB3816A4D1; Sat, 12 Jun 2004 06:05:01 +0000 (GMT) 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 B3FD616A4CE for ; Sat, 12 Jun 2004 06:05:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEB4843D4C for ; Sat, 12 Jun 2004 06:05:01 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C64mW3080008 for ; Sat, 12 Jun 2004 06:04:48 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C64mjD080005 for perforce@freebsd.org; Sat, 12 Jun 2004 06:04:48 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 06:04:48 GMT Message-Id: <200406120604.i5C64mjD080005@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 Subject: PERFORCE change 54699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 06:05:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=54699 Change 54699 by marcel@marcel_nfs on 2004/06/12 06:04:36 Also create a sys link to make sure we pick up from the source tree. This too will be removed when we're ready for prime-time. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/Makefile#8 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/Makefile#8 (text+ko) ==== @@ -10,9 +10,15 @@ CFLAGS+= -I. CLEANFILES+=machine -beforedepend: machine + +beforedepend: machine sys + machine: rm -f ${.TARGET} ln -s ${.CURDIR}/../../sys/${MACHINE_ARCH}/include ${.TARGET} +sys: + rm -f ${.TARGET} + ln -s ${.CURDIR}/../../sys/sys ${.TARGET} + .include From owner-p4-projects@FreeBSD.ORG Sat Jun 12 06:08:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3ED016A4D1; Sat, 12 Jun 2004 06:08:17 +0000 (GMT) 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 AFE0616A4CE for ; Sat, 12 Jun 2004 06:08:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AADD943D39 for ; Sat, 12 Jun 2004 06:08:17 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C67rUj080172 for ; Sat, 12 Jun 2004 06:07:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C67rhD080169 for perforce@freebsd.org; Sat, 12 Jun 2004 06:07:53 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 06:07:53 GMT Message-Id: <200406120607.i5C67rhD080169@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 Subject: PERFORCE change 54701 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 06:08:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=54701 Change 54701 by marcel@marcel_nfs on 2004/06/12 06:07:25 Add a prototype of gdb_cpu_frame(). The function will return a filled-in trapframe given a struct thread. The implementation will be in md_${ARCH}.c so that we can deal with the various MD quirks. Add a next pointer to struct kthr and also save the kernel address of the corresponding struct thread there. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/kgdb.h#4 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/kgdb.h#4 (text+ko) ==== @@ -27,10 +27,15 @@ #ifndef _KGDB_H_ #define _KGDB_H_ +struct trapframe; +struct thread; + extern char *gdb_rxp; extern size_t gdb_rxsz; extern char *gdb_txp; +struct trapframe *gdb_cpu_frame(struct thread *); + void gdb_packet_data(const char *, size_t); int gdb_packet_recv(char *, size_t); int gdb_packet_send(const char *, size_t); @@ -106,12 +111,12 @@ extern kvm_t *kvm; -struct trapframe; - struct kthr { + struct kthr *next; + uintptr_t kaddr; struct trapframe *td_frame; - uintptr_t td_kstack; - int td_tid; + uintptr_t td_kstack; + int td_tid; }; extern struct kthr *curkthr; From owner-p4-projects@FreeBSD.ORG Sat Jun 12 06:09:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA61F16A4D1; Sat, 12 Jun 2004 06:09:28 +0000 (GMT) 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 B4FA616A4CE for ; Sat, 12 Jun 2004 06:09:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFD1143D31 for ; Sat, 12 Jun 2004 06:09:28 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C68t3A080190 for ; Sat, 12 Jun 2004 06:08:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C68t1Y080187 for perforce@freebsd.org; Sat, 12 Jun 2004 06:08:55 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 06:08:55 GMT Message-Id: <200406120608.i5C68t1Y080187@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 Subject: PERFORCE change 54702 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 06:09:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=54702 Change 54702 by marcel@marcel_nfs on 2004/06/12 06:08:47 Implement gdb_cpu_frame() for ia64. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/md_ia64.c#2 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/md_ia64.c#2 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +#include +#include #include #include #include @@ -34,6 +36,7 @@ #include #include #include +#include #include #include @@ -41,6 +44,16 @@ #include "kgdb.h" +struct trapframe * +gdb_cpu_frame(struct thread *td) +{ + struct trapframe *tf; + + tf = malloc(sizeof(*tf)); + kvm_read(kvm, (uintptr_t)td->td_last_frame, tf, sizeof(*tf)); + return (tf); +} + void * gdb_cpu_getreg(int regnum, size_t *regsz) { From owner-p4-projects@FreeBSD.ORG Sat Jun 12 06:51:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D59416A4D1; Sat, 12 Jun 2004 06:51:49 +0000 (GMT) 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 7199F16A4CE for ; Sat, 12 Jun 2004 06:51:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5510143D31 for ; Sat, 12 Jun 2004 06:51:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C6pluT089392 for ; Sat, 12 Jun 2004 06:51:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C6plUI089383 for perforce@freebsd.org; Sat, 12 Jun 2004 06:51:47 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 06:51:47 GMT Message-Id: <200406120651.i5C6plUI089383@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 Subject: PERFORCE change 54703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 06:51:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=54703 Change 54703 by marcel@marcel_nfs on 2004/06/12 06:51:41 In gdb_tx_mem, use pointers to unsigned char to avoid sign-extension. That breaks the construction of packets. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/packet.c#4 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/packet.c#4 (text+ko) ==== @@ -310,8 +310,8 @@ int gdb_tx_mem(const unsigned char *addr, size_t size) { - char sbuf[256]; - char *dbuf, *p; + unsigned char sbuf[256]; + unsigned char *dbuf, *p; ssize_t res; dbuf = (size > sizeof(sbuf)) ? malloc(size) : sbuf; From owner-p4-projects@FreeBSD.ORG Sat Jun 12 06:55:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A25BC16A4D1; Sat, 12 Jun 2004 06:55:12 +0000 (GMT) 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 702C316A4CE for ; Sat, 12 Jun 2004 06:55:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B08143D49 for ; Sat, 12 Jun 2004 06:55:12 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C6sqb9090094 for ; Sat, 12 Jun 2004 06:54:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C6spfc090091 for perforce@freebsd.org; Sat, 12 Jun 2004 06:54:51 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 06:54:51 GMT Message-Id: <200406120654.i5C6spfc090091@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 Subject: PERFORCE change 54704 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 06:55:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=54704 Change 54704 by marcel@marcel_nfs on 2004/06/12 06:54:21 Remove prototype of gdb_cpu_frame() again. We should not read the trapframe and dereference it locally, because we use kvm_read to get the registers. We only have to store the frame pointer... Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/kgdb.h#5 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/kgdb.h#5 (text+ko) ==== @@ -27,15 +27,10 @@ #ifndef _KGDB_H_ #define _KGDB_H_ -struct trapframe; -struct thread; - extern char *gdb_rxp; extern size_t gdb_rxsz; extern char *gdb_txp; -struct trapframe *gdb_cpu_frame(struct thread *); - void gdb_packet_data(const char *, size_t); int gdb_packet_recv(char *, size_t); int gdb_packet_send(const char *, size_t); @@ -111,6 +106,8 @@ extern kvm_t *kvm; +struct trapframe; + struct kthr { struct kthr *next; uintptr_t kaddr; From owner-p4-projects@FreeBSD.ORG Sat Jun 12 06:56:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88A7616A4D1; Sat, 12 Jun 2004 06:56:08 +0000 (GMT) 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 6392916A4CE for ; Sat, 12 Jun 2004 06:56:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E85043D45 for ; Sat, 12 Jun 2004 06:56:08 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C6trO7090183 for ; Sat, 12 Jun 2004 06:55:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C6trOR090180 for perforce@freebsd.org; Sat, 12 Jun 2004 06:55:53 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 06:55:53 GMT Message-Id: <200406120655.i5C6trOR090180@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 Subject: PERFORCE change 54705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 06:56:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=54705 Change 54705 by marcel@marcel_nfs on 2004/06/12 06:55:42 o Remove gdb_cpu_frame(). o Do not dereference the frame pointer. It's a kernel address. Use getreg() to fetch it from the core file. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/md_ia64.c#3 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/md_ia64.c#3 (text+ko) ==== @@ -44,14 +44,13 @@ #include "kgdb.h" -struct trapframe * -gdb_cpu_frame(struct thread *td) +static uint64_t +getreg(uint64_t *addr) { - struct trapframe *tf; + uint64_t val; - tf = malloc(sizeof(*tf)); - kvm_read(kvm, (uintptr_t)td->td_last_frame, tf, sizeof(*tf)); - return (tf); + kvm_read(kvm, (uintptr_t)addr, &val, sizeof(val)); + return (val); } void * @@ -59,6 +58,7 @@ { static uint64_t synth; struct trapframe *tf = curkthr->td_frame; + uint64_t bspstore; *regsz = gdb_cpu_regsz(regnum); switch (regnum) { @@ -126,10 +126,10 @@ * space, setup bspstore to point to the base of the * kernel stack. */ - synth = (tf->tf_special.bspstore >= IA64_RR_BASE(5)) ? - tf->tf_special.bspstore : (curkthr->td_kstack + - (tf->tf_special.bspstore & 0x1ffUL)); - synth += tf->tf_special.ndirty; + bspstore = getreg(&tf->tf_special.bspstore); + synth = (bspstore >= IA64_RR_BASE(5)) ? bspstore : + (curkthr->td_kstack + (bspstore & 0x1ffUL)); + synth += getreg(&tf->tf_special.ndirty); return (&synth); case 352: /* bspstore. */ /* @@ -137,9 +137,9 @@ * space, setup bacpstore to point to the base of the * kernel stack. */ - synth = (tf->tf_special.bspstore >= IA64_RR_BASE(5)) ? - tf->tf_special.bspstore : (curkthr->td_kstack + - (tf->tf_special.bspstore & 0x1ffUL)); + bspstore = getreg(&tf->tf_special.bspstore); + synth = (bspstore >= IA64_RR_BASE(5)) ? bspstore : + (curkthr->td_kstack + (bspstore & 0x1ffUL)); return (&synth); } return (NULL); From owner-p4-projects@FreeBSD.ORG Sat Jun 12 07:36:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD10C16A4D1; Sat, 12 Jun 2004 07:36:44 +0000 (GMT) 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 81AB816A4CE for ; Sat, 12 Jun 2004 07:36:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C44C43D2D for ; Sat, 12 Jun 2004 07:36:44 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C7ahiU099271 for ; Sat, 12 Jun 2004 07:36:43 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C7ahJM099268 for perforce@freebsd.org; Sat, 12 Jun 2004 07:36:43 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 07:36:43 GMT Message-Id: <200406120736.i5C7ahJM099268@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 Subject: PERFORCE change 54706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 07:36:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=54706 Change 54706 by marcel@marcel_nfs on 2004/06/12 07:36:09 o Change prototype of gdb_packet_data(). It now returns whether we need to quit (which is when we received the kill command for example). o Declare verbose as extern. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/kgdb.h#6 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/kgdb.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ extern size_t gdb_rxsz; extern char *gdb_txp; -void gdb_packet_data(const char *, size_t); +int gdb_packet_data(const char *, size_t); int gdb_packet_recv(char *, size_t); int gdb_packet_send(const char *, size_t); @@ -105,6 +105,7 @@ } extern kvm_t *kvm; +extern int verbose; struct trapframe; From owner-p4-projects@FreeBSD.ORG Sat Jun 12 07:38:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 572CD16A4D1; Sat, 12 Jun 2004 07:38:49 +0000 (GMT) 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 3249E16A4CE for ; Sat, 12 Jun 2004 07:38:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15DF743D45 for ; Sat, 12 Jun 2004 07:38:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C7cldH099314 for ; Sat, 12 Jun 2004 07:38:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C7ckss099311 for perforce@freebsd.org; Sat, 12 Jun 2004 07:38:46 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 07:38:46 GMT Message-Id: <200406120738.i5C7ckss099311@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 Subject: PERFORCE change 54707 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 07:38:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=54707 Change 54707 by marcel@marcel_nfs on 2004/06/12 07:38:15 o Fix "info thread" by declaring the iterator as static. o Print received packets when the verbose level > 1. o In gdb_packet() and gdb_packet_data() return whether to quit. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/packet.c#5 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/packet.c#5 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -55,13 +56,13 @@ 10 + (((c) < 'a') ? (c) - 'A' : (c) - 'a')) #define N2C(n) (((n) < 10) ? (n) + '0' : (n) + 'a' - 10) -static void +static int gdb_packet(void) { - struct kthr *thr_iter; + static struct kthr *thr_iter = NULL; - thr_iter = NULL; - printf("GDB: got '%s'\n", gdb_rxp); + if (verbose > 1) + warnx("gdb_packet: '%s'", gdb_rxp); switch (gdb_rx_char()) { case '?': /* Last signal. */ gdb_tx_begin('S'); @@ -95,6 +96,8 @@ gdb_tx_ok(); break; } + case 'k': /* Kill request. */ + return (1); case 'm': { /* Read memory. */ uintmax_t addr, size; if (gdb_rx_varhex(&addr) || gdb_rx_char() != ',' || @@ -161,16 +164,19 @@ gdb_tx_empty(); break; } + return (0); } /* * Functions to receive and extract from a packet. */ -void +int gdb_packet_data(const char *buf, size_t sz) { + int ret; + ret = 0; switch (gdb_rxstate) { case 0: /* Hunt mode: looking for new packet. */ while (sz > 0 && *buf != '$') { @@ -178,7 +184,7 @@ sz--; } if (sz == 0) - return; + return (0); gdb_rxsz = 0; gdb_rxsum = 0; gdb_rxstate++; @@ -194,7 +200,7 @@ sz--; } if (sz == 0) - return; + return (0); gdb_rxbuf[gdb_rxsz] = 0; gdb_rxsum &= 0xff; gdb_rxstate++; @@ -203,7 +209,7 @@ /* FALLTHROUGH */ case 2: /* First checksum. */ if (sz == 0) - return; + return (0); gdb_rxsum -= (C2N(*buf) << 4) & 0xf0; gdb_rxstate++; buf++; @@ -211,12 +217,12 @@ /* FALLTHROUGH */ case 3: /* Second checksum. */ if (sz == 0) - return; + return (0); gdb_rxsum -= (C2N(*buf)) & 0x0f; if (gdb_rxsum == 0) { gdb_packet_send("+", 1); gdb_rxp = gdb_rxbuf; - gdb_packet(); + ret = gdb_packet(); } else gdb_packet_send("-", 1); gdb_rxstate = 0; @@ -224,6 +230,8 @@ default: assert(0); } + + return (ret); } int From owner-p4-projects@FreeBSD.ORG Sat Jun 12 07:39:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 006E816A4D1; Sat, 12 Jun 2004 07:39:56 +0000 (GMT) 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 CD72616A4CE for ; Sat, 12 Jun 2004 07:39:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0EE643D1F for ; Sat, 12 Jun 2004 07:39:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C7dnJ6099349 for ; Sat, 12 Jun 2004 07:39:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C7dn22099346 for perforce@freebsd.org; Sat, 12 Jun 2004 07:39:49 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 07:39:49 GMT Message-Id: <200406120739.i5C7dn22099346@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 Subject: PERFORCE change 54708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 07:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=54708 Change 54708 by marcel@marcel_nfs on 2004/06/12 07:39:36 Implement the kernel thread support functions. We now have thread info in the debugger. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/kthr.c#3 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/kthr.c#3 (text+ko) ==== @@ -31,40 +31,87 @@ #include #include #include +#include #include #include #include +#include + +#include #include "kgdb.h" +static struct kthr *first; struct kthr *curkthr; struct kthr * kgdb_thr_first(void) { - return (NULL); + return (first); } struct kthr * kgdb_thr_init(void) { - return (NULL); + struct nlist nl[2]; + struct proc p; + struct thread td; + struct kthr *thr; + uintptr_t paddr, tdaddr; + + nl[0].n_name = (char *)(uintptr_t)"_allproc"; + nl[1].n_name = NULL; + if (kvm_nlist(kvm, nl) != 0) { + warnx(kvm_geterr(kvm)); + return (NULL); + } + kvm_read(kvm, nl[0].n_value, &paddr, sizeof(paddr)); + + while (paddr != 0) { + kvm_read(kvm, paddr, &p, sizeof(p)); + tdaddr = (uintptr_t)TAILQ_FIRST(&p.p_threads); + while (tdaddr != 0) { + kvm_read(kvm, tdaddr, &td, sizeof(td)); + if (td.td_last_frame != NULL) { + thr = malloc(sizeof(*thr)); + thr->next = first; + thr->kaddr = tdaddr; + thr->td_frame = td.td_last_frame; + thr->td_kstack = td.td_kstack; + thr->td_tid = td.td_tid; + first = thr; + } + tdaddr = (uintptr_t)TAILQ_NEXT(&td, td_plist); + } + paddr = (uintptr_t)LIST_NEXT(&p, p_list); + } + curkthr = first; + return (first); } struct kthr * -kgdb_thr_lookup(int tid __unused) +kgdb_thr_lookup(int tid) { - return (NULL); + struct kthr *thr; + + thr = first; + while (thr != NULL && thr->td_tid != tid) + thr = thr->next; + return (thr); } struct kthr * -kgdb_thr_next(struct kthr *thr __unused) +kgdb_thr_next(struct kthr *thr) { - return (NULL); + return (thr->next); } struct kthr * -kgdb_thr_select(struct kthr *thr __unused) +kgdb_thr_select(struct kthr *thr) { - return (NULL); + struct kthr *pcur; + + pcur = curkthr; + curkthr = thr; + return (pcur); } From owner-p4-projects@FreeBSD.ORG Sat Jun 12 07:43:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BECFA16A4D1; Sat, 12 Jun 2004 07:43:40 +0000 (GMT) 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 90EB716A4CE for ; Sat, 12 Jun 2004 07:43:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A24243D1F for ; Sat, 12 Jun 2004 07:43:40 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C7gwNO000937 for ; Sat, 12 Jun 2004 07:42:58 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C7gweu000925 for perforce@freebsd.org; Sat, 12 Jun 2004 07:42:58 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 07:42:58 GMT Message-Id: <200406120742.i5C7gweu000925@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 Subject: PERFORCE change 54709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 07:43:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=54709 Change 54709 by marcel@marcel_nfs on 2004/06/12 07:41:57 Oops, forgotte in previous commit: don't dereference the trapframe in gdb_cpu_query(). use getreg(). Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/md_ia64.c#4 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/md_ia64.c#4 (text+ko) ==== @@ -169,7 +169,7 @@ } /* slot is unsigned. No need to test for negative values. */ - if (slot >= (curkthr->td_frame->tf_special.ndirty >> 3)) { + if (slot >= (getreg(&curkthr->td_frame->tf_special.ndirty) >> 3)) { gdb_tx_err(EINVAL); return (-1); } @@ -179,7 +179,7 @@ * the address of the user backing store. Calculate the right * kernel stack address. See also ptrace_machdep(). */ - bspstore = curkthr->td_frame->tf_special.bspstore; + bspstore = getreg(&curkthr->td_frame->tf_special.bspstore); kstack = (bspstore >= IA64_RR_BASE(5)) ? (uint64_t*)bspstore : (uint64_t*)(curkthr->td_kstack + (bspstore & 0x1ffUL)); gdb_tx_begin('\0'); From owner-p4-projects@FreeBSD.ORG Sat Jun 12 07:47:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82AAB16A4D1; Sat, 12 Jun 2004 07:47:30 +0000 (GMT) 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 5A2CF16A4CE for ; Sat, 12 Jun 2004 07:47:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 473EB43D49 for ; Sat, 12 Jun 2004 07:47:30 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5C7l4c9001549 for ; Sat, 12 Jun 2004 07:47:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5C7l4Sd001546 for perforce@freebsd.org; Sat, 12 Jun 2004 07:47:04 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 07:47:04 GMT Message-Id: <200406120747.i5C7l4Sd001546@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 Subject: PERFORCE change 54710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 07:47:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=54710 Change 54710 by marcel@marcel_nfs on 2004/06/12 07:46:55 o Instruct gdb(1) to load the kernel image. That way it has all the debug information it needs, including the symbols. o Exit the main loop when gdb_packet_dat() tells us to. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/main.c#10 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/main.c#10 (text+ko) ==== @@ -192,7 +192,7 @@ ssize_t sz; int fdin, fdout; int f, nfds, status; - int ch; + int ch, done; dumpnr = -1; @@ -274,6 +274,10 @@ if (write(cmdfile_fd, cmd_set_prompt, sizeof(cmd_set_prompt) - 1) < 0) err(1, "write(2)"); + sz = snprintf(buf, sizeof(buf), "file %s\n", kernel); + if (write(cmdfile_fd, buf, sz) < 0) + err(1, "write(2)"); + if (openpty(&gdb_rp_fd, &f, buf, NULL, NULL) == -1) err(1, "openpty(3)"); close(f); @@ -311,7 +315,8 @@ nfds = (gdb_rp_fd > nfds) ? gdb_rp_fd : nfds; nfds++; - while (1) { + done = 0; + while (!done) { FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&xfds); @@ -340,7 +345,7 @@ if (FD_ISSET(gdb_rp_fd, &rfds)) { sz = read(gdb_rp_fd, buf, sizeof(buf)); if (sz > 0) - gdb_packet_data(buf, sz); + done = gdb_packet_data(buf, sz); } } From owner-p4-projects@FreeBSD.ORG Sat Jun 12 16:59:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 814C716A4D1; Sat, 12 Jun 2004 16:59:24 +0000 (GMT) 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 53F0616A4CE for ; Sat, 12 Jun 2004 16:59:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B63043D31 for ; Sat, 12 Jun 2004 16:59:24 +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.12.11/8.12.11) with ESMTP id i5CGwIS3039902 for ; Sat, 12 Jun 2004 16:58:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5CGwI0e039898 for perforce@freebsd.org; Sat, 12 Jun 2004 16:58:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 12 Jun 2004 16:58:18 GMT Message-Id: <200406121658.i5CGwI0e039898@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 Subject: PERFORCE change 54725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 16:59:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=54725 Change 54725 by rwatson@rwatson_tislabs on 2004/06/12 16:57:36 Integrate netperf_socket; loop back: - Socket mutexes - Socket mutex init/destroy Also: - Altq - Ipfw ucred caching optimization Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#8 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/conf/files.alpha#4 integrate .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_red.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_rio.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_rio.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_rmclass.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_rmclass.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_subr.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altq_var.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/altqconf.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/altq/altq/if_altq.h#1 branch .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_mem.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twevar.h#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/tty_conf.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#8 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.147 2004/06/10 04:30:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.149 2004/06/12 06:03:27 alc Exp $"); #include #include @@ -172,7 +172,6 @@ #include #include #include -#include #include @@ -555,52 +554,6 @@ return 0; } -void * -uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) -{ - static vm_pindex_t color; - vm_page_t m; - int pflags; - void *va; - - *flags = UMA_SLAB_PRIV; - - if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; - else - pflags = VM_ALLOC_SYSTEM; - - if (wait & M_ZERO) - pflags |= VM_ALLOC_ZERO; - - for (;;) { - m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ); - if (m == NULL) { - if (wait & M_NOWAIT) - return (NULL); - else - VM_WAIT; - } else - break; - } - - va = (void *)ALPHA_PHYS_TO_K0SEG(m->phys_addr); - if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) - bzero(va, PAGE_SIZE); - return (va); -} - -void -uma_small_free(void *mem, int size, u_int8_t flags) -{ - vm_page_t m; - - m = PHYS_TO_VM_PAGE(ALPHA_K0SEG_TO_PHYS((vm_offset_t)mem)); - vm_page_lock_queues(); - vm_page_free(m); - vm_page_unlock_queues(); -} - /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap ==== //depot/projects/netperf_socket/sys/conf/files.alpha#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.110 2004/05/17 05:46:15 imp Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.111 2004/06/11 19:55:56 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -83,6 +83,7 @@ alpha/alpha/sys_machdep.c standard alpha/alpha/trap.c standard alpha/alpha/uio_machdep.c standard +alpha/alpha/uma_machdep.c standard alpha/alpha/vm_machdep.c standard alpha/isa/isa.c optional isa alpha/isa/isa_dma.c optional isa ==== //depot/projects/netperf_socket/sys/dev/bktr/bktr_mem.c#3 (text+ko) ==== @@ -1,9 +1,5 @@ - - -#include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.8 2004/05/30 20:08:27 phk Exp $"); /* - * This is prt of the Driver for Video Capture Cards (Frame grabbers) + * This is part of the Driver for Video Capture Cards (Frame grabbers) * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879 * chipset. * Copyright Roger Hardiman. @@ -47,6 +43,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.10 2004/06/11 18:47:44 schweikh Exp $"); #include #include @@ -55,12 +53,12 @@ #include struct memory_pointers { - int addresses_stored; - vm_offset_t dma_prog; - vm_offset_t odd_dma_prog; - vm_offset_t vbidata; - vm_offset_t vbibuffer; - vm_offset_t buf; + int addresses_stored; + vm_offset_t dma_prog; + vm_offset_t odd_dma_prog; + vm_offset_t vbidata; + vm_offset_t vbibuffer; + vm_offset_t buf; } memory_pointers; static struct memory_pointers memory_list[BKTR_MEM_MAX_DEVICES]; @@ -72,39 +70,37 @@ switch (type) { case MOD_LOAD: + printf("bktr_mem: memory holder loaded\n"); + /* + * bzero((caddr_t)memory_list, sizeof(memory_list)); + * causes a panic. So use a simple for loop for now. + */ { - printf("bktr_mem: memory holder loaded\n"); -/* - * bzero causes a panic. - bzero((caddr_t)memory_list, sizeof(memory_list)); - * So use a simple for loop for now. -*/ - {int x; - unsigned char *d = (unsigned char *)memory_list; - for (x=0; x< sizeof(memory_list); x++) { - d[x]=0; - } + int x; + unsigned char *d; + + d = (unsigned char *)memory_list; + for (x = 0; x < sizeof(memory_list); x++) + d[x] = 0; } return 0; - } case MOD_UNLOAD: - { printf("bktr_mem: memory holder cannot be unloaded\n"); return EBUSY; - } default: break; } - return 0; -}; + return (0); +} /*************************************************************/ int -bktr_has_stored_addresses(int unit) { +bktr_has_stored_addresses(int unit) +{ - if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) { - printf("bktr_mem: Unit number %d invalid\n",unit); + if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) { + printf("bktr_mem: Unit number %d invalid\n", unit); return 0; } @@ -114,64 +110,83 @@ /*************************************************************/ void -bktr_store_address(int unit, int type, vm_offset_t addr) { +bktr_store_address(int unit, int type, vm_offset_t addr) +{ - if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) { - printf("bktr_mem: Unit number %d invalid for memory type %d, address 0x%x\n" - ,unit,type,addr); + if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) { + printf("bktr_mem: Unit number %d invalid for memory type %d, address 0x%x\n", + unit, type, addr); return; } switch (type) { - case BKTR_MEM_DMA_PROG: memory_list[unit].dma_prog = addr; - memory_list[unit].addresses_stored = 1; - break; - case BKTR_MEM_ODD_DMA_PROG: memory_list[unit].odd_dma_prog = addr; - memory_list[unit].addresses_stored = 1; - break; - case BKTR_MEM_VBIDATA: memory_list[unit].vbidata = addr; - memory_list[unit].addresses_stored = 1; - break; - case BKTR_MEM_VBIBUFFER: memory_list[unit].vbibuffer = addr; - memory_list[unit].addresses_stored = 1; - break; - case BKTR_MEM_BUF: memory_list[unit].buf = addr; - memory_list[unit].addresses_stored = 1; - break; - default: printf("bktr_mem: Invalid memory type %d for bktr%d, address 0x%xn", - type,unit,addr); - break; + case BKTR_MEM_DMA_PROG: + memory_list[unit].dma_prog = addr; + memory_list[unit].addresses_stored = 1; + break; + case BKTR_MEM_ODD_DMA_PROG: + memory_list[unit].odd_dma_prog = addr; + memory_list[unit].addresses_stored = 1; + break; + case BKTR_MEM_VBIDATA: + memory_list[unit].vbidata = addr; + memory_list[unit].addresses_stored = 1; + break; + case BKTR_MEM_VBIBUFFER: + memory_list[unit].vbibuffer = addr; + memory_list[unit].addresses_stored = 1; + break; + case BKTR_MEM_BUF: + memory_list[unit].buf = addr; + memory_list[unit].addresses_stored = 1; + break; + default: + printf("bktr_mem: Invalid memory type %d for bktr%d, address 0x%xn", + type, unit, addr); + break; } } /*************************************************************/ vm_offset_t -bktr_retrieve_address(int unit, int type) { +bktr_retrieve_address(int unit, int type) +{ - if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) { - printf("bktr_mem: Unit number %d too large for memory type %d\n",unit,type); - return NULL; + if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) { + printf("bktr_mem: Unit number %d too large for memory type %d\n", + unit, type); + return (0); } switch (type) { - case BKTR_MEM_DMA_PROG: return memory_list[unit].dma_prog; - case BKTR_MEM_ODD_DMA_PROG: return memory_list[unit].odd_dma_prog; - case BKTR_MEM_VBIDATA: return memory_list[unit].vbidata; - case BKTR_MEM_VBIBUFFER: return memory_list[unit].vbibuffer; - case BKTR_MEM_BUF: return memory_list[unit].buf; - default: printf("bktr_mem: Invalid memory type %d for bktr%d",type,unit); - return NULL; + case BKTR_MEM_DMA_PROG: + return memory_list[unit].dma_prog; + case BKTR_MEM_ODD_DMA_PROG: + return memory_list[unit].odd_dma_prog; + case BKTR_MEM_VBIDATA: + return memory_list[unit].vbidata; + case BKTR_MEM_VBIBUFFER: + return memory_list[unit].vbibuffer; + case BKTR_MEM_BUF: + return memory_list[unit].buf; + default: + printf("bktr_mem: Invalid memory type %d for bktr%d", + type, unit); + return (0); } } /*************************************************************/ static moduledata_t bktr_mem_mod = { - "bktr_mem", - bktr_mem_modevent, - 0 + "bktr_mem", + bktr_mem_modevent, + 0 }; -/* The load order is First and module type is Driver to make sure bktr_mem - loads (and initialises) before bktr when both are loaded together */ + +/* + * The load order is First and module type is Driver to make sure bktr_mem + * loads (and initialises) before bktr when both are loaded together. + */ DECLARE_MODULE(bktr_mem, bktr_mem_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(bktr_mem, 1); ==== //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.1 2004/06/10 05:11:39 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.3 2004/06/12 03:23:37 scottl Exp $"); #include #include @@ -391,6 +391,8 @@ sc->sc_maxsync = sc->sc_minsync; sc->sc_maxoffset = 15; + sc->sc_extended_geom = 1; + /* * Alas, we must now modify the value a bit, because it's * only valid when can switch on FASTCLK and FASTSCSI bits ==== //depot/projects/netperf_socket/sys/dev/esp/ncr53c9x.c#2 (text+ko) ==== @@ -104,7 +104,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/esp/ncr53c9x.c,v 1.1 2004/06/10 05:11:39 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/esp/ncr53c9x.c,v 1.3 2004/06/12 05:19:17 scottl Exp $"); #include #include @@ -839,7 +839,7 @@ return; case XPT_CALC_GEOMETRY: mtx_unlock(&sc->sc_lock); - cam_calc_geometry(&ccb->ccg, 0); /* XXX Extended? */ + cam_calc_geometry(&ccb->ccg, sc->sc_extended_geom); xpt_done(ccb); return; case XPT_PATH_INQ: @@ -944,7 +944,7 @@ ecb->ccb = ccb; ecb->timeout = ccb->ccb_h.timeout; - if (ccb->ccb_h.func_code == XPT_RESET_BUS) { + if (ccb->ccb_h.func_code == XPT_RESET_DEV) { ecb->flags |= ECB_RESET; ecb->clen = 0; ecb->dleft = 0; @@ -1219,6 +1219,7 @@ if ((ecb->flags & ECB_ABORT) != 0) { ccb->ccb_h.status = CAM_CMD_TIMEOUT; } else if ((ecb->flags & ECB_SENSE) != 0) { + ccb->ccb_h.status = CAM_AUTOSNS_VALID; } else if (ecb->stat == SCSI_STATUS_CHECK_COND) { if ((ecb->flags & ECB_SENSE) != 0) ccb->ccb_h.status = CAM_AUTOSENSE_FAIL; ==== //depot/projects/netperf_socket/sys/dev/esp/ncr53c9xvar.h#2 (text+ko) ==== @@ -66,7 +66,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/dev/esp/ncr53c9xvar.h,v 1.1 2004/06/10 05:11:39 scottl Exp $ */ +/* $FreeBSD: src/sys/dev/esp/ncr53c9xvar.h,v 1.2 2004/06/11 15:33:20 scottl Exp $ */ #ifndef _DEV_IC_NCR53C9XVAR_H_ #define _DEV_IC_NCR53C9XVAR_H_ @@ -345,6 +345,7 @@ int sc_maxsync; /* Maximum sync period */ int sc_maxoffset; /* Maximum offset */ int sc_maxwidth; /* Maximum width */ + int sc_extended_geom; /* Should we return extended geometry */ struct mtx sc_lock; /* driver mutex */ }; ==== //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#8 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.26 2004/06/10 00:06:04 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.27 2004/06/12 02:23:06 marius Exp $"); /* * HME Ethernet module driver. @@ -819,7 +819,7 @@ #endif /* Set the current media. */ - mii_mediachg(sc->sc_mii); + /* mii_mediachg(sc->sc_mii); */ /* Start the one second timer. */ callout_reset(&sc->sc_tick_ch, hz, hme_tick, sc); ==== //depot/projects/netperf_socket/sys/dev/twe/twe.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twe.c,v 1.21 2004/05/12 04:10:37 vkashyap Exp $ + * $FreeBSD: src/sys/dev/twe/twe.c,v 1.22 2004/06/11 18:42:44 vkashyap Exp $ */ /* @@ -384,7 +384,7 @@ debug_called(4); - if (sc->twe_state & TWE_STATE_FRZN) + if (sc->twe_state & (TWE_STATE_CTLR_BUSY | TWE_STATE_FRZN)) return; /* spin until something prevents us from doing any work */ @@ -435,6 +435,8 @@ error = twe_map_request(tr); if (error != 0) { + if (error == EBUSY) + break; tr->tr_status = TWE_CMD_ERROR; if (tr->tr_private != NULL) { bp = (twe_bio *)(tr->tr_private); @@ -762,7 +764,7 @@ } else { tr->tr_complete = func; error = twe_map_request(tr); - if (error == 0) + if ((error == 0) || (error == EBUSY)) return(func); } @@ -931,7 +933,8 @@ tr->tr_flags |= TWE_CMD_IMMEDIATE; tr->tr_status = TWE_CMD_BUSY; if ((error = twe_map_request(tr)) != 0) - return(error); + if (error != EBUSY) + return(error); while (tr->tr_status == TWE_CMD_BUSY){ twe_done(tr->tr_sc); } @@ -1131,6 +1134,7 @@ /* move to completed queue */ twe_remove_busy(tr); twe_enqueue_complete(tr); + sc->twe_state &= ~TWE_STATE_CTLR_BUSY; } else { break; /* no response ready */ } ==== //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.37 2004/03/25 19:30:35 vkashyap Exp $ + * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.38 2004/06/11 18:42:44 vkashyap Exp $ */ /* @@ -1014,8 +1014,10 @@ } } - if (twe_start(tr) == EBUSY) + if (twe_start(tr) == EBUSY) { + tr->tr_sc->twe_state |= TWE_STATE_CTLR_BUSY; twe_requeue_ready(tr); + } } static void @@ -1037,8 +1039,10 @@ debug_called(4); - if (sc->twe_state & TWE_STATE_FRZN) + if (sc->twe_state & (TWE_STATE_CTLR_BUSY | TWE_STATE_FRZN)) { + twe_requeue_ready(tr); return (EBUSY); + } bus_dmamap_sync(sc->twe_cmd_dmat, sc->twe_cmdmap, BUS_DMASYNC_PREWRITE); @@ -1079,8 +1083,8 @@ } } else if ((error = twe_start(tr)) == EBUSY) { + sc->twe_state |= TWE_STATE_CTLR_BUSY; twe_requeue_ready(tr); - error = 0; } return(error); ==== //depot/projects/netperf_socket/sys/dev/twe/twevar.h#5 (text+ko) ==== @@ -24,10 +24,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twevar.h,v 1.12 2004/05/12 04:10:37 vkashyap Exp $ + * $FreeBSD: src/sys/dev/twe/twevar.h,v 1.13 2004/06/11 18:42:44 vkashyap Exp $ */ -#define TWE_DRIVER_VERSION_STRING "1.50.01.001" +#define TWE_DRIVER_VERSION_STRING "1.50.01.002" #ifdef TWE_DEBUG #define debug(level, fmt, args...) \ @@ -131,7 +131,8 @@ #define TWE_STATE_SHUTDOWN (1<<1) /* controller is shut down */ #define TWE_STATE_OPEN (1<<2) /* control device is open */ #define TWE_STATE_SUSPEND (1<<3) /* controller is suspended */ -#define TWE_STATE_FRZN (1<<4) +#define TWE_STATE_FRZN (1<<4) /* got EINPROGRESS */ +#define TWE_STATE_CTLR_BUSY (1<<5) /* controller cmd queue full */ int twe_host_id; struct twe_qstat twe_qstat[TWEQ_COUNT]; /* queue statistics */ ==== //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.133 2004/06/11 04:24:35 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.134 2004/06/11 20:11:41 alc Exp $"); #include #include @@ -1606,7 +1606,8 @@ /* * Enter on the PV list if part of our managed memory. */ - if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) { + if (pmap_initialized && + (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, m); managed |= PTE_IG_MANAGED; } @@ -1653,17 +1654,23 @@ { struct ia64_lpte *pte; pmap_t oldpmap; + int managed; oldpmap = pmap_install(pmap); pte = pmap_find_pte(va); if (pte->pte_p) goto reinstall; + managed = 0; /* * Enter on the PV list since its part of our managed memory. */ - pmap_insert_entry(pmap, va, m); + if (pmap_initialized && + (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + pmap_insert_entry(pmap, va, m); + managed |= PTE_IG_MANAGED; + } /* * Increment counters @@ -1673,8 +1680,7 @@ /* * Initialise PTE with read-only protection and enter into VHPT. */ - pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m), - PTE_IG_MANAGED, + pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m), managed, PTE_PL_USER, PTE_AR_R); reinstall: pmap_install(oldpmap); ==== //depot/projects/netperf_socket/sys/kern/kern_kse.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.180 2004/06/07 07:26:53 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.181 2004/06/11 17:48:20 julian Exp $"); #include #include @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -53,6 +52,7 @@ /* DEBUG ONLY */ extern int virtual_cpu; extern int thread_debug; + extern int max_threads_per_proc; extern int max_groups_per_proc; extern int max_threads_hits; @@ -73,39 +73,6 @@ void kseinit(void); void kse_GC(void); -static int virtual_cpu; -SYSCTL_DECL(_kern_threads); - -static int -sysctl_kse_virtual_cpu(SYSCTL_HANDLER_ARGS) -{ - int error, new_val; - int def_val; - -#ifdef SMP - def_val = mp_ncpus; -#else - def_val = 1; -#endif - if (virtual_cpu == 0) - new_val = def_val; - else - new_val = virtual_cpu; - error = sysctl_handle_int(oidp, &new_val, 0, req); - if (error != 0 || req->newptr == NULL) - return (error); - if (new_val < 0) - return (EINVAL); - virtual_cpu = new_val; - return (0); -} - -/* DEBUG ONLY */ -SYSCTL_PROC(_kern_threads, OID_AUTO, virtual_cpu, CTLTYPE_INT|CTLFLAG_RW, - 0, sizeof(virtual_cpu), sysctl_kse_virtual_cpu, "I", - "debug virtual cpus"); - - struct kse_upcall * upcall_alloc(void) { @@ -265,10 +232,24 @@ int error, count; p = td->td_proc; + /* + * Ensure that this is only called from the UTS + */ if ((ku = td->td_upcall) == NULL || TD_CAN_UNBIND(td)) return (EINVAL); + kg = td->td_ksegrp; count = 0; + + /* + * Calculate the existing non-exiting upcalls in this ksegroup. + * If we are the last upcall but there are still other threads, + * then do not exit. We need the other threads to be able to + * complete whatever they are doing. + * XXX This relies on the userland knowing what to do if we return. + * It may be a better choice to convert ourselves into a kse_release + * ( or similar) and wait in the kernel to be needed. + */ PROC_LOCK(p); mtx_lock_spin(&sched_lock); FOREACH_UPCALL_IN_GROUP(kg, ku2) { @@ -284,6 +265,12 @@ ku->ku_flags |= KUF_EXITING; mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); + + /* + * Mark the UTS mailbox as having been finished with. + * If that fails then just go for a segfault. + * XXX need to check it that can be deliverred without a mailbox. + */ error = suword(&ku->ku_mailbox->km_flags, ku->ku_mflags|KMF_DONE); PROC_LOCK(p); if (error) @@ -467,12 +454,7 @@ if ((err = copyin(uap->mbx, &mbx, sizeof(mbx)))) return (err); - /* Too bad, why hasn't kernel always a cpu counter !? */ -#ifdef SMP ncpus = mp_ncpus; -#else - ncpus = 1; -#endif if (virtual_cpu != 0) ncpus = virtual_cpu; if (!(mbx.km_flags & KMF_BOUND)) @@ -635,7 +617,7 @@ } /* - * Initialize global kse related resources. + * Initialize global thread allocation resources. */ void kseinit(void) @@ -669,7 +651,7 @@ * Don't even bother to lock if none at this instant, * we really don't care about the next instant.. */ - if ((!TAILQ_EMPTY(&zombie_upcalls))) { + if (!TAILQ_EMPTY(&zombie_upcalls)) { mtx_lock_spin(&kse_zombie_lock); ku_first = TAILQ_FIRST(&zombie_upcalls); if (ku_first) @@ -929,7 +911,7 @@ bcopy(&td->td_startcopy, &td2->td_startcopy, (unsigned) RANGEOF(struct thread, td_startcopy, td_endcopy)); thread_link(td2, ku->ku_ksegrp); - /* inherit blocked thread's context */ + /* inherit parts of blocked thread's context as a good template */ cpu_set_upcall(td2, td); /* Let the new thread become owner of the upcall */ ku->ku_owner = td2; @@ -1285,3 +1267,4 @@ else return (0); } + ==== //depot/projects/netperf_socket/sys/kern/kern_thread.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.180 2004/06/09 14:06:44 jmallett Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.181 2004/06/11 17:48:20 julian Exp $"); #include #include @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -70,6 +71,9 @@ SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_hits, CTLFLAG_RD, &max_threads_hits, 0, ""); +int virtual_cpu; + +#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) TAILQ_HEAD(, thread) zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); TAILQ_HEAD(, kse) zombie_kses = TAILQ_HEAD_INITIALIZER(zombie_kses); @@ -85,7 +89,31 @@ extern void kse_GC(void); +static int +sysctl_kse_virtual_cpu(SYSCTL_HANDLER_ARGS) +{ + int error, new_val; + int def_val; + def_val = mp_ncpus; + if (virtual_cpu == 0) + new_val = def_val; + else + new_val = virtual_cpu; + error = sysctl_handle_int(oidp, &new_val, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (new_val < 0) + return (EINVAL); + virtual_cpu = new_val; + return (0); +} + +/* DEBUG ONLY */ +SYSCTL_PROC(_kern_threads, OID_AUTO, virtual_cpu, CTLTYPE_INT|CTLFLAG_RW, + 0, sizeof(virtual_cpu), sysctl_kse_virtual_cpu, "I", + "debug virtual cpus"); + /* * Thread ID allocator. The allocator keeps track of assigned IDs by * using a bitmap. The bitmap is created in parts. The parts are linked @@ -556,11 +584,24 @@ /* * Discard the current thread and exit from its context. + * Always called with scheduler locked. * * Because we can't free a thread while we're operating under its context, * push the current thread into our CPU's deadthread holder. This means * we needn't worry about someone else grabbing our context before we - * do a cpu_throw(). + * do a cpu_throw(). This may not be needed now as we are under schedlock. + * Maybe we can just do a thread_stash() as thr_exit1 does. + */ +/* XXX + * libthr expects its thread exit to return for the last + * thread, meaning that the program is back to non-threaded + * mode I guess. Because we do this (cpu_throw) unconditionally + * here, they have their own version of it. (thr_exit1()) + * that doesn't do it all if this was the last thread. + * It is also called from thread_suspend_check(). + * Of course in the end, they end up coming here through exit1 + * anyhow.. After fixing 'thr' to play by the rules we should be able + * to merge these two functions together. */ void thread_exit(void) ==== //depot/projects/netperf_socket/sys/kern/tty_conf.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_conf.c,v 1.21 2004/06/07 20:45:45 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_conf.c,v 1.22 2004/06/12 12:31:42 phk Exp $"); #include "opt_compat.h" @@ -122,8 +122,9 @@ if (discipline == LDISC_LOAD) { int i; for (i = LOADABLE_LDISC; i < MAXLDISC; i++) - if (bcmp(linesw + i, &nodisc, sizeof(nodisc)) == 0) { + if (linesw[i] == &nodisc) { slot = i; + break; } } else if (discipline >= 0 && discipline < MAXLDISC) { slot = discipline; ==== //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.132 2004/06/10 00:04:27 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.133 2004/06/11 18:17:25 bmilekic Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -237,7 +237,7 @@ */ if (m->m_ext.ext_type == EXT_PACKET) { uma_zfree(zone_pack, m); - break; + return; } else if (m->m_ext.ext_type == EXT_CLUSTER) { uma_zfree(zone_clust, m->m_ext.ext_buf); m->m_ext.ext_buf = NULL; @@ -246,13 +246,14 @@ m->m_ext.ext_args); if (m->m_ext.ext_type != EXT_EXTREF) free(m->m_ext.ref_cnt, M_MBUF); + m->m_ext.ext_buf = NULL; } - uma_zfree(zone_mbuf, m); } /* Decrement (and potentially free) done, safely. */ break; } } while (1); + uma_zfree(zone_mbuf, m); } /* ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.175 2004/06/08 13:08:17 stefanf Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.176 2004/06/12 16:08:41 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" ==== //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#7 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.61 2004/06/10 20:20:37 ru Exp $ + * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.62 2004/06/11 22:17:14 csjp Exp $ */ #define DEB(x) @@ -113,6 +113,18 @@ static struct callout ipfw_timeout; #define IPFW_DEFAULT_RULE 65535 +/* + * Data structure to cache our ucred related + * information. This structure only gets used if + * the user specified UID/GID based constraints in + * a firewall rule. + */ +struct ip_fw_ugid { + gid_t fw_groups[NGROUPS]; + int fw_ngroups; + uid_t fw_uid; +}; + struct ip_fw_chain { struct ip_fw *rules; /* list of rules */ struct ip_fw *reap; /* list of rules to reap */ @@ -1530,13 +1542,23 @@ ipfw_insn_u32 *insn, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 12 20:56:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42BFC16A4D2; Sat, 12 Jun 2004 20:56:26 +0000 (GMT) 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 1C18A16A4CE for ; Sat, 12 Jun 2004 20:56:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1520243D53 for ; Sat, 12 Jun 2004 20:56:26 +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.12.11/8.12.11) with ESMTP id i5CKuG8E001263 for ; Sat, 12 Jun 2004 20:56:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5CKuFoW001260 for perforce@freebsd.org; Sat, 12 Jun 2004 20:56:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 12 Jun 2004 20:56:15 GMT Message-Id: <200406122056.i5CKuFoW001260@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 Subject: PERFORCE change 54741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 20:56:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=54741 Change 54741 by rwatson@rwatson_tislabs on 2004/06/12 20:55:44 Integrate netperf_socket from CVS HEAD from just before the merge of reference count locking; pick up reformatting of socketvar.h. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/netperf_socket/sys/contrib/altq/altq/if_altq.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#10 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.466 2004/06/08 02:20:40 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.467 2004/06/12 20:01:47 alc Exp $"); /* * Manages physical address maps. @@ -2200,10 +2200,10 @@ pte = pmap_pte(pmap, va); if (wired && (*pte & PG_W) == 0) { pmap->pm_stats.wired_count++; - *pte |= PG_W; + atomic_set_long(pte, PG_W); } else if (!wired && (*pte & PG_W) != 0) { pmap->pm_stats.wired_count--; - *pte &= ~PG_W; + atomic_clear_long(pte, PG_W); } } ==== //depot/projects/netperf_socket/sys/contrib/altq/altq/if_altq.h#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD: src/sys/contrib/altq/altq/if_altq.h,v 1.2 2004/06/12 18:47:24 mlaier Exp $ */ /* $KAME: if_altq.h,v 1.11 2003/07/10 12:07:50 kjc Exp $ */ /* @@ -54,6 +55,12 @@ struct mtx ifq_mtx; #endif + /* driver owned queue (used for bulk dequeue and prepend) UNLOCKED */ + struct mbuf *ifq_drv_head; + struct mbuf *ifq_drv_tail; + int ifq_drv_len; + int ifq_drv_maxlen; + /* alternate queueing related fields */ int altq_type; /* discipline type */ int altq_flags; /* flags (e.g. ready, in-use) */ ==== //depot/projects/netperf_socket/sys/i386/i386/pmap.c#8 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.467 2004/05/28 19:42:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.468 2004/06/12 20:01:48 alc Exp $"); /* * Manages physical address maps. @@ -178,7 +178,8 @@ #define pmap_pte_u(pte) ((*(int *)pte & PG_A) != 0) #define pmap_pte_v(pte) ((*(int *)pte & PG_V) != 0) -#define pmap_pte_set_w(pte, v) ((v)?(*(int *)pte |= PG_W):(*(int *)pte &= ~PG_W)) +#define pmap_pte_set_w(pte, v) ((v) ? atomic_set_int((u_int *)(pte), PG_W) : \ + atomic_clear_int((u_int *)(pte), PG_W)) #define pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v))) struct pmap kernel_pmap_store; ==== //depot/projects/netperf_socket/sys/sys/socketvar.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.117 2004/06/12 16:08:41 rwatson Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.118 2004/06/12 18:37:29 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -332,47 +332,51 @@ * still explicitly close the socket, but the last ref count will free * the structure. */ -#define soref(so) do { \ - ++(so)->so_count; \ +#define soref(so) do { \ + ++(so)->so_count; \ } while (0) -#define sorele(so) do { \ - SOCK_LOCK_ASSERT(so); \ - if ((so)->so_count <= 0) \ - panic("sorele"); \ - if (--(so)->so_count == 0) \ - sofree(so); \ - else \ - SOCK_UNLOCK(so); \ - so = NULL; \ +#define sorele(so) do { \ + SOCK_LOCK_ASSERT(so); \ + if ((so)->so_count <= 0) \ + panic("sorele"); \ + if (--(so)->so_count == 0) \ + sofree(so); \ + else \ + SOCK_UNLOCK(so); \ + so = NULL; \ } while (0) -#define sotryfree(so) do { \ - SOCK_LOCK_ASSERT(so); \ - if ((so)->so_count == 0) \ - sofree(so); \ - else \ - SOCK_UNLOCK(so); \ - so = NULL; \ +#define sotryfree(so) do { \ + SOCK_LOCK_ASSERT(so); \ + if ((so)->so_count == 0) \ + sofree(so); \ + else \ + SOCK_UNLOCK(so); \ + so = NULL; \ +} while(0) + +#define sorwakeup(so) do { \ + if (sb_notify(&(so)->so_rcv)) \ + sowakeup((so), &(so)->so_rcv); \ } while (0) -#define sorwakeup(so) do { \ - if (sb_notify(&(so)->so_rcv)) \ - sowakeup((so), &(so)->so_rcv); \ +#define sorwakeup_locked(so) do { \ + if (sb_notify(&(so)->so_rcv)) \ + sowakeup_locked((so), &(so)->so_rcv); \ } while (0) -#define sorwakeup_locked(so) do { \ - if (sb_notify(&(so)->so_rcv)) \ - sowakeup_locked((so), &(so)->so_rcv); \ + +#define sowwakeup(so) do { \ + if (sb_notify(&(so)->so_snd)) \ + sowakeup((so), &(so)->so_snd); \ } while (0) -#define sowwakeup(so) do { \ - if (sb_notify(&(so)->so_snd)) \ - sowakeup((so), &(so)->so_snd); \ +#define sowwakeup_locked(so) do { \ + if (sb_notify(&(so)->so_snd)) \ + sowakeup_locked((so), &(so)->so_snd); \ } while (0) -#define sowwakeup_locked(so) do { \ - if (sb_notify(&(so)->so_snd)) \ - sowakeup_locked((so), &(so)->so_snd); \ -} while (0) + +#ifdef _KERNEL /* * Argument structure for sosetopt et seq. This is in the KERNEL From owner-p4-projects@FreeBSD.ORG Sat Jun 12 21:15:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4614D16A4D1; Sat, 12 Jun 2004 21:15:06 +0000 (GMT) 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 2032216A4CE for ; Sat, 12 Jun 2004 21:15:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 184AD43D4C for ; Sat, 12 Jun 2004 21:15:06 +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.12.11/8.12.11) with ESMTP id i5CLDfiJ006440 for ; Sat, 12 Jun 2004 21:13:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5CLDeME006437 for perforce@freebsd.org; Sat, 12 Jun 2004 21:13:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 12 Jun 2004 21:13:40 GMT Message-Id: <200406122113.i5CLDeME006437@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 Subject: PERFORCE change 54746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 21:15:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=54746 Change 54746 by rwatson@rwatson_tislabs on 2004/06/12 21:13:35 Integrate netperf_socket from FreeBSD CVS HEAD following merge of socket reference count locking from rwatson_netperf. Affected files ... .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/netperf_socket/sys/net/raw_cb.c#5 integrate .. //depot/projects/netperf_socket/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#6 integrate .. //depot/projects/netperf_socket/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#4 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/netperf_socket/sys/netnatm/natm.c#4 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#11 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/kern_descrip.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.232 2004/06/11 11:16:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.233 2004/06/12 20:47:28 rwatson Exp $"); #include "opt_compat.h" @@ -2024,7 +2024,9 @@ *spp = fp->f_data; if (fflagp) *fflagp = fp->f_flag; + SOCK_LOCK(*spp); soref(*spp); + SOCK_UNLOCK(*spp); } FILEDESC_UNLOCK(td->td_proc->p_fd); return (error); ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#16 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.176 2004/06/12 16:08:41 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.177 2004/06/12 20:47:28 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -201,7 +201,9 @@ #ifdef MAC mac_create_socket(cred, so); #endif + SOCK_LOCK(so); soref(so); + SOCK_UNLOCK(so); error = (*prp->pr_usrreqs->pru_attach)(so, proto, td); if (error) { SOCK_LOCK(so); @@ -297,6 +299,7 @@ if (so->so_pcb != NULL || (so->so_state & SS_NOFDREF) == 0) { SOCK_UNLOCK(so); return; + } SOCK_UNLOCK(so); ACCEPT_LOCK(); @@ -418,6 +421,7 @@ error = error2; } discard: + SOCK_LOCK(so); if (so->so_state & SS_NOFDREF) panic("soclose: NOFDREF"); so->so_state |= SS_NOFDREF; ==== //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#16 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.189 2004/06/11 11:16:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.190 2004/06/12 20:47:28 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -311,7 +311,14 @@ KASSERT(!(so->so_qstate & SQ_INCOMP), ("accept1: so SQ_INCOMP")); KASSERT(so->so_qstate & SQ_COMP, ("accept1: so not SQ_COMP")); + /* + * Before changing the flags on the socket, we have to bump the + * reference count. Otherwise, if the protocol calls sofree(), + * the socket will be released due to a zero refcount. + */ + SOCK_LOCK(so); soref(so); /* file descriptor reference */ + SOCK_UNLOCK(so); TAILQ_REMOVE(&head->so_comp, so, so_list); head->so_qlen--; ==== //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.122 2004/06/10 21:34:38 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.123 2004/06/12 20:47:28 rwatson Exp $"); #include "opt_mac.h" ==== //depot/projects/netperf_socket/sys/net/raw_cb.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)raw_cb.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/raw_cb.c,v 1.27 2004/06/11 03:52:56 rwatson Exp $ + * $FreeBSD: src/sys/net/raw_cb.c,v 1.28 2004/06/12 20:47:29 rwatson Exp $ */ #include ==== //depot/projects/netperf_socket/sys/net/raw_usrreq.c#5 (text+ko) ==== @@ -27,14 +27,13 @@ * SUCH DAMAGE. * * @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.32 2004/04/07 20:46:12 imp Exp $ + * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.33 2004/06/12 20:47:29 rwatson Exp $ */ #include #include #include #include -#include #include #include #include @@ -141,12 +140,9 @@ if (rp == 0) return EINVAL; raw_disconnect(rp); + soisdisconnected(so); SOCK_LOCK(so); - if (so->so_count != 0) { - soisdisconnected(so); - SOCK_UNLOCK(so); - } else - sofree(so); + sotryfree(so); return 0; } ==== //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#6 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.42 2004/03/22 04:54:36 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.43 2004/06/12 20:47:29 rwatson Exp $ */ #include @@ -253,6 +253,7 @@ at_pcbdetach(struct socket *so, struct ddpcb *ddp) { soisdisconnected(so); + SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/netperf_socket/sys/netatm/atm_socket.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.19 2003/10/31 18:32:10 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.20 2004/06/12 20:47:29 rwatson Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_hci_raw.c,v 1.14 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.14 2004/05/29 00:51:18 julian Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.15 2004/06/12 20:47:30 rwatson Exp $ */ #include @@ -1417,6 +1417,7 @@ bzero(pcb, sizeof(*pcb)); FREE(pcb, M_NETGRAPH_BTSOCKET_HCI_RAW); + SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.12 2004/05/29 00:51:18 julian Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.13 2004/06/12 20:47:30 rwatson Exp $ */ #include @@ -1804,6 +1804,7 @@ FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP); soisdisconnected(so); + SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); @@ -2346,6 +2347,7 @@ FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP); soisdisconnected(so); + SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap_raw.c,v 1.12 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.11 2004/05/29 00:51:18 julian Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.12 2004/06/12 20:47:30 rwatson Exp $ */ #include @@ -1129,6 +1129,7 @@ bzero(pcb, sizeof(*pcb)); FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP_RAW); + SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.8 2004/06/02 04:15:38 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.9 2004/06/12 20:47:30 rwatson Exp $ */ #include @@ -724,6 +724,7 @@ FREE(pcb, M_NETGRAPH_BTSOCKET_RFCOMM); soisdisconnected(so); + SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); @@ -1370,8 +1371,10 @@ s0->l2so->so_qlen --; l2so->so_qstate &= ~SQ_COMP; l2so->so_head = NULL; + SOCK_LOCK(l2so); soref(l2so); l2so->so_state |= SS_NBIO; + SOCK_UNLOCK(l2so); ACCEPT_UNLOCK(); error = soaccept(l2so, (struct sockaddr **) &l2sa); ==== //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.42 2004/06/02 04:15:38 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.43 2004/06/12 20:47:30 rwatson Exp $ * $Whistle: ng_ksocket.c,v 1.1 1999/11/16 20:04:40 archie Exp $ */ @@ -1205,8 +1205,10 @@ head->so_qlen--; so->so_qstate &= ~SQ_COMP; so->so_head = NULL; + SOCK_LOCK(so); soref(so); so->so_state |= SS_NBIO; + SOCK_UNLOCK(so); ACCEPT_UNLOCK(); /* XXX KNOTE(&head->so_rcv.sb_sel.si_note, 0); */ ==== //depot/projects/netperf_socket/sys/netinet/in_pcb.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.147 2004/05/20 06:35:02 yar Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.148 2004/06/12 20:47:31 rwatson Exp $ */ #include "opt_ipsec.h" ==== //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.189 2004/05/04 02:11:47 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.190 2004/06/12 20:47:31 rwatson Exp $ */ #include "opt_compat.h" @@ -1666,15 +1666,10 @@ so->so_pcb = NULL; tw->tw_cred = crhold(so->so_cred); tw->tw_so_options = so->so_options; - sotryfree(so); /* NB: drops lock */ + sotryfree(so); inp->inp_socket = NULL; if (acknow) tcp_twrespond(tw, TH_ACK); -#if 0 - /* XXXRW: Sam removed this, need to check why. */ - sotryfree(so); - inp->inp_socket = NULL; -#endif inp->inp_ppcb = (caddr_t)tw; inp->inp_vflag |= INP_TIMEWAIT; tcp_timer_2msl_reset(tw, tw_time); ==== //depot/projects/netperf_socket/sys/netinet6/in6_pcb.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.51 2004/04/07 20:46:15 imp Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.52 2004/06/12 20:59:48 rwatson Exp $ */ /* $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $ */ /* ==== //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.27 2004/03/01 03:14:22 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.28 2004/06/12 20:47:31 rwatson Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/netipx/ipx_usrreq.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.39 2003/11/18 00:39:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.40 2004/06/12 20:47:31 rwatson Exp $"); #include "opt_ipx.h" @@ -423,12 +423,9 @@ s = splnet(); ipx_pcbdetach(ipxp); splx(s); + soisdisconnected(so); SOCK_LOCK(so); - if (so->so_count != 0) { - soisdisconnected(so); - SOCK_UNLOCK(so); - } else - sofree(so); + sotryfree(so); return (0); } ==== //depot/projects/netperf_socket/sys/netnatm/natm.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.32 2004/03/01 03:14:22 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.33 2004/06/12 20:47:31 rwatson Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/sys/socketvar.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.118 2004/06/12 18:37:29 rwatson Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.119 2004/06/12 20:47:32 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -57,7 +57,7 @@ * (g) used only as a sleep/wakeup address, no value. */ struct socket { - int so_count; /* reference count */ + int so_count; /* (b) reference count */ short so_type; /* (a) generic type, see socket.h */ short so_options; /* from socket call, see socket.h */ short so_linger; /* time to linger while closing */ @@ -333,6 +333,7 @@ * the structure. */ #define soref(so) do { \ + SOCK_LOCK_ASSERT(so); \ ++(so)->so_count; \ } while (0) From owner-p4-projects@FreeBSD.ORG Sat Jun 12 22:08:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC28716A4D1; Sat, 12 Jun 2004 22:08:02 +0000 (GMT) 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 9126516A4CE for ; Sat, 12 Jun 2004 22:08:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7341A43D4C for ; Sat, 12 Jun 2004 22:08:02 +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.12.11/8.12.11) with ESMTP id i5CM6mVP018276 for ; Sat, 12 Jun 2004 22:06:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5CM6mgR018273 for perforce@freebsd.org; Sat, 12 Jun 2004 22:06:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 12 Jun 2004 22:06:48 GMT Message-Id: <200406122206.i5CM6mgR018273@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 Subject: PERFORCE change 54751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 22:08:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=54751 Change 54751 by rwatson@rwatson_tislabs on 2004/06/12 22:05:56 Remove merge glitch. Affected files ... .. //depot/projects/netperf_socket/sys/sys/socketvar.h#12 edit Differences ... ==== //depot/projects/netperf_socket/sys/sys/socketvar.h#12 (text+ko) ==== @@ -377,8 +377,6 @@ sowakeup_locked((so), &(so)->so_snd); \ } while (0) -#ifdef _KERNEL - /* * Argument structure for sosetopt et seq. This is in the KERNEL * section because it will never be visible to user code. From owner-p4-projects@FreeBSD.ORG Sat Jun 12 22:20:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A68616A4D1; Sat, 12 Jun 2004 22:20:33 +0000 (GMT) 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 E9B2616A4CE for ; Sat, 12 Jun 2004 22:20:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3B4D43D2F for ; Sat, 12 Jun 2004 22:20:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5CMK6HW020700 for ; Sat, 12 Jun 2004 22:20:06 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5CMK6r2020697 for perforce@freebsd.org; Sat, 12 Jun 2004 22:20:06 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jun 2004 22:20:06 GMT Message-Id: <200406122220.i5CMK6r2020697@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 Subject: PERFORCE change 54755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 22:20:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=54755 Change 54755 by marcel@marcel_nfs on 2004/06/12 22:19:59 Don't directly dereference the trapframe pointer. It's a kernel VA. Affected files ... .. //depot/projects/gdb/usr.bin/kgdb/md_i386.c#4 edit Differences ... ==== //depot/projects/gdb/usr.bin/kgdb/md_i386.c#4 (text+ko) ==== @@ -40,11 +40,20 @@ #include "kgdb.h" +static int +getreg(int *addr) +{ + int val; + + kvm_read(kvm, (uintptr_t)addr, &val, sizeof(val)); + return (val); +} + void * gdb_cpu_getreg(int regnum, size_t *regsz) { - static register_t synth; struct trapframe *tf = curkthr->td_frame; + int cs; *regsz = gdb_cpu_regsz(regnum); switch (regnum) { @@ -61,11 +70,11 @@ case 12: return (&tf->tf_ds); case 13: return (&tf->tf_es); case 4: - synth = (!ISPL(tf->tf_cs)) ? tf->tf_ebp : tf->tf_esp; - return (&synth); + cs = getreg(&tf->tf_cs); + return (!ISPL(cs)) ? &tf->tf_ebp : &tf->tf_esp; case 11: - synth = (!ISPL(tf->tf_cs)) ? tf->tf_ds : tf->tf_ss; - return (&synth); + cs = getreg(&tf->tf_cs); + return (!ISPL(cs)) ? &tf->tf_ds : &tf->tf_ss; } return (NULL); }