Date: Mon, 16 Sep 2002 01:40:32 -0700 (PDT) From: Julian Elischer <julian@elischer.org> To: Jonathan Mini <mini@FreeBSD.org> Cc: Perforce Change Reviews <perforce@freebsd.org> Subject: Re: PERFORCE change 17560 for review Message-ID: <Pine.BSF.4.21.0209160138420.82711-100000@InterJet.elischer.org> In-Reply-To: <200209160815.g8G8FXvr015549@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Jon, beware that now the repo copy has been done, you make sure you have a copy of your changed versions before doing a p4 sync in case the new files from the freeBSD tree overwrite what you've been working on. On Mon, 16 Sep 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17560 > > Change 17560 by mini@freefall on 2002/09/16 01:14:41 > > IFC @17559. > > Affected files ... > > .. //depot/projects/kse/sys/conf/files#50 integrate > .. //depot/projects/kse/sys/conf/files.pc98#30 integrate > .. //depot/projects/kse/sys/conf/options.pc98#21 integrate > .. //depot/projects/kse/sys/pc98/pc98/fd.c#12 integrate > .. //depot/projects/kse/sys/pc98/pc98/sio.c#18 integrate > .. //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 integrate > .. //depot/projects/kse/sys/sys/cdefs.h#17 integrate > > Differences ... > > ==== //depot/projects/kse/sys/conf/files#50 (text+ko) ==== > > @@ -1,4 +1,4 @@ > -# $FreeBSD: src/sys/conf/files,v 1.697 2002/09/06 17:12:50 sobomax Exp $ > +# $FreeBSD: src/sys/conf/files,v 1.698 2002/09/16 04:13:48 grehan Exp $ > # > # The long compile-with and dependency lines are required because of > # limitations in config: backslash-newline doesn't work in strings, and > @@ -796,6 +796,8 @@ > geom/geom_slice.c optional geom > geom/geom_subr.c optional geom > geom/geom_sunlabel.c optional geom > +crypto/rijndael/rijndael-alg-fst.c optional geom > +crypto/rijndael/rijndael-api-fst.c optional geom > gnu/ext2fs/ext2_alloc.c optional ext2fs \ > warning "kernel contains GPL contaminated ext2fs filesystem" > gnu/ext2fs/ext2_balloc.c optional ext2fs > > ==== //depot/projects/kse/sys/conf/files.pc98#30 (text+ko) ==== > > @@ -3,7 +3,7 @@ > # > # modified for PC-9801 > # > -# $FreeBSD: src/sys/conf/files.pc98,v 1.244 2002/09/02 00:52:04 brooks Exp $ > +# $FreeBSD: src/sys/conf/files.pc98,v 1.245 2002/09/16 07:17:43 nyan Exp $ > # > # The long compile-with and dependency lines are required because of > # limitations in config: backslash-newline doesn't work in strings, and > @@ -270,6 +270,8 @@ > # > # isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc > # > +i4b/layer1/i4b_hdlc.c optional itjc > +i4b/layer1/i4b_hdlc.c optional ihfc > i4b/layer1/i4b_l1dmux.c optional isic > i4b/layer1/i4b_l1lib.c optional isic > i4b/layer1/i4b_l1dmux.c optional iwic > @@ -354,7 +356,7 @@ > i4b/layer1/itjc/i4b_itjc_l1.c optional itjc > i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc > # > -kern/imgact_aout.c standard > +kern/imgact_aout.c optional compat_aout > kern/imgact_gzip.c optional gzip > kern/md4c.c optional netsmb > kern/subr_diskmbr.c count compat_atdisk > > ==== //depot/projects/kse/sys/conf/options.pc98#21 (text+ko) ==== > > @@ -1,4 +1,4 @@ > -# $FreeBSD: src/sys/conf/options.pc98,v 1.153 2002/09/07 22:07:11 peter Exp $ > +# $FreeBSD: src/sys/conf/options.pc98,v 1.154 2002/09/16 07:19:43 nyan Exp $ > # Options specific to the pc98 platform kernels > > MATH_EMULATE opt_math_emulate.h > @@ -22,6 +22,7 @@ > # Options for emulators. These should only be used at config time, so > # they are handled like options for static filesystems > # (see src/sys/conf/options), except for broken debugging options. > +COMPAT_AOUT opt_dontuse.h > IBCS2 opt_dontuse.h > COMPAT_LINUX opt_dontuse.h > COMPAT_SVR4 opt_dontuse.h > > ==== //depot/projects/kse/sys/pc98/pc98/fd.c#12 (text+ko) ==== > > @@ -50,7 +50,7 @@ > * SUCH DAMAGE. > * > * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 > - * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.120 2002/07/16 14:34:38 nyan Exp $ > + * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.121 2002/09/16 07:39:47 nyan Exp $ > */ > > #include "opt_fdc.h" > @@ -2148,7 +2148,7 @@ > } > bp->bio_bcount = (nblocks - blknum) * fdblk; > } > - bp->bio_pblkno = bp->bio_blkno; > + bp->bio_pblkno = blknum; > s = splbio(); > bioqdisksort(&fdc->head, bp); > untimeout(fd_turnoff, fd, fd->toffhandle); /* a good idea */ > @@ -3103,6 +3103,7 @@ > struct fd_formb *finfo; > struct fdc_readid *idfield; > size_t fdblk; > + int error; > > fdu = FDUNIT(minor(dev)); > fd = devclass_get_softc(fd_devclass, fdu); > @@ -3138,17 +3139,12 @@ > bp->bio_done = fdbiodone; > bp->bio_flags = 0; > > - /* > - * Now run the command. The wait loop is a version of bufwait() > - * adapted for struct bio instead of struct buf and specialized > - * for the current context. > - */ > + /* Now run the command. */ > fdstrategy(bp); > - while ((bp->bio_flags & BIO_DONE) == 0) > - tsleep(bp, PRIBIO, "fdcmd", 0); > + error = biowait(bp, "fdcmd"); > > free(bp, M_TEMP); > - return (bp->bio_flags & BIO_ERROR ? bp->bio_error : 0); > + return (error); > } > > static int > > ==== //depot/projects/kse/sys/pc98/pc98/sio.c#18 (text+ko) ==== > > @@ -30,7 +30,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.175 2002/06/24 15:24:42 nyan Exp $ > + * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.176 2002/09/16 07:14:02 nyan Exp $ > * from: @(#)com.c 7.5 (Berkeley) 5/16/91 > * from: i386/isa sio.c,v 1.234 > */ > @@ -1948,6 +1948,7 @@ > * XXX we should goto open_top if comparam() slept. > */ > if (com->hasfifo) { > + int i; > /* > * (Re)enable and drain fifos. > * > @@ -1959,7 +1960,7 @@ > * and to handle races between enabling and fresh > * input. > */ > - while (TRUE) { > + for (i = 0; i < 500; i++) { > sio_setreg(com, com_fifo, > FIFO_RCV_RST | FIFO_XMT_RST > | com->fifo_image); > @@ -1992,6 +1993,10 @@ > DELAY(50); > (void) inb(com->data_port); > } > + if (i == 500) { > + error = EIO; > + goto out; > + } > } > > mtx_lock_spin(&sio_lock); > > ==== //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 (text+ko) ==== > > @@ -23,7 +23,7 @@ > * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > * > - * $FreeBSD: src/sys/pc98/pc98/syscons_pc98.c,v 1.14 2001/07/14 03:26:02 nyan Exp $ > + * $FreeBSD: src/sys/pc98/pc98/syscons_pc98.c,v 1.15 2002/09/16 07:11:43 nyan Exp $ > */ > > #include "opt_syscons.h" > @@ -74,6 +74,39 @@ > return sc_attach_unit(device_get_unit(dev), device_get_flags(dev)); > } > > +static int sc_cur_scr; > + > +static int > +scsuspend(device_t dev) > +{ > + int retry = 10; > + static int dummy; > + sc_softc_t *sc; > + > + sc = &main_softc; > + sc_cur_scr = sc->cur_scp->index; > + do { > + sc_switch_scr(sc, 0); > + if (!sc->switch_in_progress) { > + break; > + } > + tsleep(&dummy, 0, "scsuspend", 100); > + } while (retry--); > + > + return (0); > +} > + > +static int > +scresume(device_t dev) > +{ > + sc_softc_t *sc; > + > + sc = &main_softc; > + sc_switch_scr(sc, sc_cur_scr); > + > + return (0); > +} > + > int > sc_max_unit(void) > { > @@ -199,6 +232,8 @@ > DEVMETHOD(device_identify, scidentify), > DEVMETHOD(device_probe, scprobe), > DEVMETHOD(device_attach, scattach), > + DEVMETHOD(device_suspend, scsuspend), > + DEVMETHOD(device_resume, scresume), > { 0, 0 } > }; > > > ==== //depot/projects/kse/sys/sys/cdefs.h#17 (text+ko) ==== > > @@ -34,7 +34,7 @@ > * SUCH DAMAGE. > * > * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 > - * $FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 14:17:29 bde Exp $ > + * $FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 03:22:06 wollman Exp $ > */ > > #ifndef _SYS_CDEFS_H_ > @@ -139,9 +139,9 @@ > > /* > * GCC 2.95 provides `__restrict' as an extention to C90 to support the > - * C99-specific `restrict' type qualifier. We happen to use `__restrict' as a > - * way to define the `restrict' type qualifier without disturbing older software > - * that is unaware of C99 keywords. > + * C99-specific `restrict' type qualifier. We happen to use `__restrict' as > + * a way to define the `restrict' type qualifier without disturbing older > + * software that is unaware of C99 keywords. > */ > #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95) > #if __STDC_VERSION__ < 199901 > @@ -239,7 +239,7 @@ > * Embed the rcs id of a source file in the resulting library. Note that in > * more recent ELF binutils, we use .ident allowing the ID to be stripped. > * Usage: > - * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 14:17:29 bde Exp $"); > + * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 03:22:06 wollman Exp $"); > */ > #ifndef __FBSDID > #if !defined(lint) && !defined(STRIP_FBSDID) > 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?Pine.BSF.4.21.0209160138420.82711-100000>