Update for struct cdevsw and dev_t -> struct cdev * changes, plus one

64-bit portability fix.
This commit is contained in:
tjr 2004-07-16 06:55:34 +00:00
parent fabd09c301
commit 73692bbf16
2 changed files with 9 additions and 7 deletions

View File

@ -95,10 +95,10 @@
/* Stores string recv'd by _write() */
static char buf[512+1];
static int len;
static size_t len;
int
mydev_open(dev_t dev, int flag, int otyp, struct thread *td)
mydev_open(struct cdev *dev, int flag, int otyp, struct thread *td)
{
struct proc *procp = td->td_proc;
@ -110,7 +110,7 @@ mydev_open(dev_t dev, int flag, int otyp, struct thread *td)
}
int
mydev_close(dev_t dev, int flag, int otyp, struct thread *td)
mydev_close(struct cdev *dev, int flag, int otyp, struct thread *td)
{
struct proc *procp = td->td_proc;
@ -120,7 +120,8 @@ mydev_close(dev_t dev, int flag, int otyp, struct thread *td)
}
int
mydev_ioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
mydev_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int mode,
struct thread *td)
{
int error = 0;
struct proc *procp = td->td_proc;
@ -145,7 +146,7 @@ mydev_ioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
* to buf for later accessing.
*/
int
mydev_write(dev_t dev, struct uio *uio, int ioflag)
mydev_write(struct cdev *dev, struct uio *uio, int ioflag)
{
int err = 0;
@ -165,7 +166,7 @@ mydev_write(dev_t dev, struct uio *uio, int ioflag)
* accessing.
*/
int
mydev_read(dev_t dev, struct uio *uio, int ioflag)
mydev_read(struct cdev *dev, struct uio *uio, int ioflag)
{
int err = 0;

View File

@ -82,6 +82,7 @@
#endif
static struct cdevsw my_devsw = {
/* version */ .d_version = D_VERSION,
/* open */ .d_open = mydev_open,
/* close */ .d_close = mydev_close,
/* read */ .d_read = mydev_read,
@ -96,7 +97,7 @@ static struct cdevsw my_devsw = {
* in devfs... we must keep this variable sane until we
* call kldunload.
*/
static dev_t sdev;
static struct cdev *sdev;
/*
* This function is called each time the module is loaded or unloaded.