summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2003-06-07 08:18:25 +0000
committernyan <nyan@FreeBSD.org>2003-06-07 08:18:25 +0000
commit090ea661b3eaa5c87adc276850a9954ef05438ad (patch)
tree2742a9b0fe9de80af4fc3c446bee97501129297e
parent9b92f918c2cbfdfed033104c02bb235868ad82d5 (diff)
downloadFreeBSD-src-090ea661b3eaa5c87adc276850a9954ef05438ad.zip
FreeBSD-src-090ea661b3eaa5c87adc276850a9954ef05438ad.tar.gz
Fixed compile error.
-rw-r--r--sys/pc98/pc98/wd.c1
-rw-r--r--sys/pc98/pc98/wd_cd.c7
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 07758fc..04bf0c3 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -66,6 +66,7 @@
#include <sys/conf.h>
#include <sys/bus.h>
#include <sys/disk.h>
+#include <geom/geom_disk.h>
#include <sys/bio.h>
#include <sys/malloc.h>
#include <machine/bootinfo.h>
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 439ddd2..ff504a8 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998, 1999 Sen Schmidt
+ * Copyright (c) 1998, 1999 Sen Schmidt
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,6 @@ static int acdnlun = 0; /* Number of configured drives */
int acdattach(struct atapi *, int, struct atapi_params *, int);
static struct acd *acd_init_lun(struct atapi *, int, struct atapi_params *, int);
-struct devstat *);
static void acd_start(struct acd *);
static void acd_done(struct acd *, struct bio *, int, struct atapires);
static int acd_read_toc(struct acd *);
@@ -141,7 +140,7 @@ acdattach(struct atapi *ata, int unit, struct atapi_params *ap, int debug)
printf("wcd: configuration error, ATAPI code not present!\n");
return 0;
}
- if ((cdp = acd_init_lun(ata, unit, ap, acdnlun, NULL)) == NULL) {
+ if ((cdp = acd_init_lun(ata, unit, ap, acdnlun)) == NULL) {
printf("wcd: out of memory\n");
return 0;
}
@@ -497,7 +496,7 @@ acd_start(struct acd *cdp)
count = bp->bio_bcount;
}
- devstat_start_transaction(cdp->device_stats);
+ devstat_start_transaction_bio(cdp->device_stats, bp);
atapi_request_callback(cdp->ata, cdp->unit, cmd, 0,
lba>>24, lba>>16, lba>>8, lba, 0,
OpenPOWER on IntegriCloud