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

struct device * -> device_t, no functional changes intended.

Browse Source
This commit is contained in:
cegger 2009-05-07 12:15:33 +00:00
parent 7dc37dded5
commit bc33dc599e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bio.c,v 1.8 2008/04/09 05:47:19 cegger Exp $ */ /* $NetBSD: bio.c,v 1.9 2009/05/07 12:15:33 cegger Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */ /* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/* /*
@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */ /* A device controller ioctl tunnelling device. */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.8 2008/04/09 05:47:19 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.9 2009/05/07 12:15:33 cegger Exp $");
#include "opt_compat_netbsd.h" #include "opt_compat_netbsd.h"
@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.8 2008/04/09 05:47:19 cegger Exp $");
struct bio_mapping { struct bio_mapping {
LIST_ENTRY(bio_mapping) bm_link; LIST_ENTRY(bio_mapping) bm_link;
struct device *bm_dev; device_t bm_dev;
int (*bm_ioctl)(struct device *, u_long, void *); int (*bm_ioctl)(device_t, u_long, void *);
}; };
static LIST_HEAD(, bio_mapping) bios = LIST_HEAD_INITIALIZER(bios); static LIST_HEAD(, bio_mapping) bios = LIST_HEAD_INITIALIZER(bios);
@ -222,7 +222,7 @@ bioioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
} }
int int
bio_register(struct device *dev, int (*ioctl)(struct device *, u_long, void *)) bio_register(device_t dev, int (*ioctl)(device_t, u_long, void *))
{ {
struct bio_mapping *bm; struct bio_mapping *bm;
@ -241,7 +241,7 @@ bio_register(struct device *dev, int (*ioctl)(struct device *, u_long, void *))
} }
void void
bio_unregister(struct device *dev) bio_unregister(device_t dev)
{ {
struct bio_mapping *bm, *next; struct bio_mapping *bm, *next;

7
sys/dev/biovar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: biovar.h,v 1.7 2008/03/03 13:43:19 xtraeme Exp $ */ /* $NetBSD: biovar.h,v 1.8 2009/05/07 12:15:33 cegger Exp $ */
/* $OpenBSD: biovar.h,v 1.26 2007/03/19 03:02:08 marco Exp $ */ /* $OpenBSD: biovar.h,v 1.26 2007/03/19 03:02:08 marco Exp $ */
/* /*
@ -37,6 +37,7 @@
#define _DEV_BIOVAR_H_ #define _DEV_BIOVAR_H_
#include <sys/types.h> #include <sys/types.h>
#include <sys/device.h>
#ifndef _KERNEL #ifndef _KERNEL
#include <stdbool.h> #include <stdbool.h>
@ -54,8 +55,8 @@ struct bio_locate {
}; };
#ifdef _KERNEL #ifdef _KERNEL
int bio_register(struct device *, int (*)(struct device *, u_long, void *)); int bio_register(device_t, int (*)(device_t, u_long, void *));
void bio_unregister(struct device *); void bio_unregister(device_t);
#endif #endif
#define BIOCINQ _IOWR('B', 32, struct bioc_inq) #define BIOCINQ _IOWR('B', 32, struct bioc_inq)