summaryrefslogtreecommitdiff
path: root/sys/dev/amr/amr_disk.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-09-20 19:36:05 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-09-20 19:36:05 +0000
commit7812d86f03dbed973e20eee5da963ae5efc666c4 (patch)
tree47b5afae3623c1371d19a0478c850d8e6a08d07b /sys/dev/amr/amr_disk.c
parent5741a42f2f25ab4f5bff0b8f213cbb93aae1b5ac (diff)
Notes
Diffstat (limited to 'sys/dev/amr/amr_disk.c')
-rw-r--r--sys/dev/amr/amr_disk.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 38784d37218b..e486e874f015 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -103,7 +103,6 @@ static int
amrd_open(dev_t dev, int flags, int fmt, struct thread *td)
{
struct amrd_softc *sc = (struct amrd_softc *)dev->si_drv1;
- struct disklabel *label;
debug_called(1);
@@ -114,15 +113,10 @@ amrd_open(dev_t dev, int flags, int fmt, struct thread *td)
if (sc->amrd_controller->amr_state & AMR_STATE_SHUTDOWN)
return(ENXIO);
- label = &sc->amrd_disk.d_label;
- bzero(label, sizeof(*label));
- label->d_type = DTYPE_SCSI;
- label->d_secsize = AMR_BLKSIZE;
- label->d_nsectors = sc->amrd_drive->al_sectors;
- label->d_ntracks = sc->amrd_drive->al_heads;
- label->d_ncylinders = sc->amrd_drive->al_cylinders;
- label->d_secpercyl = sc->amrd_drive->al_sectors * sc->amrd_drive->al_heads;
- label->d_secperunit = sc->amrd_drive->al_size;
+ sc->amrd_disk.d_sectorsize = AMR_BLKSIZE;
+ sc->amrd_disk.d_mediasize = (off_t)sc->amrd_drive->al_size * AMR_BLKSIZE;
+ sc->amrd_disk.d_fwsectors = sc->amrd_drive->al_sectors;
+ sc->amrd_disk.d_fwheads = sc->amrd_drive->al_heads;
sc->amrd_flags |= AMRD_OPEN;
return (0);