Revamp the devstat priority system. All disks now have the same priority.

The same goes for CD drivers and tape drivers.  In systems with mixed IDE
and SCSI, devices in the same priority class will be sorted in attach
order.

Also, the 'CCD' priority is now the 'ARRAY' priority, and a number of
drivers have been modified to use that priority.

This includes the necessary changes to all drivers, except the ATA drivers.
Soren will modify those separately.

This does not include and does not require any change in the devstat
version number, since no known userland applications use the priority
enumerations.

Reviewed by:	msmith, sos, phk, jlemon, mjacob, bde

1 files changed, 3 insertions, 6 deletions

diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index 771dc06639f7..1e17d5117c62 100644
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -79,13 +79,10 @@ typedef enum {
 	DEVSTAT_PRIORITY_PASS	= 0x030,
 	DEVSTAT_PRIORITY_FD	= 0x040,
 	DEVSTAT_PRIORITY_WFD	= 0x050,
-	DEVSTAT_PRIORITY_SA	= 0x060,
-	DEVSTAT_PRIORITY_OCD	= 0x070,
-	DEVSTAT_PRIORITY_WCD	= 0x080,
+	DEVSTAT_PRIORITY_TAPE	= 0x060,
 	DEVSTAT_PRIORITY_CD	= 0x090,
-	DEVSTAT_PRIORITY_WD	= 0x100,
-	DEVSTAT_PRIORITY_DA	= 0x110,
-	DEVSTAT_PRIORITY_CCD	= 0x120,
+	DEVSTAT_PRIORITY_DISK	= 0x110,
+	DEVSTAT_PRIORITY_ARRAY	= 0x120,
 	DEVSTAT_PRIORITY_MAX	= 0xfff
 } devstat_priority;