Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make these files GCC 2 happy.

Browse Source
This commit is contained in:
mycroft 1993-07-17 16:20:24 +00:00
parent ad087b06a0
commit 331148c31a
9 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/i386/eisa/aha1742.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1742.c,v 1.12 1993/06/09 22:36:46 deraadt Exp $
* $Id: aha1742.c,v 1.13 1993/07/17 16:20:24 mycroft Exp $
*/
#include "ahb.h"
@ -660,7 +660,7 @@ ahb_free_ecb(int unit, struct ecb *ecb, int flags)
* one to come free, starting with queued entries*
*/
if (!ecb->next)
wakeup(&ahb_data[unit].free_ecb);
wakeup((caddr_t)&ahb_data[unit].free_ecb);
if (!(flags & SCSI_NOMASK))
splx(opri);
@ -685,7 +685,7 @@ ahb_get_ecb(int unit, int flags)
* to come free
*/
while ((!(rc = ahb_data[unit].free_ecb)) && (!(flags & SCSI_NOSLEEP)))
sleep(&ahb_data[unit].free_ecb, PRIBIO);
sleep((caddr_t)&ahb_data[unit].free_ecb, PRIBIO);
if (rc) {
ahb_data[unit].free_ecb = rc->next;
@ -1164,7 +1164,7 @@ ahb_timeout(int arg)
}
}
splx(s);
timeout(ahb_timeout,arg,SLEEPTIME);
timeout((timeout_t)ahb_timeout,(caddr_t)arg,SLEEPTIME);
}
void

8
sys/arch/i386/isa/aha1742.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1742.c,v 1.12 1993/06/09 22:36:46 deraadt Exp $
* $Id: aha1742.c,v 1.13 1993/07/17 16:20:24 mycroft Exp $
*/
#include "ahb.h"
@ -660,7 +660,7 @@ ahb_free_ecb(int unit, struct ecb *ecb, int flags)
* one to come free, starting with queued entries*
*/
if (!ecb->next)
wakeup(&ahb_data[unit].free_ecb);
wakeup((caddr_t)&ahb_data[unit].free_ecb);
if (!(flags & SCSI_NOMASK))
splx(opri);
@ -685,7 +685,7 @@ ahb_get_ecb(int unit, int flags)
* to come free
*/
while ((!(rc = ahb_data[unit].free_ecb)) && (!(flags & SCSI_NOSLEEP)))
sleep(&ahb_data[unit].free_ecb, PRIBIO);
sleep((caddr_t)&ahb_data[unit].free_ecb, PRIBIO);
if (rc) {
ahb_data[unit].free_ecb = rc->next;
@ -1164,7 +1164,7 @@ ahb_timeout(int arg)
}
}
splx(s);
timeout(ahb_timeout,arg,SLEEPTIME);
timeout((timeout_t)ahb_timeout,(caddr_t)arg,SLEEPTIME);
}
void

