PERFORCE change 73533 for review

[Juli Mallett]

http://perforce.freebsd.org/chv.cgi?CH=73533

Change 73533 by jmallett at jmallett_windward on 2005/03/19 19:54:56

	Don't attach failed components.
	(XXX Should hack GXemul to have a few failed components.)

Affected files ...

.. //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#3 edit
.. //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#3 edit
.. //depot/projects/mips/sys/dev/arcs/arcs_system.c#4 edit

Differences ...

==== //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#2 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#3 $
  */
 
 #include <sys/param.h>
@@ -71,6 +71,8 @@
 	component = device_get_softc(dev);
 	if (component == NULL)
 		return (EINVAL);
+	if (component->Flags & ARCS_Component_Flags_Failed)
+		return (ENXIO);
 	device_set_desc(dev, arcs_component_identifier(component));
 	device_printf(dev, "version %d revision %d\n",
 		      component->Version, component->Revision);

==== //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#2 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#3 $
  */
 
 #include <sys/param.h>
@@ -71,6 +71,8 @@
 	component = device_get_softc(dev);
 	if (component == NULL)
 		return (EINVAL);
+	if (component->Flags & ARCS_Component_Flags_Failed)
+		return (ENXIO);
 	device_set_desc(dev, arcs_component_identifier(component));
 	device_printf(dev, "version %d revision %d\n",
 		      component->Version, component->Revision);

==== //depot/projects/mips/sys/dev/arcs/arcs_system.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#3 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#4 $
  */
 
 #include <sys/param.h>
@@ -81,6 +81,8 @@
 	component = device_get_softc(dev);
 	if (component == NULL)
 		return (EINVAL);
+	if (component->Flags & ARCS_Component_Flags_Failed)
+		return (ENXIO);
 	device_set_desc(dev, arcs_component_identifier(component));
 	device_printf(dev, "version %d revision %d\n",
 		      component->Version, component->Revision);