Date: Fri, 6 Dec 2002 17:16:03 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22016 for review Message-ID: <200212070116.gB71G3q6011477@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22016 Change 22016 by marcel@marcel_vaio on 2002/12/06 17:15:12 IFC @22015 Affected files ... .. //depot/projects/ia64/UPDATING#24 integrate .. //depot/projects/ia64/contrib/gcc/INSTALL/README#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/binaries.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/build.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/configure.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/download.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/finalinstall.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/gfdl.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/index.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/old.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/specific.html#2 delete .. //depot/projects/ia64/contrib/gcc/INSTALL/test.html#2 delete .. //depot/projects/ia64/etc/defaults/rc.conf#22 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#15 integrate .. //depot/projects/ia64/release/i386/drivers.conf#9 integrate .. //depot/projects/ia64/sbin/ping6/ping6.c#8 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#13 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#13 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#13 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#13 integrate Differences ... ==== //depot/projects/ia64/UPDATING#24 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20021202: + The recent binutils upgrade marks a kernel flag day on + sparc64: modules built with the old binutils will not work + with new kernels and vice versa. Mismatches will result in + panics. Make sure your kernel and modules are in sync. + 20021029: The value of IPPROTO_DIVERT has changed. Make sure to keep your kernel, netstat, natd and any third-party DIVERT @@ -1149,4 +1155,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.228 2002/10/30 20:11:07 imp Exp $ +$FreeBSD: src/UPDATING,v 1.229 2002/12/06 13:19:35 keramida Exp $ ==== //depot/projects/ia64/etc/defaults/rc.conf#22 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.163 2002/11/15 08:26:36 ru Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.164 2002/12/06 05:23:37 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -31,7 +31,7 @@ pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. pccard_ifconfig="NO" # Specialized pccard ethernet configuration (or NO). -pccardd_flags="" # Additional flags for pccardd. +pccardd_flags="-z" # Additional flags for pccardd. pccard_conf="/etc/defaults/pccard.conf" # pccardd(8) config file pccard_ether_delay="5" # Delay before trying to start dhclient in pccard_ether removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#15 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.48 2002/11/24 01:30:00 ue Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.49 2002/12/06 20:04:34 wilko Exp $ --> <sect1> <sect1info> @@ -1223,7 +1223,7 @@ you have the following line in your kernel config file:</para> <programlisting>device pcm</programlisting> - <para>The sound device uses port 0x530, IRQ 9 and drq 0. You also need + <para>The sound device uses port 0x530, IRQ 10 and drq 0. You also need to specify flags 0x10011 in the <filename>device.hints</filename> file.</para> <para>AlphaStation 200 & 250 series have an automatic SCSI terminator. ==== //depot/projects/ia64/release/i386/drivers.conf#9 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/i386/drivers.conf,v 1.15 2002/11/12 19:30:00 jhb Exp $ +# $FreeBSD: src/release/i386/drivers.conf,v 1.16 2002/12/06 08:09:56 murray Exp $ # # drv: driver name in kernel config file @@ -39,6 +39,7 @@ #drv filename floppy type description agp agp 2 video "AGP Host Bridge support" an if_an 2 network "Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card" +awi if_awi 2 network "BayStack 660 and others" aue if_aue 2 network "ADMtek USB ethernet adapter" cue if_cue 2 network "CATC USB ethernet adapter" dc if_dc 2 network "DEC/Intel 21143 (and clones) PCI fast ethernet card" ==== //depot/projects/ia64/sbin/ping6/ping6.c#8 (text+ko) ==== @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ping6/ping6.c,v 1.21 2002/09/09 16:43:18 nectar Exp $"; + "$FreeBSD: src/sbin/ping6/ping6.c,v 1.22 2002/12/06 02:11:31 suz Exp $"; #endif /* not lint */ /* @@ -314,8 +314,8 @@ size_t rthlen; /* just to be sure */ - memset(&smsghdr, 0, sizeof(&smsghdr)); - memset(&smsgiov, 0, sizeof(&smsgiov)); + memset(&smsghdr, 0, sizeof(smsghdr)); + memset(&smsgiov, 0, sizeof(smsgiov)); preload = 0; datap = &outpack[ICMP6ECHOLEN + ICMP6ECHOTMLEN]; ==== //depot/projects/ia64/sys/dev/ata/ata-all.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.160 2002/12/03 20:19:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.161 2002/12/06 19:29:52 sos Exp $ */ #include "opt_ata.h" ==== //depot/projects/ia64/sys/dev/ata/ata-card.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.6 2002/09/20 18:08:57 phk Exp $ + * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.7 2002/12/06 19:29:53 sos Exp $ */ #include <sys/param.h> @@ -58,8 +58,18 @@ return (0); /* other devices might need to be matched here */ + return(ENXIO); +} + +static int +ata_pccard_intrnoop(struct ata_channel *ch) +{ + return 1; +} - return(ENXIO); +static void +ata_pccard_locknoop(struct ata_channel *ch, int type) +{ } static int @@ -106,6 +116,8 @@ ch->unit = 0; ch->flags |= (ATA_USE_16BIT | ATA_NO_SLAVE); + ch->intr_func = ata_pccard_intrnoop; + ch->lock_func = ata_pccard_locknoop; return ata_probe(dev); } ==== //depot/projects/ia64/sys/dev/ata/ata-disk.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.137 2002/12/03 20:19:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.138 2002/12/06 19:29:53 sos Exp $ */ #include "opt_ata.h" @@ -219,8 +219,10 @@ /* if this disk belongs to an ATA RAID dont print the probe */ if (ata_raiddisk_attach(adp)) adp->flags |= AD_F_RAID_SUBDISK; - else - ad_print(adp); + else { + if (atadev->driver) + ad_print(adp); + } } void ==== //depot/projects/ia64/sys/dev/firewire/firewire.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.8 2002/11/12 17:16:20 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.9 2002/12/06 02:17:30 simokawa Exp $ * */ @@ -520,7 +520,6 @@ #else sc->dev[i] = d; #endif - printf("%s: firewire bus attach\n", device_get_nameunit(sc->fc->dev)); sc->fc->timeouthandle = timeout((timeout_t *)sc->fc->timeout, (void *)sc->fc, hz * 10); /* Locate our children */ @@ -1069,7 +1068,8 @@ /* XXX Dangerous, how to pass PHY packet to device driver */ fp->mode.common.tcode |= FWTCODE_PHY; - printf("send phy_config root_node=%d gap_count=%d\n", + if (firewire_debug) + printf("send phy_config root_node=%d gap_count=%d\n", root_node, gap_count); fw_asyreq(fc, -1, xfer); } @@ -1341,7 +1341,9 @@ TAILQ_INSERT_BEFORE(tfwdev, fwdev, link); } - printf("%s:Discover new %s device ID:%08x%08x\n", device_get_nameunit(fc->dev), linkspeed[fwdev->speed], fc->ongoeui.hi, fc->ongoeui.lo); + device_printf(fc->dev, "New %s device ID:%08x%08x\n", + linkspeed[fwdev->speed], + fc->ongoeui.hi, fc->ongoeui.lo); fc->ongodev = fwdev; fc->ongoaddr = CSRROMOFF; @@ -1389,7 +1391,8 @@ done: /* fw_attach_devs */ fc->status = FWBUSEXPDONE; - printf("bus_explore done\n"); + if (firewire_debug) + printf("bus_explore done\n"); fw_attach_dev(fc); return; @@ -1638,11 +1641,12 @@ continue; fwdev->maxrec = (fwdev->csrrom[2] >> 12) & 0xf; + device_printf(fc->dev, "Device "); switch(fwdev->spec){ case CSRVAL_ANSIT10: switch(fwdev->ver){ case CSRVAL_T10SBP2: - printf("Device SBP-II"); + printf("SBP-II"); break; default: break; @@ -1651,38 +1655,39 @@ case CSRVAL_1394TA: switch(fwdev->ver){ case CSR_PROTAVC: - printf("Device AV/C"); + printf("AV/C"); break; case CSR_PROTCAL: - printf("Device CAL"); + printf("CAL"); break; case CSR_PROTEHS: - printf("Device EHS"); + printf("EHS"); break; case CSR_PROTHAVI: - printf("Device HAVi"); + printf("HAVi"); break; case CSR_PROTCAM104: - printf("Device 1394 Cam 1.04"); + printf("1394 Cam 1.04"); break; case CSR_PROTCAM120: - printf("Device 1394 Cam 1.20"); + printf("1394 Cam 1.20"); break; case CSR_PROTCAM130: - printf("Device 1394 Cam 1.30"); + printf("1394 Cam 1.30"); break; case CSR_PROTDPP: - printf("Device 1394 Direct print"); + printf("1394 Direct print"); break; case CSR_PROTIICP: - printf("Device Industrial & Instrument"); + printf("Industrial & Instrument"); break; default: - printf("Device unkwon 1394TA"); + printf("unknown 1394TA"); break; } break; default: + printf("unknown spec"); break; } fwdev->status = FWDEVATTACHED; ==== //depot/projects/ia64/sys/dev/firewire/fwohci.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.6 2002/11/12 10:02:50 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.7 2002/12/06 02:17:30 simokawa Exp $ * */ @@ -292,12 +292,11 @@ for (i = 0; !(OREAD(sc, OHCI_CSR_CONT) & (1<<31)) && (i < 1000); i++) DELAY(100); bm = OREAD(sc, OHCI_CSR_DATA); - if((bm & 0x3f) == 0x3f){ - printf("fw_set_bus_manager: %d->%d (loop=%d)\n", bm, node, i); + if((bm & 0x3f) == 0x3f) bm = node; - }else{ - printf("fw_set_bus_manager: %d-X%d (loop=%d)\n", bm, node, i); - } + if (bootverbose) + device_printf(sc->fc.dev, + "fw_set_bus_manager: %d->%d (loop=%d)\n", bm, node, i); return(bm); } @@ -471,13 +470,15 @@ /* FLUSH FIFO and reset Transmitter/Reciever */ OWRITE(sc, OHCI_HCCCTL, OHCI_HCC_RESET); - device_printf(dev, "resetting OHCI..."); + if (bootverbose) + device_printf(dev, "resetting OHCI..."); i = 0; while(OREAD(sc, OHCI_HCCCTL) & OHCI_HCC_RESET) { if (i++ > 100) break; DELAY(1000); } - printf("done (%d)\n", i); + if (bootverbose) + printf("done (%d)\n", i); OWRITE(sc, OHCI_HCCCTL, OHCI_HCC_LPS); /* XXX wait for SCLK. */ DELAY(100000); @@ -487,7 +488,8 @@ /* XXX */ if (((reg & 0x0000f000) >> 12) < 10) reg2 = (reg2 & 0xffff0fff) | (10 << 12); - device_printf(dev, "BUS_OPT 0x%x -> 0x%x\n", reg, reg2); + if (bootverbose) + device_printf(dev, "BUS_OPT 0x%x -> 0x%x\n", reg, reg2); OWRITE(sc, OHCI_BUS_OPT, reg2); OWRITE(sc, OHCI_CROMHDR, sc->fc.config_rom[0]); @@ -544,7 +546,9 @@ #else /* XXX force to enable 1394a */ if (e1394a) { #endif - device_printf(dev, "Enable 1394a Enhancements\n"); + if (bootverbose) + device_printf(dev, + "Enable 1394a Enhancements\n"); /* enable EAA EMC */ reg2 |= 0x03; /* set aPhyEnhanceEnable */ @@ -781,7 +785,7 @@ if(db_tr != dbch->bottom){ goto txloop; } else { - printf("fwohci_start: lack of db_trq\n"); + device_printf(sc->fc.dev, "fwohci_start: lack of db_trq\n"); dbch->flags |= FWOHCI_DBCH_FULL; } kick: @@ -791,7 +795,8 @@ if(dbch->xferq.flag & FWXFERQ_RUNNING) { OWRITE(sc, OHCI_DMACTL(off), OHCI_CNTL_DMA_WAKE); } else { - printf("start AT DMA status=%x\n", + if (bootverbose) + device_printf(sc->fc.dev, "start AT DMA status=%x\n", OREAD(sc, OHCI_DMACTL(off))); OWRITE(sc, OHCI_DMACMD(off), vtophys(dbch->top->db) | fsegment); OWRITE(sc, OHCI_DMACTL(off), OHCI_CNTL_DMA_RUN); @@ -1720,7 +1725,8 @@ struct fwohci_softc *sc; sc = (struct fwohci_softc *)fc; - printf("fwochi_set_intr: %d\n", enable); + if (bootverbose) + device_printf(sc->fc.dev, "fwochi_set_intr: %d\n", enable); if (enable) { sc->intmask |= OHCI_INT_EN; OWRITE(sc, FWOHCI_INTMASK, OHCI_INT_EN); ==== //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.5 2002/11/12 13:46:09 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.6 2002/12/06 02:17:30 simokawa Exp $ */ #include <sys/param.h> @@ -183,7 +183,8 @@ cache_line = DEF_CACHE_LINE; pci_write_config(self, PCIR_CACHELNSZ, cache_line, 1); #endif - printf("cache size %d.\n", (int) cache_line); + if (bootverbose) + device_printf(self, "cache size %d.\n", (int) cache_line); /**/ rid = PCI_CBMEM; sc->bsr = bus_alloc_resource(self, SYS_RES_MEMORY, &rid, ==== //depot/projects/ia64/sys/dev/firewire/if_fwe.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.2 2002/11/14 23:54:51 sam Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.3 2002/12/06 02:17:30 simokawa Exp $ */ #include "opt_inet.h" @@ -174,7 +174,8 @@ eaddr[3] = fwe->fd.fc->eui[5]; eaddr[4] = fwe->fd.fc->eui[6]; eaddr[5] = fwe->fd.fc->eui[7]; - printf("if_fwe%d: %02x:%02x:%02x:%02x:%02x:%02x\n", unit, + printf("if_fwe%d: Fake Ethernet address: " + "%02x:%02x:%02x:%02x:%02x:%02x\n", unit, eaddr[0], eaddr[1], eaddr[2], eaddr[3], eaddr[4], eaddr[5]); /* fill the rest and attach interface */ ==== //depot/projects/ia64/sys/dev/firewire/sbp.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.7 2002/11/07 02:13:40 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.8 2002/12/06 02:17:30 simokawa Exp $ * */ @@ -129,7 +129,7 @@ #define ORB_RES_ILLE 2 #define ORB_RES_VEND 3 -static int debug = 1; +static int debug = 0; static int auto_login = 1; static int max_speed = 2; @@ -555,8 +555,10 @@ } break; } +SBP_DEBUG(0) sbp_show_sdev_info(sdev, (sdev->status == SBP_DEV_TOATTACH)); +END_DEBUG } else { switch (sdev->status) { case SBP_DEV_ATTACHED: @@ -1063,8 +1065,10 @@ sdev->target->target_id, sdev->lun_id)); +SBP_DEBUG(0) sbp_show_sdev_info(sdev, 2); printf("%s\n", orb_fun_name[(func>>16)&0xf]); +END_DEBUG switch (func) { case ORB_FUN_LGI: ocb->orb[2] = htonl(nid << 16); ==== //depot/projects/ia64/sys/i386/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.10 2002/10/22 17:32:27 jhb Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.11 2002/12/05 22:49:47 jhb Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -14,9 +14,13 @@ hint.ata.1.port="0x170" hint.ata.1.irq="15" hint.adv.0.at="isa" +hint.adv.0.disabled="1" hint.bt.0.at="isa" +hint.bt.0.disabled="1" hint.aha.0.at="isa" +hint.aha.0.disabled="1" hint.aic.0.at="isa" +hint.aic.0.disabled="1" hint.atkbdc.0.at="isa" hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" @@ -28,6 +32,7 @@ hint.sc.0.at="isa" hint.sc.0.flags="0x100" hint.vt.0.at="isa" +hint.vt.0.disabled="1" hint.apm.0.disabled="1" hint.apm.0.flags="0x20" hint.pcic.0.at="isa" @@ -57,25 +62,32 @@ hint.ppc.0.at="isa" hint.ppc.0.irq="7" hint.ed.0.at="isa" +hint.ed.0.disabled="1" hint.ed.0.port="0x280" hint.ed.0.irq="10" hint.ed.0.maddr="0xd8000" hint.cs.0.at="isa" +hint.cs.0.disabled="1" hint.cs.0.port="0x300" hint.sn.0.at="isa" +hint.sn.0.disabled="1" hint.sn.0.port="0x300" hint.sn.0.irq="10" hint.ie.0.at="isa" +hint.ie.0.disabled="1" hint.ie.0.port="0x300" hint.ie.0.irq="10" hint.ie.0.maddr="0xd0000" hint.fe.0.at="isa" +hint.fe.0.disabled="1" hint.fe.0.port="0x300" hint.le.0.at="isa" +hint.le.0.disabled="1" hint.le.0.port="0x300" hint.le.0.irq="5" hint.le.0.maddr="0xd0000" hint.lnc.0.at="isa" +hint.lnc.0.disabled="1" hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" ==== //depot/projects/ia64/sys/sparc64/pci/psycho.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp * - * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.20 2002/12/01 23:30:26 tmm Exp $ + * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.21 2002/12/06 13:16:52 tmm Exp $ */ /* @@ -580,7 +580,7 @@ PSYCHO_WRITE8(sc, map, INTMAP_ENABLE(mr, PCPU_GET(mid))); } for (map = PSR_SCSI_INT_MAP, clr = PSR_SCSI_INT_CLR, n = 0; - map < PSR_FFB0_INT_MAP; map += 8, clr += 8, n++) { + map <= PSR_SERIAL_INT_MAP; map += 8, clr += 8, n++) { mr = PSYCHO_READ8(sc, map); #ifdef PSYCHO_DEBUG device_printf(dev, "intr map (obio) %d: %#lx, clr: %#lx\n", n, @@ -674,7 +674,7 @@ /* Hunt thru obio first */ diag = PSYCHO_READ8(sc, PSR_OBIO_INT_DIAG); for (intrmap = PSR_SCSI_INT_MAP, intrclr = PSR_SCSI_INT_CLR; - intrmap < PSR_FFB0_INT_MAP; intrmap += 8, intrclr += 8, + intrmap <= PSR_SERIAL_INT_MAP; intrmap += 8, intrclr += 8, diag >>= 2) { im = PSYCHO_READ8(sc, intrmap); if (INTINO(im) == ino) { ==== //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#13 (text+ko) ==== @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.102 2002/09/19 03:55:30 obrien Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.103 2002/12/06 02:08:46 mckusick Exp $ */ #include "opt_quota.h" @@ -841,7 +841,7 @@ ipref = ffs_dirpref(pip); else ipref = pip->i_number; - if (ipref >= fs->fs_ncg * fs->fs_ipg) + if ((unsigned)ipref >= fs->fs_ncg * fs->fs_ipg) ipref = 0; cg = ino_to_cg(fs, ipref); /* ==== //depot/projects/ia64/usr.sbin/sysinstall/disks.c#13 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/disks.c,v 1.144 2002/12/04 15:07:05 nyan Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/disks.c,v 1.145 2002/12/05 22:10:39 jhb Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -52,6 +52,22 @@ #endif #define SUBTYPE_EFI 239 +#ifdef PC98 +#define OTHER_SLICE_VALUES \ + "Other popular values are 37218 for a\n" \ + "DOS FAT partition.\n\n" +#else +#define OTHER_SLICE_VALUES \ + "Other popular values are 6 for a\n" \ + "DOS FAT partition, 131 for a Linux ext2fs partition, or\n" \ + "130 for a Linux swap partition.\n\n" +#endif +#define NON_FREEBSD_NOTE \ + "Note: If you choose a non-FreeBSD partition type, it will not\n" \ + "be formatted or otherwise prepared, it will simply reserve space\n" \ + "for you to use another tool, such as DOS format, to later format\n" \ + "and actually use the partition." + /* Where we start displaying chunk information on the screen */ #define CHUNK_START_ROW 5 @@ -423,25 +439,11 @@ else if (*cp && toupper(*cp) == 'G') size *= ONE_GIG; sprintf(tmp, "%d", SUBTYPE_FREEBSD); -#ifdef PC98 val = msgGetInput(tmp, "Enter type of partition to create:\n\n" - "Pressing Enter will choose the default, a native FreeBSD\n" - "slice (type 50324). You can choose other types, 37218 for a\n" - "DOS partition, for example.\n\n" - "Note: If you choose a non-FreeBSD partition type, it will not\n" - "be formatted or otherwise prepared, it will simply reserve space\n" - "for you to use another tool, such as DOS FORMAT, to later format\n" - "and use the partition."); -#else - val = msgGetInput(tmp, "Enter type of partition to create:\n\n" - "Pressing Enter will choose the default, a native FreeBSD\n" - "slice (type 165). You can choose other types, 6 for a\n" - "DOS partition or 131 for a Linux partition, for example.\n\n" - "Note: If you choose a non-FreeBSD partition type, it will not\n" - "be formatted or otherwise prepared, it will simply reserve space\n" - "for you to use another tool, such as DOS FORMAT, to later format\n" - "and use the partition."); -#endif /* PC98 */ + "Pressing Enter will choose the default, a native FreeBSD\n" + "slice (type %u). " + OTHER_SLICE_VALUES + NON_FREEBSD_NOTE, SUBTYPE_FREEBSD); if (val && (subtype = strtol(val, NULL, 0)) > 0) { if (subtype == SUBTYPE_FREEBSD) partitiontype = freebsd; @@ -484,27 +486,12 @@ int subtype; chunk_e partitiontype; - sprintf(tmp, "%d", SUBTYPE_FREEBSD); -#ifdef PC98 + sprintf(tmp, "%d", chunk_info[current_chunk]->subtype); val = msgGetInput(tmp, "New partition type:\n\n" - "Pressing Enter will choose the default, a native FreeBSD\n" - "slice (type 50324). Other popular values are 37218 for\n" - "DOS FAT partition.\n\n" - "Note: If you choose a non-FreeBSD partition type, it will not\n" - "be formatted or otherwise prepared, it will simply reserve space\n" - "for you to use another tool, such as DOS format, to later format\n" - "and actually use the partition."); -#else - val = msgGetInput(tmp, "New partition type:\n\n" - "Pressing Enter will choose the default, a native FreeBSD\n" - "slice (type 165). Other popular values are 6 for\n" - "DOS FAT partition, 131 for a Linux ext2fs partition or\n" - "130 for a Linux swap partition.\n\n" - "Note: If you choose a non-FreeBSD partition type, it will not\n" - "be formatted or otherwise prepared, it will simply reserve space\n" - "for you to use another tool, such as DOS format, to later format\n" - "and actually use the partition."); -#endif /* PC98 */ + "Pressing Enter will use the current type. To choose a native\n" + "FreeBSD slice enter %u. " + OTHER_SLICE_VALUES + NON_FREEBSD_NOTE, SUBTYPE_FREEBSD); if (val && (subtype = strtol(val, NULL, 0)) > 0) { if (subtype == SUBTYPE_FREEBSD) partitiontype = freebsd; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212070116.gB71G3q6011477>