From 0802cc4008d88503871f386dec0745bd199087e0 Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Thu, 27 Jul 2000 11:34:30 +0000
Subject: [PATCH] 2000-06-25  Stephane Carrez  <Stephane.Carrez@worldnet.fr>

        * sim-hw.c: Use <errno.h> instead of <sys/errno.h>
        (OPTION_HW_LIST): New option --hw-list to list the devices.
        (hw_option_handler): List the device tree with 'sim_hw_print'.
---
 sim/common/ChangeLog |  5 +++++
 sim/common/sim-hw.c  | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 3cc07321f3f..1a120660587 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,10 @@
 Thu Jul 27 20:37:47 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
+	From 2000-06-25 Stephane Carrez <Stephane.Carrez@worldnet.fr>:
+	* sim-hw.c: Use <errno.h> instead of <sys/errno.h>
+	(OPTION_HW_LIST): New option --hw-list to list the devices.
+	(hw_option_handler): List the device tree with 'sim_hw_print'.
+
 	From 2000-06-25 Stephane Carrez <Stephane.Carrez@worldnet.fr>:
 	* sim-bits.h (_MSB_16, _LSB_16): Define for 16-bit targets.
 	(MASK, LSBIT, MSBIT): Likewise and use _MSB_16 and _LSB_16.
diff --git a/sim/common/sim-hw.c b/sim/common/sim-hw.c
index f438462a9ba..922b8ec44af 100644
--- a/sim/common/sim-hw.c
+++ b/sim/common/sim-hw.c
@@ -41,7 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <stdlib.h>
 #endif
 #include <ctype.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 
 struct sim_hw {
@@ -101,6 +101,7 @@ enum {
   OPTION_HW_INFO = OPTION_START,
   OPTION_HW_TRACE,
   OPTION_HW_DEVICE,
+  OPTION_HW_LIST,
   OPTION_HW_FILE,
 };
 
@@ -126,6 +127,10 @@ static const OPTION hw_options[] =
       '\0', "DEVICE", "Add the specified device",
       hw_option_handler },
 
+  { {"hw-list", no_argument, NULL, OPTION_HW_LIST },
+      '\0', NULL, "List the device tree",
+      hw_option_handler },
+
   { {"hw-file", required_argument, NULL, OPTION_HW_FILE },
       '\0', "FILE", "Add the devices listed in the file",
       hw_option_handler },
@@ -257,6 +262,12 @@ hw_option_handler (struct sim_state *sd, sim_cpu *cpu, int opt,
 	return SIM_RC_OK;
       }
 
+    case OPTION_HW_LIST:
+      {
+	sim_hw_print (sd, sim_io_vprintf);
+	return SIM_RC_OK;
+      }
+  
     case OPTION_HW_FILE:
       {
 	return merge_device_file (sd, arg);
-- 
2.30.2