15
sys/arch/i386/isa/lpt.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.6 1993/06/15 01:50:32 mycroft Exp $
* $Id: lpt.c,v 1.7 1993/07/17 16:20:32 mycroft Exp $
*/
/*
@ -271,7 +271,8 @@ printf ("status %x\n", inb(port+lpt_status) );
}
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
sc->sc_state = 0;
splx(s);
return (EBUSY);
@ -293,7 +294,7 @@ printf ("status %x\n", inb(port+lpt_status) );
sc->sc_inbuf = geteblk(BUFSIZE);
sc->sc_xfercnt = 0;
splx(s);
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
lprintf("opened.\n");
return(0);
}
@ -304,7 +305,7 @@ lptout (sc)
lprintf ("T %x ", inb(sc->sc_port+lpt_status));
if (sc->sc_state&OPEN)
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
else sc->sc_state &= ~TOUT;
if (sc->sc_state & ERROR)
@ -337,7 +338,8 @@ lptclose(dev, flag)
while ((inb(port+lpt_status) & (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
(LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt)
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
break;
sc->sc_state = 0;
@ -374,7 +376,8 @@ lprintf("\nC %d. ", sc->sc_xfercnt);
(void) splx(pl);
}
lprintf("W ");
if (err = tsleep (sc, LPPRI|PCATCH, "lpwrite", 0))
if (err = tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpwrite", 0))
return(err);
}
}

8
sys/dev/eisa/aha1742.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1742.c,v 1.12 1993/06/09 22:36:46 deraadt Exp $
* $Id: aha1742.c,v 1.13 1993/07/17 16:20:24 mycroft Exp $
*/
#include "ahb.h"
@ -660,7 +660,7 @@ ahb_free_ecb(int unit, struct ecb *ecb, int flags)
* one to come free, starting with queued entries*
*/
if (!ecb->next)
wakeup(&ahb_data[unit].free_ecb);
wakeup((caddr_t)&ahb_data[unit].free_ecb);
if (!(flags & SCSI_NOMASK))
splx(opri);
@ -685,7 +685,7 @@ ahb_get_ecb(int unit, int flags)
* to come free
*/
while ((!(rc = ahb_data[unit].free_ecb)) && (!(flags & SCSI_NOSLEEP)))
sleep(&ahb_data[unit].free_ecb, PRIBIO);
sleep((caddr_t)&ahb_data[unit].free_ecb, PRIBIO);
if (rc) {
ahb_data[unit].free_ecb = rc->next;
@ -1164,7 +1164,7 @@ ahb_timeout(int arg)
}
}
splx(s);
timeout(ahb_timeout,arg,SLEEPTIME);
timeout((timeout_t)ahb_timeout,(caddr_t)arg,SLEEPTIME);
}
void

