Re-synchronise the alpha major numbers list with the i386 list.

Add the Mylex DAC960 and AMI MegaRAID numbers.

3 files changed, 62 insertions, 5 deletions

diff --git a/sys/alpha/conf/majors.alpha b/sys/alpha/conf/majors.alpha
index c8c105f..5de1fcc 100644
--- a/sys/alpha/conf/majors.alpha
+++ b/sys/alpha/conf/majors.alpha
@@ -40,6 +40,18 @@ blkdev	name		comments
 24	was:wstb	ATAPI tape client of "ata"
 25	vinum		RAID fs
 26	sw		VM internal swap device
+27	mlxd		Mylex DAC960 RAID (disk device)
+28	fla		M-Systems DiskOnChip(r)
+29	ida		Intelligent Disk [Array] (md@doc.ic.ac.uk)
+30	ad		ATA disks
+31	acd		ATAPI CDROM
+32	afd		ATAPI floppy
+33	was:ast		ATAPI tape
+34	i2o		Intelligent I/O Block Device
+35	amrd		AMI MegaRAID
+100	??		entries from 100-127 are reserved for local use
+127	??		entries from 100-127 are reserved for local use
+
 chrdev	name		comments
 0	cn		console
 1	ctty		/dev/tty
@@ -136,11 +148,44 @@ chrdev	name		comments
 92      bktr            Bt848 video capture driver (hasty@star-gate.com)
 93	coda		CODA filesystem.
 94	loran		Loran-C Receiver
-95	was:gd		Geometry disk
+95	md		Memory Disk
 96	altq		alternate queueing (including cbq, red, wfq)
 97	prom		Alpha PROM console
 98	zsc		TurboLaser console uart
 99	ipr		Iprobe on-chip perf. counters (gallatin@freebsd.org)
+100	xrpu		Xilinx Reprogrammable Processing Unit
+101	dgm		Digiboard PC/Xem
+102	fla		M-Systems DiskOnChip(r)
+103	streams		SVR4 Streams emulation <newton@atdot.dotat.org>
+104	xpt		CAM Transport Layer Services
+105	iic		I2C bus generic i/o
+106	smb		System Management Bus generic i/o
+107	3dfx		3Dfx driver (shocking@prth.pgs.com)
+108	usb		Universal Serial Bus (hibma@skylink.it)
+109	ida		Intelligent Disk [Array] (md@doc.ic.ac.uk)
 110	ses		SCSI Environmental Services driver (mjacob@feral.com)
+111	ums		USB Mouse (hibma@skylink.it)
 112	kbd		keyboard
+113	ulpt		USB Printer (hibma@skylink.it)
+114	ugen		USB Generic device (hibma@skylink.it)
+115	dag		University of Waikato DAG network capture boards
+116	ad		ATA disks
+117	acd		ATAPI CDROM
+118	afd		ATAPI floppy
+119	ast		ATAPI tape
+120	aud		Audit Device <robert+freebsd@cyrus.watson.org>
+121	onew		Dallas Semiconductor One-Wire bus <phk@freebsd.org>
+122	uhid		USB HID devices <hibma@skylink.it>
 123	fb		frame buffer
+124	ucdc		USB Communication Class Driver <hibma@skylink.it>
+125	digio		Advantech PCI-1750 IO card jen@vulture.dmem.strath.ac.uk
+126	sync		Generic sync port support <phk>, <brian>
+127	fire		Firewire driver <ikob@koganei.wide.ad.jp>
+128	arla		Arla (AFS-clone) driver
+129	i2o		Intelligent I/O Character Device
+130	mlx		Mylex DAC960 RAID (control device)
+131	mlxd		Mylex DAC960 RAID (disk device)
+132	amr		AMI MegaRAID (control device)
+133	amrd		AMI MegaRAID (disk device)
+200	??		entries from 200-255 are reserved for local use
+255	??		entries from 200-255 are reserved for local use
diff --git a/sys/conf/majors b/sys/conf/majors
index 1e3e415..620ff0e 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -36,10 +36,11 @@ blkdev	name		comments
 20	??		ATA disks
 21	ccd		concatenated disk
 22	md		Memory Disk
