PERFORCE change 219936 for review

[Robert Watson]

http://p4web.freebsd.org/@@219936?ac=10

Change 219936 by rwatson at rwatson_zenith_cl_cam_ac_uk on 2013/01/02 10:58:46

	Avoid collisions when numbering avgen devices; due to an existing
	collision, we weren't properly setting up /dev/de4bsw.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#16 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#7 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#16 (text+ko) ====

@@ -61,26 +61,26 @@
 hint.altera_avgen.0.devname="berirom"
 
 #
+# Expose the DE4 buttons and switches via an Avalon "generic" device.
+# 
+hint.altera_avgen.1.at="nexus0"
+hint.altera_avgen.1.maddr=0x7f009000
+hint.altera_avgen.1.msize=2
+hint.altera_avgen.1.width=1
+hint.altera_avgen.1.fileio="r"
+hint.altera_avgen.1.devname="de4bsw"
+
+#
 # Expose the DE4 flash via an Avalon "generic" device.
 # This is incompatible with the isf(4) driver.
 #
-#hint.altera_avgen.0.at="nexus0"
-#hint.altera_avgen.0.maddr=0x74000000
-#hint.altera_avgen.0.msize=0x4000000
-#hint.altera_avgen.0.width=2
-#hint.altera_avgen.0.fileio="rw"
-#hint.altera_avgen.0.mmapio="rwx"
-#hint.altera_avgen.0.devname="de4flash"
-
-#
-# Expose the DE4 buttons and switches via an Avalon "generic" device.
-# 
-hint.altera_avgen.0.at="nexus0"
-hint.altera_avgen.0.maddr=0x7f009000
-hint.altera_avgen.0.msize=2
-hint.altera_avgen.0.width=1
-hint.altera_avgen.0.fileio="r"
-hint.altera_avgen.0.devname="de4bsw"
+#hint.altera_avgen.2.at="nexus0"
+#hint.altera_avgen.2.maddr=0x74000000
+#hint.altera_avgen.2.msize=0x4000000
+#hint.altera_avgen.2.width=2
+#hint.altera_avgen.2.fileio="rw"
+#hint.altera_avgen.2.mmapio="rwx"
+#hint.altera_avgen.2.devname="de4flash"
 
 #
 # General Intel StrataFlash driver

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#7 (text+ko) ====

@@ -61,26 +61,26 @@
 hint.altera_avgen.0.devname="berirom"
 
 #
+# Expose the DE4 buttons and switches via an Avalon "generic" device.
+# 
+hint.altera_avgen.1.at="nexus0"
+hint.altera_avgen.1.maddr=0x7f009000
+hint.altera_avgen.1.msize=2
+hint.altera_avgen.1.width=1
+hint.altera_avgen.1.fileio="r"
+hint.altera_avgen.1.devname="de4bsw"
+
+#
 # Expose the DE4 flash via an Avalon "generic" device.
 # This is incompatible with the isf(4) driver.
 #
-#hint.altera_avgen.0.at="nexus0"
-#hint.altera_avgen.0.maddr=0x74000000
-#hint.altera_avgen.0.msize=0x4000000
-#hint.altera_avgen.0.width=2
-#hint.altera_avgen.0.fileio="rw"
-#hint.altera_avgen.0.mmapio="rwx"
-#hint.altera_avgen.0.devname="de4flash"
-
-#
-# Expose the DE4 buttons and switches via an Avalon "generic" device.
-# 
-hint.altera_avgen.0.at="nexus0"
-hint.altera_avgen.0.maddr=0x7f009000
-hint.altera_avgen.0.msize=2
-hint.altera_avgen.0.width=1
-hint.altera_avgen.0.fileio="r"
-hint.altera_avgen.0.devname="de4bsw"
+#hint.altera_avgen.2.at="nexus0"
+#hint.altera_avgen.2.maddr=0x74000000
+#hint.altera_avgen.2.msize=0x4000000
+#hint.altera_avgen.2.width=2
+#hint.altera_avgen.2.fileio="rw"
+#hint.altera_avgen.2.mmapio="rwx"
+#hint.altera_avgen.2.devname="de4flash"
 
 #
 # General Intel StrataFlash driver