Module Name: src
Committed By: cegger
Date: Thu May 7 12:15:33 UTC 2009
Modified Files:
src/sys/dev: bio.c biovar.h
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/bio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/biovar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/bio.c
diff -u src/sys/dev/bio.c:1.8 src/sys/dev/bio.c:1.9
--- src/sys/dev/bio.c:1.8 Wed Apr 9 05:47:19 2008
+++ src/sys/dev/bio.c Thu May 7 12:15:33 2009
@@ -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 $ */
/*
@@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */
#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"
@@ -48,8 +48,8 @@
struct bio_mapping {
LIST_ENTRY(bio_mapping) bm_link;
- struct device *bm_dev;
- int (*bm_ioctl)(struct device *, u_long, void *);
+ device_t bm_dev;
+ int (*bm_ioctl)(device_t, u_long, void *);
};
static LIST_HEAD(, bio_mapping) bios = LIST_HEAD_INITIALIZER(bios);
@@ -222,7 +222,7 @@
}
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;
@@ -241,7 +241,7 @@
}
void
-bio_unregister(struct device *dev)
+bio_unregister(device_t dev)
{
struct bio_mapping *bm, *next;
Index: src/sys/dev/biovar.h
diff -u src/sys/dev/biovar.h:1.7 src/sys/dev/biovar.h:1.8
--- src/sys/dev/biovar.h:1.7 Mon Mar 3 13:43:19 2008
+++ src/sys/dev/biovar.h Thu May 7 12:15:33 2009
@@ -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 $ */
/*
@@ -37,6 +37,7 @@
#define _DEV_BIOVAR_H_
#include <sys/types.h>
+#include <sys/device.h>
#ifndef _KERNEL
#include <stdbool.h>
@@ -54,8 +55,8 @@
};
#ifdef _KERNEL
-int bio_register(struct device *, int (*)(struct device *, u_long, void *));
-void bio_unregister(struct device *);
+int bio_register(device_t, int (*)(device_t, u_long, void *));
+void bio_unregister(device_t);
#endif
#define BIOCINQ _IOWR('B', 32, struct bioc_inq)
