From 7cc70e5388e37be790393ff8a83646331b46a3aa Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 6 Jun 2008 19:26:10 +0000
Subject: [PATCH] Oops, missed some warnings. * mem.h
 (m32c_sim_restore_console): New.

---
 sim/m32c/ChangeLog | 1 +
 sim/m32c/gdb-if.c  | 3 +++
 sim/m32c/mem.c     | 2 +-
 sim/m32c/mem.h     | 2 ++
 sim/m32c/timer_a.h | 2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 121670d12e9..76cad22fb26 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -20,6 +20,7 @@
 	* main.c: Add Timer A support.  Support TCP-based console.
 	(setup_tcp_console): New.
 	(main): Add Timer A support.  Support TCP-based console.
+	* mem.h (m32c_sim_restore_console): New.
 	* mem.c: Add Timer A support.  Support TCP-based console.
 	(mem_ptr): Enhance NULL pointer detection.
 	(stdin_ready): New.
diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c
index a8ba3920cd4..04c5dbad057 100644
--- a/sim/m32c/gdb-if.c
+++ b/sim/m32c/gdb-if.c
@@ -35,6 +35,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "mem.h"
 #include "load.h"
 #include "syscalls.h"
+#ifdef TIMER_A
+#include "timer_a.h"
+#endif
 
 /* I don't want to wrap up all the minisim's data structures in an
    object and pass that around.  That'd be a big change, and neither
diff --git a/sim/m32c/mem.c b/sim/m32c/mem.c
index a277787e3c6..474fc5e75f9 100644
--- a/sim/m32c/mem.c
+++ b/sim/m32c/mem.c
@@ -374,7 +374,7 @@ mem_get_pc ()
 }
 
 static int console_raw = 0;
-static struct termios attr, oattr;
+static struct termios oattr;
 
 static int
 stdin_ready ()
diff --git a/sim/m32c/mem.h b/sim/m32c/mem.h
index c4354e442c3..ad53a01f595 100644
--- a/sim/m32c/mem.h
+++ b/sim/m32c/mem.h
@@ -39,3 +39,5 @@ unsigned long mem_get_si (int address);
 void mem_get_blk (int address, void *bufptr, int nbytes);
 
 int sign_ext (int v, int bits);
+
+void m32c_sim_restore_console ();
diff --git a/sim/m32c/timer_a.h b/sim/m32c/timer_a.h
index e1e7f216bf2..abf58833b08 100644
--- a/sim/m32c/timer_a.h
+++ b/sim/m32c/timer_a.h
@@ -10,3 +10,5 @@ typedef struct
 } Timer_A;
 
 extern Timer_A timer_a;
+
+extern void update_timer_a ();
-- 
2.30.2