Date: Fri, 28 Jul 2000 11:43:23 +0100 From: Antony T Curtis <antony@abacus.co.uk> To: stable@FreeBSD.ORG Subject: Re: CVSupping Message-ID: <398163CB.B074B9DA@abacus.co.uk> References: <3981433C.C15E0B87@abacus.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
Antony T Curtis wrote: > > To compile the HPFS module, I have to comment out two lines in > src/sys/fs/hpfs/hpfs_vnops.c > > Every time I cvsup, these changes get blasted. > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-stable" in the body of the message Also, the sound didn't work properly on a Tosh SP4200 notebook... My diffs are *** src/sys/fs/hpfs/hpfs_vnops.c.orig Thu Jul 27 23:30:36 2000 --- src/sys/fs/hpfs/hpfs_vnops.c Thu Jul 27 23:32:49 2000 *************** *** 86,90 **** static int hpfs_create __P((struct vop_create_args *)); static int hpfs_remove __P((struct vop_remove_args *)); - static int hpfs_abortop __P((struct vop_abortop_args *)); static int hpfs_bmap __P((struct vop_bmap_args *ap)); #if defined(__FreeBSD__) --- 86,89 ---- *************** *** 92,95 **** --- 91,96 ---- static int hpfs_putpages __P((struct vop_putpages_args *)); static int hpfs_fsync __P((struct vop_fsync_args *ap)); + #else + static int hpfs_abortop __P((struct vop_abortop_args *)) #endif static int hpfs_pathconf __P((struct vop_pathconf_args *ap)); *************** *** 1379,1383 **** { &vop_create_desc, (vop_t *)hpfs_create }, { &vop_remove_desc, (vop_t *)hpfs_remove }, - { &vop_abortop_desc, (vop_t *)hpfs_abortop }, { &vop_islocked_desc, (vop_t *)vop_stdislocked }, { &vop_unlock_desc, (vop_t *)vop_stdunlock }, --- 1380,1383 ---- *** src/sys/dev/sound/pci/ds1.c.orig Thu Jul 27 23:36:28 2000 --- src/sys/dev/sound/pci/ds1.c Thu Jul 27 23:35:43 2000 *************** *** 193,197 **** static pcmchan_caps ds_playcaps = { 4000, 96000, ! AFMT_STEREO | AFMT_U8 | AFMT_S16_LE, AFMT_STEREO | AFMT_S16_LE }; --- 193,197 ---- static pcmchan_caps ds_playcaps = { 4000, 96000, ! AFMT_STEREO | AFMT_S8 | AFMT_S16_LE, AFMT_STEREO | AFMT_S16_LE }; *************** *** 506,510 **** ch->channel = c; ch->dir = dir; ! ch->fmt = AFMT_U8; ch->spd = 8000; ch->run = 0; --- 506,510 ---- ch->channel = c; ch->dir = dir; ! ch->fmt = AFMT_S8; ch->spd = 8000; ch->run = 0; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?398163CB.B074B9DA>