 @@ -1,37 +1,37 @@
-/*	$NetBSD: arcmsr.c,v 1.21 2008/06/24 10:14:41 gmcgarry Exp $ */
+/*	$NetBSD: arcmsr.c,v 1.22 2008/09/23 22:22:41 christos Exp $ */
 /*	$OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
 /*
  * Copyright (c) 2007, 2008 Juan Romero Pardines <xtraeme@netbsd.org>
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "bio.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.21 2008/06/24 10:14:41 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.22 2008/09/23 22:22:41 christos Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/rwlock.h>
 #if NBIO > 0
 @@ -1188,28 +1188,27 @@ arc_bio_inq(struct arc_softc *sc, struct
 		sc->sc_maxraidset = sysinfo->max_raid_set;
 		sc->sc_maxvolset = sysinfo->max_volume_set;
 		sc->sc_cchans = sysinfo->ide_channels;
+	}
 	request[0] = ARC_FW_RAIDINFO;
 	for (i = 0; i < sc->sc_maxraidset; i++) {
 		request[1] = i;
 		error = arc_msgbuf(sc, request, sizeof(request), raidinfo,
 		    sizeof(struct arc_fw_raidinfo));
 		if (error != 0)
 			goto out;
-		if (raidinfo->volumes)
+		nvols += raidinfo->volumes;
 			nvols++;
+	}
 	strlcpy(bi->bi_dev, device_xname(sc->sc_dev), sizeof(bi->bi_dev));
 	bi->bi_novol = nvols;
 	bi->bi_nodisk = sc->sc_cchans;
 out:
 	if (sysinfo)
 		kmem_free(sysinfo, sizeof(*sysinfo));
 	kmem_free(raidinfo, sizeof(*raidinfo));
 	return error;
+}
 @@ -1368,32 +1367,37 @@ out:
 	kmem_free(diskinfo, sizeof(*diskinfo));
 	return error;
+}
 static void
 arc_bio_disk_filldata(struct arc_softc *sc, struct bioc_disk *bd,
 		     struct arc_fw_diskinfo *diskinfo, int diskid)
+{
 	uint64_t		blocks;
 	char			model[81];
 	char			serial[41];
 	char			rev[17];
 	/* Ignore bit zero for now, we don't know what it means */
 	diskinfo->device_state &= ~0x1;
 	switch (diskinfo->device_state) {
 	case ARC_FW_DISK_FAILED:
 		bd->bd_status = BIOC_SDFAILED;
 		break;
 	case ARC_FW_DISK_PASSTHRU:
 		bd->bd_status = BIOC_SDPASSTHRU;
 		break;
-	case ARC_FW_DISK_INITIALIZED:
+	case ARC_FW_DISK_NORMAL:
 	case ARC_FW_DISK_RAIDMEMBER:
 		bd->bd_status = BIOC_SDONLINE;
 		break;
 	case ARC_FW_DISK_HOTSPARE:
 		bd->bd_status = BIOC_SDHOTSPARE;
 		break;
 	case ARC_FW_DISK_UNUSED:
 		bd->bd_status = BIOC_SDUNUSED;
 		break;
 	case 0:
 		/* disk has been disconnected */
 		bd->bd_status = BIOC_SDOFFLINE;
 		bd->bd_channel = 1;
 		bd->bd_target = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: arcmsrvar.h,v 1.12 2008/04/03 13:59:01 xtraeme Exp $ */
+/*	$NetBSD: arcmsrvar.h,v 1.13 2008/09/23 22:22:41 christos Exp $ */
 /*	Derived from $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
 /*
  * Copyright (c) 2007 Juan Romero Pardines <xtraeme@netbsd.org>
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 @@ -337,31 +337,31 @@ struct arc_fw_volinfo {
 	uint8_t		new_member_disks;
 	uint8_t		new_raid_level;
 	uint8_t		raid_set_number;
 	uint8_t		reserved[5];
 } __packed;
 struct arc_fw_diskinfo {
 	uint8_t		model[40];
 	uint8_t		serial[20];
 	uint8_t		firmware_rev[8];
 	uint32_t	capacity;
 	uint32_t	capacity2;
 	uint8_t		device_state;
-#define ARC_FW_DISK_INITIALIZED	0x88	/* disk has been initialized */
+#define ARC_FW_DISK_NORMAL	0x88	/* disk attached/initialized */
-#define ARC_FW_DISK_RAIDMEMBER	0x89	/* disk is member of a raid set */
+#define ARC_FW_DISK_PASSTHRU	0x8a	/* pass through disk in normal state */
-#define ARC_FW_DISK_PASSTHRU	0x8b	/* pass through disk */
+#define ARC_FW_DISK_HOTSPARE	0xa8	/* hotspare disk in normal state */
-#define ARC_FW_DISK_HOTSPARE	0xa9	/* hotspare disk */
+#define ARC_FW_DISK_UNUSED	0xc8	/* free/unused disk in normal state */
-#define ARC_FW_DISK_UNUSED	0xc9	/* free/unused disk */
+#define ARC_FW_DISK_FAILED	0x10	/* disk in failed state */
 	uint8_t		pio_mode;
 	uint8_t		current_udma_mode;
 	uint8_t		udma_mode;
 	uint8_t		drive_select;
 	uint8_t		raid_number;	/* 0xff unowned */
 	struct arc_fw_scsiattr	scsi_attr;
 	uint8_t		reserved[40];
 } __packed;
 struct arc_fw_sysinfo {
 	uint8_t		vendor_name[40];
 	uint8_t		serial_number[16];
 	uint8_t		firmware_version[16];