15
sys/dev/ic/lpt.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.6 1993/06/15 01:50:32 mycroft Exp $
* $Id: lpt.c,v 1.7 1993/07/17 16:20:32 mycroft Exp $
*/
/*
@ -271,7 +271,8 @@ printf ("status %x\n", inb(port+lpt_status) );
}
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
sc->sc_state = 0;
splx(s);
return (EBUSY);
@ -293,7 +294,7 @@ printf ("status %x\n", inb(port+lpt_status) );
sc->sc_inbuf = geteblk(BUFSIZE);
sc->sc_xfercnt = 0;
splx(s);
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
lprintf("opened.\n");
return(0);
}
@ -304,7 +305,7 @@ lptout (sc)
lprintf ("T %x ", inb(sc->sc_port+lpt_status));
if (sc->sc_state&OPEN)
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
else sc->sc_state &= ~TOUT;
if (sc->sc_state & ERROR)
@ -337,7 +338,8 @@ lptclose(dev, flag)
while ((inb(port+lpt_status) & (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
(LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt)
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
break;
sc->sc_state = 0;
@ -374,7 +376,8 @@ lprintf("\nC %d. ", sc->sc_xfercnt);
(void) splx(pl);
}
lprintf("W ");
if (err = tsleep (sc, LPPRI|PCATCH, "lpwrite", 0))
if (err = tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpwrite", 0))
return(err);
}
}

15
sys/dev/ic/lptvar.h
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lptvar.h,v 1.6 1993/06/15 01:50:32 mycroft Exp $
* $Id: lptvar.h,v 1.7 1993/07/17 16:20:32 mycroft Exp $
*/
/*
@ -271,7 +271,8 @@ printf ("status %x\n", inb(port+lpt_status) );
}
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
sc->sc_state = 0;
splx(s);
return (EBUSY);
@ -293,7 +294,7 @@ printf ("status %x\n", inb(port+lpt_status) );
sc->sc_inbuf = geteblk(BUFSIZE);
sc->sc_xfercnt = 0;
splx(s);
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
lprintf("opened.\n");
return(0);
}
@ -304,7 +305,7 @@ lptout (sc)
lprintf ("T %x ", inb(sc->sc_port+lpt_status));
if (sc->sc_state&OPEN)
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
else sc->sc_state &= ~TOUT;
if (sc->sc_state & ERROR)
@ -337,7 +338,8 @@ lptclose(dev, flag)
while ((inb(port+lpt_status) & (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
(LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt)
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
break;
sc->sc_state = 0;
@ -374,7 +376,8 @@ lprintf("\nC %d. ", sc->sc_xfercnt);
(void) splx(pl);
}
lprintf("W ");
if (err = tsleep (sc, LPPRI|PCATCH, "lpwrite", 0))
if (err = tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpwrite", 0))
return(err);
}
}

15
sys/dev/isa/lpt.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.6 1993/06/15 01:50:32 mycroft Exp $
* $Id: lpt.c,v 1.7 1993/07/17 16:20:32 mycroft Exp $
*/
/*
@ -271,7 +271,8 @@ printf ("status %x\n", inb(port+lpt_status) );
}
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
sc->sc_state = 0;
splx(s);
return (EBUSY);
@ -293,7 +294,7 @@ printf ("status %x\n", inb(port+lpt_status) );
sc->sc_inbuf = geteblk(BUFSIZE);
sc->sc_xfercnt = 0;
splx(s);
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
lprintf("opened.\n");
return(0);
}
@ -304,7 +305,7 @@ lptout (sc)
lprintf ("T %x ", inb(sc->sc_port+lpt_status));
if (sc->sc_state&OPEN)
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
else sc->sc_state &= ~TOUT;
if (sc->sc_state & ERROR)
@ -337,7 +338,8 @@ lptclose(dev, flag)
while ((inb(port+lpt_status) & (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
(LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt)
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
break;
sc->sc_state = 0;
@ -374,7 +376,8 @@ lprintf("\nC %d. ", sc->sc_xfercnt);
(void) splx(pl);
}
lprintf("W ");
if (err = tsleep (sc, LPPRI|PCATCH, "lpwrite", 0))
if (err = tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpwrite", 0))
return(err);
}
}

15
sys/dev/isa/lpt_isa.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt_isa.c,v 1.6 1993/06/15 01:50:32 mycroft Exp $
* $Id: lpt_isa.c,v 1.7 1993/07/17 16:20:32 mycroft Exp $
*/
/*
@ -271,7 +271,8 @@ printf ("status %x\n", inb(port+lpt_status) );
}
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) {
sc->sc_state = 0;
splx(s);
return (EBUSY);
@ -293,7 +294,7 @@ printf ("status %x\n", inb(port+lpt_status) );
sc->sc_inbuf = geteblk(BUFSIZE);
sc->sc_xfercnt = 0;
splx(s);
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
lprintf("opened.\n");
return(0);
}
@ -304,7 +305,7 @@ lptout (sc)
lprintf ("T %x ", inb(sc->sc_port+lpt_status));
if (sc->sc_state&OPEN)
timeout (lptout, sc, hz/2);
timeout((timeout_t)lptout, (caddr_t)sc, hz/2);
else sc->sc_state &= ~TOUT;
if (sc->sc_state & ERROR)
@ -337,7 +338,8 @@ lptclose(dev, flag)
while ((inb(port+lpt_status) & (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
(LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt)
/* wait 1/4 second, give up if we get a signal */
if (tsleep (sc, LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
if (tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK)
break;
sc->sc_state = 0;
@ -374,7 +376,8 @@ lprintf("\nC %d. ", sc->sc_xfercnt);
(void) splx(pl);
}
lprintf("W ");
if (err = tsleep (sc, LPPRI|PCATCH, "lpwrite", 0))
if (err = tsleep((caddr_t)sc,
LPPRI|PCATCH, "lpwrite", 0))
return(err);
}
}

4
sys/kern/vfs__bio.c
View File

@ -45,7 +45,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: vfs__bio.c,v 1.5 1993/07/04 04:01:38 cgd Exp $
* $Id: vfs__bio.c,v 1.6 1993/07/17 16:23:05 mycroft Exp $
*/
#include "param.h"
@ -58,7 +58,7 @@
#include "vm/vm.h"
#include "resourcevar.h"
struct buf *getnewbuf __P((int));
static struct buf *getnewbuf __P((int));
extern vm_map_t buffer_map;
/*