Hello!

I tryed to integrate the ATAPI patches from /pub/NetBSD/arch/i386 into
the NetBSD current 25.12.96 source tree. First I saw is that the patches
are for 1.2A - especially for 1.150 of sys/dev/isa/wd.c - current wd.c
is 1.155 - so as wd.c got divided I was not able to integrate the diffs
of 1.150<->1.155.

Except of the above I integrated all well, but at compilation of the new
kernel I got:

cc  -O2 -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes -I. -I../../../../arch -I../../../.. -nostdinc -DSWAPPAGER -DVNODEPAGER -DDEVPAGER -DEXEC_AOUT -DEXEC_SCRIPT -DI586_CPU -DMATH_EMULATE -DDUMMY_NOPS -DXSERVER -DUCONSOLE -DINSECURE -DTIMEZONE="0" -DDST="1" -DKTRACE -DSYSVMSG -DSYSVSEM -DSYSVSHM -DCOMPAT_NOMID -DCOMPAT_09 -DCOMPAT_10 -DCOMPAT_11 -DCOMPAT_12 -DCOMPAT_43 -DTCP_COMPAT_42 -DCOMPAT_LINUX -DCOMPAT_FREEBSD -DEXEC_ELF32 -DUSER_LDT -DLKM -DFFS -DMFS -DNFSCLIENT -DNFSSERVER -DHAS_VOPLEASE -DAPM_NO_IDLE -DMSDOSFS -DFIFO -DPROCFS -DINET -DGENERIC -DPCVT_CTRL_ALT_DEL -DPCVT_NSCREENS="8" -DCOLOR_KERNEL_BG="BG_BLACK" -DMAXUSERS=32 -D_KERNEL  -Di386  -c ../../../../atapi/atapiconf.c
cc1: warnings being treated as errors
In file included from ../../../../atapi/atapiconf.c:40:
../../../../atapi/atapilink.h:155: warning: function declaration isn't a prototype
../../../../atapi/atapilink.h:156: warning: function declaration isn't a prototype
../../../../atapi/atapiconf.c: In function `atapibusmatch':
../../../../atapi/atapiconf.c:110: warning: unused variable `cf'
../../../../atapi/atapiconf.c: In function `atapibusattach':
../../../../atapi/atapiconf.c:267: warning: passing arg 3 of `config_found_sm' from incompatible pointer type
../../../../atapi/atapiconf.c: In function `atapi_exec_io':
../../../../atapi/atapiconf.c:355: warning: suggest parentheses around arithmetic in operand of |
*** Error code 1


cc  -O2 -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes -I. -I../../../../arch -I../../../.. -nostdinc -DSWAPPAGER -DVNODEPAGER -DDEVPAGER -DEXEC_AOUT -DEXEC_SCRIPT -DI586_CPU -DMATH_EMULATE -DDUMMY_NOPS -DXSERVER -DUCONSOLE -DINSECURE -DTIMEZONE="0" -DDST="1" -DKTRACE -DSYSVMSG -DSYSVSEM -DSYSVSHM -DCOMPAT_NOMID -DCOMPAT_09 -DCOMPAT_10 -DCOMPAT_11 -DCOMPAT_12 -DCOMPAT_43 -DTCP_COMPAT_42 -DCOMPAT_LINUX -DCOMPAT_FREEBSD -DEXEC_ELF32 -DUSER_LDT -DLKM -DFFS -DMFS -DNFSCLIENT -DNFSSERVER -DHAS_VOPLEASE -DAPM_NO_IDLE -DMSDOSFS -DFIFO -DPROCFS -DINET -DGENERIC -DPCVT_CTRL_ALT_DEL -DPCVT_NSCREENS="8" -DCOLOR_KERNEL_BG="BG_BLACK" -DMAXUSERS=32 -D_KERNEL  -Di386  -c ../../../../atapi/acd.c
cc1: warnings being treated as errors
In file included from ../../../../atapi/acd.c:50:
../../../../atapi/atapilink.h:155: warning: function declaration isn't a prototype
../../../../atapi/atapilink.h:156: warning: function declaration isn't a prototype
../../../../atapi/acd.c: In function `acdmatch':
../../../../atapi/acd.c:135: warning: unused variable `cf'
../../../../atapi/acd.c: In function `acdattach':
../../../../atapi/acd.c:160: warning: unused variable `cmd'
../../../../atapi/acd.c: At top level:
../../../../atapi/acd.c:270: warning: function declaration isn't a prototype
../../../../atapi/acd.c:288: warning: function declaration isn't a prototype
../../../../atapi/acd.c:303: warning: function declaration isn't a prototype
../../../../atapi/acd.c: In function `acdopen':
../../../../atapi/acd.c:329: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:345: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c: At top level:
../../../../atapi/acd.c:409: warning: function declaration isn't a prototype
../../../../atapi/acd.c:645: warning: function declaration isn't a prototype
../../../../atapi/acd.c:654: warning: function declaration isn't a prototype
../../../../atapi/acd.c:668: warning: function declaration isn't a prototype
../../../../atapi/acd.c:693: warning: function declaration isn't a prototype
../../../../atapi/acd.c: In function `acdioctl':
../../../../atapi/acd.c:724: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:778: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:787: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:814: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:854: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:870: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:875: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:951: warning: implicit declaration of function `acd_reset'
../../../../atapi/acd.c: In function `acd_size':
../../../../atapi/acd.c:1021: warning: unused variable `size'
../../../../atapi/acd.c:1020: warning: unused variable `blksize'
../../../../atapi/acd.c: In function `acd_get_mode':
../../../../atapi/acd.c:1074: warning: unused variable `error'
../../../../atapi/acd.c: In function `acd_setchan':
../../../../atapi/acd.c:1120: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c: In function `acd_load_toc':
../../../../atapi/acd.c:1177: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c:1182: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c: In function `acd_play_tracks':
../../../../atapi/acd.c:1209: warning: suggest parentheses around assignment used as truth value
../../../../atapi/acd.c: At top level:
../../../../atapi/acd.c:1272: warning: function declaration isn't a prototype
../../../../atapi/acd.c:1282: warning: return-type defaults to `int'
../../../../atapi/acd.c: In function `acd_read_toc':
../../../../atapi/acd.c:1312: warning: unused variable `error'
../../../../atapi/acd.c: At top level:
../../../../atapi/acd.c:1346: warning: function declaration isn't a prototype
../../../../atapi/acd.c:1362: warning: function declaration isn't a prototype
*** Error code 1


cc  -O2 -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes -I. -I../../../../arch -I../../../.. -nostdinc -DSWAPPAGER -DVNODEPAGER -DDEVPAGER -DEXEC_AOUT -DEXEC_SCRIPT -DI586_CPU -DMATH_EMULATE -DDUMMY_NOPS -DXSERVER -DUCONSOLE -DINSECURE -DTIMEZONE="0" -DDST="1" -DKTRACE -DSYSVMSG -DSYSVSEM -DSYSVSHM -DCOMPAT_NOMID -DCOMPAT_09 -DCOMPAT_10 -DCOMPAT_11 -DCOMPAT_12 -DCOMPAT_43 -DTCP_COMPAT_42 -DCOMPAT_LINUX -DCOMPAT_FREEBSD -DEXEC_ELF32 -DUSER_LDT -DLKM -DFFS -DMFS -DNFSCLIENT -DNFSSERVER -DHAS_VOPLEASE -DAPM_NO_IDLE -DMSDOSFS -DFIFO -DPROCFS -DINET -DGENERIC -DPCVT_CTRL_ALT_DEL -DPCVT_NSCREENS="8" -DCOLOR_KERNEL_BG="BG_BLACK" -DMAXUSERS=32 -D_KERNEL  -Di386  -c ../../../../dev/isa/wdc.c
cc1: warnings being treated as errors
In file included from ../../../../dev/isa/wdc.c:66:
../../../../atapi/atapilink.h:155: warning: function declaration isn't a prototype
../../../../atapi/atapilink.h:156: warning: function declaration isn't a prototype
../../../../dev/isa/wdc.c:180: warning: function declaration isn't a prototype
../../../../dev/isa/wdc.c: In function `wdc_ata_start':
../../../../dev/isa/wdc.c:326: warning: label `loop' defined but not used
../../../../dev/isa/wdc.c: In function `wdcintr':
../../../../dev/isa/wdc.c:615: warning: unused variable `i'
../../../../dev/isa/wdc.c:614: warning: unused variable `e'
../../../../dev/isa/wdc.c: In function `wdc_ata_done':
../../../../dev/isa/wdc.c:1018: warning: implicit declaration of function `wdstart'
../../../../dev/isa/wdc.c: In function `wdc_get_xfer':
../../../../dev/isa/wdc.c:1054: warning: suggest parentheses around assignment used as truth value
../../../../dev/isa/wdc.c: In function `wdccontrol':
../../../../dev/isa/wdc.c:1131: warning: implicit declaration of function `wdsetctlr'
../../../../dev/isa/wdc.c: In function `wdc_atapi_send_command_packet':
../../../../dev/isa/wdc.c:1391: warning: unused variable `s'
*** Error code 1


  -O2 -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes -I. -I../../../../arch -I../../../.. -nostdinc -DSWAPPAGER -DVNODEPAGER -DDEVPAGER -DEXEC_AOUT -DEXEC_SCRIPT -DI586_CPU -DMATH_EMULATE -DDUMMY_NOPS -DXSERVER -DUCONSOLE -DINSECURE -DTIMEZONE="0" -DDST="1" -DKTRACE -DSYSVMSG -DSYSVSEM -DSYSVSHM -DCOMPAT_NOMID -DCOMPAT_09 -DCOMPAT_10 -DCOMPAT_11 -DCOMPAT_12 -DCOMPAT_43 -DTCP_COMPAT_42 -DCOMPAT_LINUX -DCOMPAT_FREEBSD -DEXEC_ELF32 -DUSER_LDT -DLKM -DFFS -DMFS -DNFSCLIENT -DNFSSERVER -DHAS_VOPLEASE -DAPM_NO_IDLE -DMSDOSFS -DFIFO -DPROCFS -DINET -DGENERIC -DPCVT_CTRL_ALT_DEL -DPCVT_NSCREENS="8" -DCOLOR_KERNEL_BG="BG_BLACK" -DMAXUSERS=32 -D_KERNEL  -Di386  -c ../../../../dev/isa/wd.c
cc1: warnings being treated as errors
../../../../dev/isa/wd.c: In function `wdprobe':
../../../../dev/isa/wd.c:118: warning: unused variable `wdc'
../../../../dev/isa/wd.c: In function `wdattach':
../../../../dev/isa/wd.c:141: warning: unused variable `wdc'
../../../../dev/isa/wd.c: In function `wdstart':
../../../../dev/isa/wd.c:276: warning: unused variable `nblks'
../../../../dev/isa/wd.c:276: warning: unused variable `blkno'
*** Error code 1

I compiled those without -Werror and as far as I can say the kernel
works with seeing my cdrom now. But has anyone a cleanup-patch that fits
NetBSD current without those problems?

Thanx for any help in advance!

Greets
-- 

   Name  : Thorsten Frueauf            Milano@irc cri@onaliM       //
   E-Mail: s_frueau@ira.uka.de oder ukfy@rz.uni-karlsruhe.de     \X/