Fdopen --> fdopen
This commit is contained in:
oki
parent
affaadc59f
commit
a9685de195
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fd.c,v 1.12 1997/07/17 02:16:19 jtk Exp $ */
|
||||
/* $NetBSD: fd.c,v 1.13 1997/10/10 21:42:40 oki Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993, 1994, 1995 Charles Hannum.
|
||||
|
|
@ -113,17 +113,13 @@ struct fdc_softc {
|
|||
u_char sc_status[7]; /* copy of registers */
|
||||
} fdc_softc;
|
||||
|
||||
/* controller driver configuration */
|
||||
int fdcinit();
|
||||
void fdcstart();
|
||||
void fdcgo();
|
||||
int fdcintr ();
|
||||
void fdcdone();
|
||||
void fdcreset();
|
||||
int fdcintr __P((void));
|
||||
void fdcreset __P((void));
|
||||
|
||||
/* controller driver configuration */
|
||||
int fdcprobe __P((struct device *, void *, void *));
|
||||
void fdcattach __P((struct device *, struct device *, void *));
|
||||
int fdprint __P((void *, const char *));
|
||||
|
||||
struct cfattach fdc_ca = {
|
||||
sizeof(struct fdc_softc), fdcprobe, fdcattach
|
||||
|
|
@ -211,12 +207,8 @@ struct cfdriver fd_cd = {
|
|||
NULL, "fd", DV_DISK
|
||||
};
|
||||
|
||||
/* floppy driver configuration */
|
||||
void fdstart __P((struct fd_softc *fd));
|
||||
void fdgo();
|
||||
void fdintr();
|
||||
|
||||
void fdstrategy __P((struct buf *));
|
||||
void fdstart __P((struct fd_softc *fd));
|
||||
|
||||
struct dkdriver fddkdriver = { fdstrategy };
|
||||
|
||||
|
|
@ -231,8 +223,11 @@ void fdctimeout __P((void *arg));
|
|||
void fdcpseudointr __P((void *arg));
|
||||
void fdcretry __P((struct fdc_softc *fdc));
|
||||
void fdfinish __P((struct fd_softc *fd, struct buf *bp));
|
||||
__inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t));
|
||||
static int fdcpoll __P((struct fdc_softc *));
|
||||
static int fdgetdisklabel __P((struct fd_softc *, dev_t));
|
||||
static void fd_do_eject __P((int));
|
||||
|
||||
void fd_mountroot_hook __P((struct device *));
|
||||
|
||||
#define FDDI_EN 0x02
|
||||
|
|
@ -247,7 +242,7 @@ void fd_mountroot_hook __P((struct device *));
|
|||
|
||||
static u_char *fdc_dmabuf;
|
||||
|
||||
static inline void
|
||||
__inline static void
|
||||
fdc_dmastart(read, addr, count)
|
||||
int read;
|
||||
caddr_t addr;
|
||||
|
|
@ -277,7 +272,7 @@ fdc_dmastart(read, addr, count)
|
|||
asm("nop");
|
||||
asm("nop");
|
||||
dmac->mar = (unsigned long)kvtop(addr);
|
||||
#if defined(M68040)
|
||||
#if defined(M68040) || defined(M68060)
|
||||
/*
|
||||
* Push back dirty cache lines
|
||||
*/
|
||||
|
|
@ -383,7 +378,7 @@ fdcattach(parent, self, aux)
|
|||
|
||||
fdc_dmabuf = (u_char *)malloc(NBPG, M_DEVBUF, M_WAITOK);
|
||||
if (fdc_dmabuf == 0)
|
||||
printf("fdcinit: WARNING!! malloc() failed.\n");
|
||||
printf("fdcattach: WARNING!! malloc() failed.\n");
|
||||
dma_bouncebuf[DRQ] = fdc_dmabuf;
|
||||
|
||||
/* physical limit: four drives per controller. */
|
||||
|
|
@ -529,7 +524,7 @@ fdattach(parent, self, aux)
|
|||
mountroothook_establish(fd_mountroot_hook, &fd->sc_dev);
|
||||
}
|
||||
|
||||
inline struct fd_type *
|
||||
__inline struct fd_type *
|
||||
fd_dev_to_type(fd, dev)
|
||||
struct fd_softc *fd;
|
||||
dev_t dev;
|
||||
|
|
@ -775,7 +770,7 @@ out_fdc(x)
|
|||
}
|
||||
|
||||
int
|
||||
Fdopen(dev, flags, fmt)
|
||||
fdopen(dev, flags, fmt)
|
||||
dev_t dev;
|
||||
int flags, fmt;
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.10 1997/06/01 01:27:51 oki Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.11 1997/10/10 21:42:38 oki Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
|
|
@ -45,9 +45,7 @@
|
|||
|
||||
bdev_decl(sw);
|
||||
#include "fd.h"
|
||||
#define fdopen Fdopen /* conflicts with fdopen() in kern_descrip.c */
|
||||
bdev_decl(fd);
|
||||
#undef fdopen
|
||||
#include "sd.h"
|
||||
bdev_decl(sd);
|
||||
#include "cd.h"
|
||||
|
|
@ -65,9 +63,7 @@ struct bdevsw bdevsw[] =
|
|||
{
|
||||
bdev_notdef(), /* 0: */
|
||||
bdev_notdef(), /* 1: */
|
||||
#define fdopen Fdopen
|
||||
bdev_disk_init(NFD,fd), /* 2: floppy diskette */
|
||||
#undef fdopen
|
||||
bdev_swap_init(1,sw), /* 3: swap pseudo-device */
|
||||
bdev_disk_init(NSD,sd), /* 4: SCSI disk */
|
||||
bdev_tape_init(NST,st), /* 5: SCSI tape */
|
||||
|
|
@ -158,9 +154,7 @@ cdev_decl(ccd);
|
|||
cdev_decl(vnd);
|
||||
cdev_decl(md);
|
||||
cdev_decl(st);
|
||||
#define fdopen Fdopen
|
||||
cdev_decl(fd);
|
||||
#undef fdopen
|
||||
cdev_decl(kbd);
|
||||
cdev_decl(ms);
|
||||
dev_decl(filedesc,open);
|
||||
|
|
@ -207,9 +201,7 @@ struct cdevsw cdevsw[] =
|
|||
cdev_gen_init(1,ms), /* 15: /dev/mouse */
|
||||
cdev_tty_init(NCOM,com), /* 16: serial port */
|
||||
cdev_gen_init(NAUDIO,audio), /* 17: /dev/adpcm /dev/pcm /dev/audio */
|
||||
#define fdopen Fdopen
|
||||
cdev_disk_init(NFD,fd), /* 18: floppy disk */
|
||||
#undef fdopen
|
||||
cdev_disk_init(NVND,vnd), /* 19: vnode disk driver */
|
||||
cdev_tape_init(NST,st), /* 20: SCSI tape */
|
||||
cdev_fd_init(1,filedesc), /* 21: file descriptor pseudo-dev */
|
||||
|
|
|
|||
Loading…
Reference in New Issue