Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
* Warner Losh <[EMAIL PROTECTED]> [020531 16:39] wrote: > In message <[EMAIL PROTECTED]> Alfred Perlstein writes: > : I'm really fine with either. Let's wait till tomorrow for anyone to > : speak up, if no one does please feel free to commit whichever one you > : feel more comfortable with. > > Aarrgh. I just committed my workaround, which basically adds && 0 to > each of the tests. I did this as it is the smallest change I could > think of to do the deed since these drivers are maintained outside of > the tree. This is fine. I don't have strong feelings about it and I'm glad to see it "fixed" either way. :) -- -Alfred Perlstein [[EMAIL PROTECTED]] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
In message <[EMAIL PROTECTED]> Ruslan Ermilov writes: : It would be a good idea to move them under sys/contrib/ then. I'm not so sure about that. I think they are fine where they are. There are many drivers in the tree that are synced between platforms. Also, right now other than acpi, the only things under contrib/dev are binary only drivers. But I don't feel too strongly about this. Warner To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
In message <[EMAIL PROTECTED]> Alfred Perlstein writes: : I'm really fine with either. Let's wait till tomorrow for anyone to : speak up, if no one does please feel free to commit whichever one you : feel more comfortable with. Aarrgh. I just committed my workaround, which basically adds && 0 to each of the tests. I did this as it is the smallest change I could think of to do the deed since these drivers are maintained outside of the tree. Warner To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
I have a fix for this, btw. Warner To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
Ruslan Ermilov wrote: > On Sat, Jun 01, 2002 at 02:10:32AM +0900, Takahashi Yoshihiro wrote: > > These drivers are shared with NetBSD/pc98. Please don't make many > > FreeBSD local changes. I will ask the original author about how to > > resolve this problem. Please wait a few days. > > > It would be a good idea to move them under sys/contrib/ then. Better do the same for NFS and other code shared with NetBSD, then... -- Terry To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
On Sat, Jun 01, 2002 at 02:10:32AM +0900, Takahashi Yoshihiro wrote: > In article <[EMAIL PROTECTED]> > Alfred Perlstein <[EMAIL PROTECTED]> writes: > > > > Alfred, > > > > > > Your changes above broke building the GENERIC kernel. __i386__ is always > > > defined (whether -ansi or not), and this now causes SOFT_INTR_REQUIRED() > > > macro to use non-existing softintr(). (Well, it's defined as empty in > > > sys/i386/isa/bs/bsif.h.) > > > > > > I'm not sure what would me more correct; to include the definition of > > > softintr() from bsif.h, or to just commit the following: > > > > I'm really fine with either. Let's wait till tomorrow for anyone to > > speak up, if no one does please feel free to commit whichever one you > > feel more comfortable with. > > These drivers are shared with NetBSD/pc98. Please don't make many > FreeBSD local changes. I will ask the original author about how to > resolve this problem. Please wait a few days. > It would be a good idea to move them under sys/contrib/ then. Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software AG, [EMAIL PROTECTED] FreeBSD committer, +380.652.512.251Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age msg39045/pgp0.pgp Description: PGP signature
Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
On Fri, May 31, 2002 at 09:34:10AM -0700, Alfred Perlstein wrote: > * Ruslan Ermilov <[EMAIL PROTECTED]> [020531 09:09] wrote: > > > > > > Stop in /usr/src/sys/i386/compile/GENERIC. > > > # > > > > > > John > > > > Alfred, > > > > Your changes above broke building the GENERIC kernel. __i386__ is always > > defined (whether -ansi or not), and this now causes SOFT_INTR_REQUIRED() > > macro to use non-existing softintr(). (Well, it's defined as empty in > > sys/i386/isa/bs/bsif.h.) > > > > I'm not sure what would me more correct; to include the definition of > > softintr() from bsif.h, or to just commit the following: > > I'm really fine with either. Let's wait till tomorrow for anyone to > speak up, if no one does please feel free to commit whichever one you > feel more comfortable with. > OK. I also forgot the similar part for dev/nsp: %%% Index: nsp/nsp.c === RCS file: /home/ncvs/src/sys/dev/nsp/nsp.c,v retrieving revision 1.8 diff -u -p -r1.8 nsp.c --- nsp/nsp.c 20 Mar 2002 02:07:34 - 1.8 +++ nsp/nsp.c 31 May 2002 16:39:07 - @@ -492,7 +492,6 @@ nsp_world_start(sc, fdone) nsphw_init(sc); scsi_low_bus_reset(slp); - SOFT_INTR_REQUIRED(slp); return 0; } Index: nsp/nspvar.h === RCS file: /home/ncvs/src/sys/dev/nsp/nspvar.h,v retrieving revision 1.5 diff -u -p -r1.5 nspvar.h --- nsp/nspvar.h20 Mar 2002 02:07:36 - 1.5 +++ nsp/nspvar.h31 May 2002 16:39:07 - @@ -105,9 +105,4 @@ void nspattachsubr(struct nsp_softc *); int nspprint(void *, const char *); int nspintr(void *); -#ifdefined(i386) -#defineSOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) -#else /* !i386 */ -#defineSOFT_INTR_REQUIRED(slp) -#endif /* !i386 */ #endif /* !_NSPVAR_H_ */ %%% -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software AG, [EMAIL PROTECTED] FreeBSD committer, +380.652.512.251Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age msg39040/pgp0.pgp Description: PGP signature
Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
* Ruslan Ermilov <[EMAIL PROTECTED]> [020531 09:09] wrote: > > > > Stop in /usr/src/sys/i386/compile/GENERIC. > > # > > > > John > > Alfred, > > Your changes above broke building the GENERIC kernel. __i386__ is always > defined (whether -ansi or not), and this now causes SOFT_INTR_REQUIRED() > macro to use non-existing softintr(). (Well, it's defined as empty in > sys/i386/isa/bs/bsif.h.) > > I'm not sure what would me more correct; to include the definition of > softintr() from bsif.h, or to just commit the following: I'm really fine with either. Let's wait till tomorrow for anyone to speak up, if no one does please feel free to commit whichever one you feel more comfortable with. -Alfred To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
On Thu, May 30, 2002 at 12:30:43AM -0700, Alfred Perlstein wrote: > alfred 2002/05/30 00:30:43 PDT > > Modified files: > sys/dev/ct ct_machdep.h > sys/dev/ncv ncr53c500var.h > sys/dev/stg tmc18c30var.h > Log: > Check for defined(__i386__) instead of just defined(i386) since the compiler > will be updated to only define(__i386__) for ANSI cleanliness. > > Revision ChangesPath > 1.4 +3 -3 src/sys/dev/ct/ct_machdep.h > 1.7 +3 -3 src/sys/dev/ncv/ncr53c500var.h > 1.6 +3 -3 src/sys/dev/stg/tmc18c30var.h On Fri, May 31, 2002 at 02:02:50PM +0200, John Hay wrote: > A GENERIC kernel on current fails to compile missing softintr. > > # > beast:/sys/i386/compile/GENERIC # make -DNO_MODULES -DNO_WERROR > cc -c -O -pipe -march=pentiumpro -Wall -Wredundant-decls -Wnested-externs >-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual >-Wno-format -ansi -g -nostdinc -I- -I. -I../../.. -I../../../dev >-I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../include >-D_KERNEL -ffreestanding -include opt_global.h -fno-common >-mpreferred-stack-boundary=2 -ffreestanding ../../../dev/ncv/ncr53c500.c > ../../../dev/ncv/ncr53c500.c: In function `ncv_world_start': > ../../../dev/ncv/ncr53c500.c:503: warning: implicit declaration of function >`softintr' > cc -c -O -pipe -march=pentiumpro -Wall -Wredundant-decls -Wnested-externs >-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual >-Wno-format -ansi -g -nostdinc -I- -I. -I../../.. -I../../../dev >-I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../include >-D_KERNEL -ffreestanding -include opt_global.h -fno-common >-mpreferred-stack-boundary=2 -ffreestanding ../../../dev/nsp/nsp.c > ../../../dev/nsp/nsp.c: In function `nsp_world_start': > ../../../dev/nsp/nsp.c:495: warning: implicit declaration of function `softintr' > cc -c -O -pipe -march=pentiumpro -Wall -Wredundant-decls -Wnested-externs >-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual >-Wno-format -ansi -g -nostdinc -I- -I. -I../../.. -I../../../dev >-I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../include >-D_KERNEL -ffreestanding -include opt_global.h -fno-common >-mpreferred-stack-boundary=2 -ffreestanding ../../../dev/stg/tmc18c30.c > ../../../dev/stg/tmc18c30.c: In function `stg_world_start': > ../../../dev/stg/tmc18c30.c:377: warning: implicit declaration of function `softintr' > sh ../../../conf/newvers.sh GENERIC > cc -c -O -pipe -march=pentiumpro -Wall -Wredundant-decls -Wnested-externs >-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual >-Wno-format -ansi -g -nostdinc -I- -I. -I../../.. -I../../../dev >-I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../include >-D_KERNEL -ffreestanding -include opt_global.h -fno-common >-mpreferred-stack-boundary=2 -ffreestanding vers.c > linking kernel.debug > ncr53c500.o: In function `ncv_world_start': > ../../../dev/ncv/ncr53c500.c:503: undefined reference to `softintr' > nsp.o: In function `nsp_world_start': > ../../../dev/nsp/nsp.c:495: undefined reference to `softintr' > tmc18c30.o: In function `stg_world_start': > ../../../dev/stg/tmc18c30.c:377: undefined reference to `softintr' > *** Error code 1 > > Stop in /usr/src/sys/i386/compile/GENERIC. > # > > John Alfred, Your changes above broke building the GENERIC kernel. __i386__ is always defined (whether -ansi or not), and this now causes SOFT_INTR_REQUIRED() macro to use non-existing softintr(). (Well, it's defined as empty in sys/i386/isa/bs/bsif.h.) I'm not sure what would me more correct; to include the definition of softintr() from bsif.h, or to just commit the following: %%% Index: ct/ct.c === RCS file: /home/ncvs/src/sys/dev/ct/ct.c,v retrieving revision 1.5 diff -u -p -r1.5 ct.c --- ct/ct.c 20 Mar 2002 02:04:09 - 1.5 +++ ct/ct.c 31 May 2002 16:02:22 - @@ -505,7 +505,6 @@ ct_world_start(ct, fdone) scsi_low_bus_reset(slp); cthw_chip_reset(chp, NULL, ct->sc_chipclk, slp->sl_hostid); - SOFT_INTR_REQUIRED(slp); return 0; } Index: ct/ct_machdep.h === RCS file: /home/ncvs/src/sys/dev/ct/ct_machdep.h,v retrieving revision 1.4 diff -u -p -r1.4 ct_machdep.h --- ct/ct_machdep.h 30 May 2002 07:30:42 - 1.4 +++ ct/ct_machdep.h 31 May 2002 16:02:22 - @@ -208,9 +208,4 @@ ct_cmdp_write_1(chp, val) CT_BUS_WEIGHT(chp) } -#ifdefined(__i386__) -#defineSOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) -#else /* !__i386__ */ -#defineSOFT_INTR_REQUIRED(slp) -#endif /* !__i386__ */ #endif /* !_CT_MACHDEP_H