+23	worm		SCSI "worm type"
 24	was:wstb	ATAPI tape client of "wd"
 25	vinum		Volume manager
 26	sw		VM internal swap device
-27	myx		Mylex RAID (ulf@alameda.net)
+27	mlxd		Mylex DAC960 RAID (disk device)
 28	fla		M-Systems DiskOnChip(r)
 29	ida		Intelligent Disk [Array] (md@doc.ic.ac.uk)
 30	ad		ATA disks
@@ -47,6 +48,7 @@ blkdev	name		comments
 32	afd		ATAPI floppy
 33	was:ast		ATAPI tape
 34	i2o		Intelligent I/O Block Device
+35	amrd		AMI MegaRAID
 100	??		entries from 100-127 are reserved for local use
 127	??		entries from 100-127 are reserved for local use
 
@@ -147,7 +149,7 @@ chrdev	name		comments
 94	loran		Loran-C Receiver
 95	md		Memory Disk
 96	altq		alternate queueing (including cbq, red, wfq)
-97	myx		Mylex RAID controller (ulf@alameda.net)
+97	??		(is prom on alpha)
 98	loe		Loopback pseudo-ethernet (sbabkin@dcn.att.com)
 99	ct		Cronyx/Tau serial adaptor
 100	xrpu		Xilinx Reprogrammable Processing Unit
@@ -180,5 +182,9 @@ chrdev	name		comments
 127	fire		Firewire driver <ikob@koganei.wide.ad.jp>
 128	arla		Arla (AFS-clone) driver
 129	i2o		Intelligent I/O Character Device
+130	mlx		Mylex DAC960 RAID (control device)
+131	mlxd		Mylex DAC960 RAID (disk device)
+132	amr		AMI MegaRAID (control device)
+133	amrd		AMI MegaRAID (disk device)
 200	??		entries from 200-255 are reserved for local use
 255	??		entries from 200-255 are reserved for local use
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index 1e3e415..620ff0e 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -36,10 +36,11 @@ blkdev	name		comments
 20	??		ATA disks
 21	ccd		concatenated disk
 22	md		Memory Disk
+23	worm		SCSI "worm type"
 24	was:wstb	ATAPI tape client of "wd"
 25	vinum		Volume manager
 26	sw		VM internal swap device
-27	myx		Mylex RAID (ulf@alameda.net)
+27	mlxd		Mylex DAC960 RAID (disk device)
 28	fla		M-Systems DiskOnChip(r)
 29	ida		Intelligent Disk [Array] (md@doc.ic.ac.uk)
 30	ad		ATA disks
@@ -47,6 +48,7 @@ blkdev	name		comments
 32	afd		ATAPI floppy
 33	was:ast		ATAPI tape
 34	i2o		Intelligent I/O Block Device
+35	amrd		AMI MegaRAID
 100	??		entries from 100-127 are reserved for local use
 127	??		entries from 100-127 are reserved for local use
 
@@ -147,7 +149,7 @@ chrdev	name		comments
 94	loran		Loran-C Receiver
 95	md		Memory Disk
 96	altq		alternate queueing (including cbq, red, wfq)
-97	myx		Mylex RAID controller (ulf@alameda.net)
+97	??		(is prom on alpha)
 98	loe		Loopback pseudo-ethernet (sbabkin@dcn.att.com)
 99	ct		Cronyx/Tau serial adaptor
 100	xrpu		Xilinx Reprogrammable Processing Unit
@@ -180,5 +182,9 @@ chrdev	name		comments
 127	fire		Firewire driver <ikob@koganei.wide.ad.jp>
 128	arla		Arla (AFS-clone) driver
 129	i2o		Intelligent I/O Character Device
+130	mlx		Mylex DAC960 RAID (control device)
+131	mlxd		Mylex DAC960 RAID (disk device)
+132	amr		AMI MegaRAID (control device)
+133	amrd		AMI MegaRAID (disk device)
 200	??		entries from 200-255 are reserved for local use
 255	??		entries from 200-255 are reserved for local use