Module Name: src
Committed By: cegger
Date: Tue May 12 14:16:53 UTC 2009
Modified Files:
src/sys/dev/ata: ata_raidvar.h atavar.h ld_ataraid.c wd.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ata/ata_raidvar.h
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ata/ld_ataraid.c
cvs rdiff -u -r1.372 -r1.373 src/sys/dev/ata/wd.c
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/ata/ata_raidvar.h
diff -u src/sys/dev/ata/ata_raidvar.h:1.10 src/sys/dev/ata/ata_raidvar.h:1.11
--- src/sys/dev/ata/ata_raidvar.h:1.10 Tue Sep 16 11:45:30 2008
+++ src/sys/dev/ata/ata_raidvar.h Tue May 12 14:16:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raidvar.h,v 1.10 2008/09/16 11:45:30 tron Exp $ */
+/* $NetBSD: ata_raidvar.h,v 1.11 2009/05/12 14:16:53 cegger Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
#define ATA_RAID_MAX_DISKS 8
struct ataraid_disk_info {
- struct device *adi_dev; /* disk's device */
+ device_t adi_dev; /* disk's device */
int adi_status; /* disk's status */
u_int adi_sectors;
u_int adi_compsize; /* in sectors */
@@ -79,7 +79,7 @@
struct ataraid_array_info {
TAILQ_ENTRY(ataraid_array_info) aai_list;
- struct device *aai_ld; /* associated logical disk */
+ device_t aai_ld; /* associated logical disk */
u_int aai_type; /* array type */
u_int aai_arrayno; /* array number */
@@ -119,7 +119,7 @@
typedef TAILQ_HEAD(, ataraid_array_info) ataraid_array_info_list_t;
extern ataraid_array_info_list_t ataraid_array_info_list;
-void ata_raid_check_component(struct device *);
+void ata_raid_check_component(device_t);
const char *ata_raid_type_name(u_int);
struct ataraid_array_info *ata_raid_get_array_info(u_int, u_int);
Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.78 src/sys/dev/ata/atavar.h:1.79
--- src/sys/dev/ata/atavar.h:1.78 Sun Nov 16 19:31:21 2008
+++ src/sys/dev/ata/atavar.h Tue May 12 14:16:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.78 2008/11/16 19:31:21 bouyer Exp $ */
+/* $NetBSD: atavar.h,v 1.79 2009/05/12 14:16:53 cegger Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -352,14 +352,14 @@
int ch_ndrive;
struct ata_drive_datas ch_drive[ATA_MAXDRIVES];
- struct device *atabus; /* self */
+ device_t atabus; /* self */
/* ATAPI children */
- struct device *atapibus;
+ device_t atapibus;
struct scsipi_channel ch_atapi_channel;
/* ATA children */
- struct device *ata_drives[ATA_MAXDRIVES];
+ device_t ata_drives[ATA_MAXDRIVES];
/*
* Channel queues. May be the same for all channels, if hw
Index: src/sys/dev/ata/ld_ataraid.c
diff -u src/sys/dev/ata/ld_ataraid.c:1.34 src/sys/dev/ata/ld_ataraid.c:1.35
--- src/sys/dev/ata/ld_ataraid.c:1.34 Tue May 12 12:10:29 2009
+++ src/sys/dev/ata/ld_ataraid.c Tue May 12 14:16:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_ataraid.c,v 1.34 2009/05/12 12:10:29 cegger Exp $ */
+/* $NetBSD: ld_ataraid.c,v 1.35 2009/05/12 14:16:53 cegger Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.34 2009/05/12 12:10:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.35 2009/05/12 14:16:53 cegger Exp $");
#include "bio.h"
#include "rnd.h"
@@ -92,8 +92,8 @@
void (*sc_iodone)(struct buf *);
};
-static int ld_ataraid_match(struct device *, cfdata_t, void *);
-static void ld_ataraid_attach(struct device *, struct device *, void *);
+static int ld_ataraid_match(device_t, cfdata_t, void *);
+static void ld_ataraid_attach(device_t, device_t, void *);
static int ld_ataraid_dump(struct ld_softc *, void *, int, int);
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.372 src/sys/dev/ata/wd.c:1.373
--- src/sys/dev/ata/wd.c:1.372 Tue May 12 12:10:29 2009
+++ src/sys/dev/ata/wd.c Tue May 12 14:16:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.372 2009/05/12 12:10:29 cegger Exp $ */
+/* $NetBSD: wd.c,v 1.373 2009/05/12 14:16:53 cegger Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.372 2009/05/12 12:10:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.373 2009/05/12 14:16:53 cegger Exp $");
#include "opt_ata.h"
@@ -126,10 +126,10 @@
#define ATADEBUG_PRINT(args, level)
#endif
-int wdprobe(struct device *, cfdata_t, void *);
-void wdattach(struct device *, struct device *, void *);
-int wddetach(struct device *, int);
-int wdactivate(struct device *, enum devact);
+int wdprobe(device_t, cfdata_t, void *);
+void wdattach(device_t, device_t, void *);
+int wddetach(device_t, int);
+int wdactivate(device_t, enum devact);
int wdprint(void *, char *);
void wdperror(const struct wd_softc *);
@@ -274,7 +274,7 @@
}
int
-wdprobe(struct device *parent, cfdata_t match, void *aux)
+wdprobe(device_t parent, cfdata_t match, void *aux)
{
struct ata_device *adev = aux;
@@ -290,7 +290,7 @@
}
void
-wdattach(struct device *parent, struct device *self, void *aux)
+wdattach(device_t parent, device_t self, void *aux)
{
struct wd_softc *wd = device_private(self);
struct ata_device *adev= aux;
@@ -434,7 +434,7 @@
}
int
-wdactivate(struct device *self, enum devact act)
+wdactivate(device_t self, enum devact act)
{
int rv = 0;
@@ -453,7 +453,7 @@
}
int
-wddetach(struct device *self, int flags)
+wddetach(device_t self, int flags)
{
struct wd_softc *sc = device_private(self);
int s, bmaj, cmaj, i, mn;
