[bsd-nomads:9736] Re: pao228 reject patch

["K.KIKUCHI" <keis@safins.or.jp>]

菊地と申します。
本日メーリングリストに登録したばかりなのに早速メールいただきありがとうござい
ます。
リストに登録すると直接メール頂けるのですか？
ただいま、ＴｈｉｎｋＰａｄ ３８０ＸＤとＴｈｉｎｋＰａｄ５３５にインストール
を試みています、
残念ながら、ディスプレーの設定で躓いています、ＤＯＳも満足に使えないのです
が、がんばってみます。
     まだまだ、ＰＡＯのインストールは先の話のようです。
-----Original Message-----
差出人 : Toshihiko ARAI <toshi@tenchi.ne.jp>
宛先 : bsd-nomads <bsd-nomads>
日時 : 1998年 11月 30日 月曜日 午後 10:29
件名 : [bsd-nomads:9734] pao228 reject patch


>新井です。
>
>RELENG_2_2_8_RELEASE が commit されてたので、PAO を merge し
>てみました。いくつか reject されていたのでその patch です。
>ed, sio など動作しています。
>
>Index: i386/conf/options.i386
>===================================================================
>RCS file: /home/toshi/cvsup/cvs/pao_test_sys/i386/conf/options.i386,v
>retrieving revision 1.1.1.3.2.1
>diff -u -r1.1.1.3.2.1 options.i386
>--- options.i386 1998/11/30 08:16:16 1.1.1.3.2.1
>+++ options.i386 1998/11/30 11:02:06
>@@ -83,6 +83,7 @@
>
> FDC_DEBUG opt_fdc.h
> FDC_PRINT_BOGUS_CHIPTYPE opt_fdc.h
>+FDC_YE opt_fdc.h
>
> # pcvt(4) has a bunch of options
> FAT_CURSOR opt_pcvt.h
>Index: i386/i386/userconfig.c
>===================================================================
>RCS file: /home/toshi/cvsup/cvs/pao_test_sys/i386/i386/userconfig.c,v
>retrieving revision 1.1.1.4.2.1
>diff -u -r1.1.1.4.2.1 userconfig.c
>--- userconfig.c 1998/11/30 08:16:16 1.1.1.4.2.1
>+++ userconfig.c 1998/11/30 08:16:44
>@@ -263,6 +263,8 @@
> {"tx",          "SMC 9432TX Ethernet adapter", 0, CLS_NETWORK},
> {"vx",          "3COM 3C590/3C595 Ethernet adapters", 0, CLS_NETWORK},
> {"xl",          "3COM 3C90x/3C90xB/3C980 Ethernet adapters", 0,
CLS_NETWORK},
>+{"sn", "SMC/Megahertz Ethernet adapters", 0, CLS_NETWORK},
>+{"wlp", "AT&T GIS WaveLAN", 0, CLS_NETWORK},
> {"ze",          "IBM/National Semiconductor PCMCIA Ethernet adapter",0,
CLS_NETWORK},
> {"zp",          "3COM PCMCIA Etherlink III Ethernet adapter", 0,
CLS_NETWORK},
> {"de",          "DEC DC21040 Ethernet adapter", FLG_FIXED, CLS_NETWORK},
>Index: i386/isa/aic6360.c
>===================================================================
>RCS file: /home/toshi/cvsup/cvs/pao_test_sys/i386/isa/aic6360.c,v
>retrieving revision 1.1.1.3.4.1
>diff -u -r1.1.1.3.4.1 aic6360.c
>--- aic6360.c 1998/11/30 08:16:17 1.1.1.3.4.1
>+++ aic6360.c 1998/11/30 11:06:40
>@@ -646,7 +646,7 @@
> #define AIC_START(str)
> #endif
>
>-void aicintr __P((int));
>+/*void aicintr __P((int));*/
> static int aicprobe __P((struct isa_device *));
> static int aicattach __P((struct isa_device *));
> static void aic_minphys __P((struct buf *));
>@@ -658,8 +658,8 @@
> static void aic_datain __P((struct aic_data *aic));
> static int32_t aic_scsi_cmd __P((struct scsi_xfer *));
> static int aic_poll __P((struct aic_data *aic, struct acb *));
>-void aic_add_timeout __P((struct acb *, int));
>-void aic_remove_timeout __P((struct acb *));
>+/*void aic_add_timeout __P((struct acb *, int));*/
>+/*void aic_remove_timeout __P((struct acb *));*/
> static void aic6360_reset __P((struct aic_data *aic));
> static u_short aicphase __P((struct aic_data *aic));
> static void aic_msgin __P((struct aic_data *aic));
>Index: i386/isa/atapi.c
>===================================================================
>RCS file: /home/toshi/cvsup/cvs/pao_test_sys/i386/isa/atapi.c,v
>retrieving revision 1.1.1.4.2.1
>diff -u -r1.1.1.4.2.1 atapi.c
>--- atapi.c 1998/11/30 08:16:17 1.1.1.4.2.1
>+++ atapi.c 1998/11/30 09:14:19
>@@ -314,6 +314,9 @@
> /* ATAPI CD-ROM & CD-R/RW drives */
> if (acdattach (ata, unit, ap, ata->debug) < 0)
> break;
>+#ifdef ATAPI_DETACH
>+ ata->params[unit] = ap;
>+#endif /* ATAPI_DETACH */
> ata->attached[unit] = 1;
> return (1);
> #else
>@@ -321,6 +324,9 @@
> /* ATAPI CD-ROM drives */
> if (wcdattach (ata, unit, ap, ata->debug) < 0)
> break;
>+#ifdef ATAPI_DETACH
>+ ata->params[unit] = ap;
>+#endif /* ATAPI_DETACH */
> ata->attached[unit] = 1;
> return (1);
> #else
>Index: i386/isa/if_ep.c
>===================================================================
>RCS file: /home/toshi/cvsup/cvs/pao_test_sys/i386/isa/if_ep.c,v
>retrieving revision 1.1.1.4.2.1
>diff -u -r1.1.1.4.2.1 if_ep.c
>--- if_ep.c 1998/11/30 08:16:19 1.1.1.4.2.1
>+++ if_ep.c 1998/11/30 11:08:01
>@@ -129,13 +129,13 @@
>
> static void epinit __P((struct ep_softc *));
> static void epread __P((struct ep_softc *));
>-void epreset __P((int));
>+/*void epreset __P((int));*/
> static void epstart __P((struct ifnet *));
> static void epstop __P((struct ep_softc *));
> static void epwatchdog __P((struct ifnet *));
> static size_t ep_countmcast __P((struct ep_softc *));
> static void ep_setmcast __P((struct ep_softc *));
>-void  epintr(int unit);
>+/*void epintr(int unit);*/
>
> #if 0
> static int send_ID_sequence __P((int));
>Index: i386/isa/if_fe.c
>===================================================================
>RCS file: /home/toshi/cvsup/cvs/pao_test_sys/i386/isa/if_fe.c,v
>retrieving revision 1.1.1.3.4.1
>diff -u -r1.1.1.3.4.1 if_fe.c
>--- if_fe.c 1998/11/30 08:16:19 1.1.1.3.4.1
>+++ if_fe.c 1998/11/30 11:08:21
>@@ -250,7 +250,7 @@
> static void fe_start ( struct ifnet * );
> static void fe_reset ( int );
> static void fe_watchdog ( struct ifnet * );
>-void feintr ( int unit );
>+/*void feintr ( int unit );*/
>
> /* Local functions.  Order of declaration is confused.  FIXME.  */
> static int fe_probe_fmv ( DEVICE *, struct fe_softc * );
>Index: i386/isa/wd.c
>===================================================================
>RCS file: /home/toshi/cvsup/cvs/pao_test_sys/i386/isa/wd.c,v
>retrieving revision 1.1.1.4.2.1
>diff -u -r1.1.1.4.2.1 wd.c
>--- wd.c 1998/11/30 08:16:21 1.1.1.4.2.1
>+++ wd.c 1998/11/30 11:37:01
>@@ -235,7 +235,7 @@
> static timeout_t wdtimeout;
> static int wdunwedge(struct disk *du);
> static int wdwait(struct disk *du, u_char bits_wanted, int timeout);
>-void wdintr(int unit);
>+/*void wdintr(int unit);*/
>
> struct isa_driver wdcdriver = {
> wdprobe, wdattach, "wdc",
>Index: pccard/pccard.c
>===================================================================
>RCS file: /home/toshi/cvsup/cvs/pao_test_sys/pccard/pccard.c,v
>retrieving revision 1.1.1.4.2.1
>diff -u -r1.1.1.4.2.1 pccard.c
>--- pccard.c 1998/11/30 08:16:23 1.1.1.4.2.1
>+++ pccard.c 1998/11/30 09:23:23
>@@ -527,7 +527,7 @@
> * Disable any pending timeouts for this slot since we're
> * powering it down/disabling now.
> */
>- untimeout(power_off_slot, (caddr_t)slt);
>+ untimeout(really_power_off_slot, (caddr_t)slt);
> slt->ctrl->disable(slt);
> return (0);
> }
>--
>PAO 動作報告, SUPPORTED.CARDS 登録用アドレス <pao-report@clave.gr.jp>
> 新井利彦 <clover@air.linkclub.or.jp>
>