2011-05-30 Pedro Alves <pedro@codesourcery.com>

	gdb/
	* target.h (enum inferior_event_type): Delete INF_QUIT_REQ.
	* inf-loop.h (inferior_event_handler_wrapper): Delete.
	* inf-loop.c (inferior_event_handler_wrapper): Delete.
	(inferior_event_handler): Don't handle INF_QUIT_REQ.
	* remote.c (_initialize_remote): Register
	async_remote_interrupt_twice directly as
	sigint_remote_twice_token event.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a7c89d0183cc27f1bc3dc4ccc57797b414fb731..5a80e276baef339a12a73876feb118b9d180409b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-30  Pedro Alves  <pedro@codesourcery.com>
+
+       * target.h (enum inferior_event_type): Delete INF_QUIT_REQ.
+       * inf-loop.h (inferior_event_handler_wrapper): Delete.
+       * inf-loop.c (inferior_event_handler_wrapper): Delete.
+       (inferior_event_handler): Don't handle INF_QUIT_REQ.
+       * remote.c (_initialize_remote): Register
+       async_remote_interrupt_twice directly as
+       sigint_remote_twice_token event.
+
 2011-05-30  Pedro Alves  <pedro@codesourcery.com>
 
        * target.h (enum inferior_event_type): Delete INF_ERROR.

diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index 8e19eef299565d43436077fca206ec7c28801718..f86b806f37c96567ec9dfbdeec4092675e01b804 100644 (file)
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -32,12 +32,6 @@
 
 static int fetch_inferior_event_wrapper (gdb_client_data client_data);
 
-void
-inferior_event_handler_wrapper (gdb_client_data client_data)
-{
-  inferior_event_handler (INF_QUIT_REQ, client_data);
-}
-
 /* General function to handle events in the inferior.  So far it just
    takes care of detecting errors reported by select() or poll(),
    otherwise it assumes that all is OK, and goes on reading data from
@@ -143,13 +137,6 @@ inferior_event_handler (enum inferior_event_type event_type,
        do_all_intermediate_continuations (0);
       break;
 
-    case INF_QUIT_REQ: 
-      /* FIXME: ezannoni 1999-10-04.  This call should really be a
-        target vector entry, so that it can be used for any kind of
-        targets.  */
-      async_remote_interrupt_twice (NULL);
-      break;
-
     case INF_TIMER:
     default:
       printf_unfiltered (_("Event type not recognized.\n"));

diff --git a/gdb/inf-loop.h b/gdb/inf-loop.h
index 76cc88b49ff190beb2cea224481eef77d30ac82a..c82499f047662a84076e3760ff1cab93fb71a5ac 100644 (file)
--- a/gdb/inf-loop.h
+++ b/gdb/inf-loop.h
@@ -23,6 +23,5 @@
 
 extern void inferior_event_handler (enum inferior_event_type event_type, 
                                    void* client_data);
-extern void inferior_event_handler_wrapper (void *client_data);
 
 #endif /* #ifndef INF_LOOP_H */

diff --git a/gdb/remote.c b/gdb/remote.c
index ff64b042241815ffab3ced183ab09eca869f247b..2c850cbe8a1bba41bf44950aab74113aaa82e21a 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10627,7 +10627,7 @@ _initialize_remote (void)
   sigint_remote_token =
     create_async_signal_handler (async_remote_interrupt, NULL);
   sigint_remote_twice_token =
-    create_async_signal_handler (inferior_event_handler_wrapper, NULL);
+    create_async_signal_handler (async_remote_interrupt_twice, NULL);
 
 #if 0
   init_remote_threadtests ();

diff --git a/gdb/target.h b/gdb/target.h
index 1c7fcd29e670d083f1a85e2f208e7cb2367d8f4b..0f41160c242a3a7c0c60ba16657139ae36d6175d 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -201,8 +201,6 @@ extern char *target_waitstatus_to_string (const struct target_waitstatus *);
    deal with.  */
 enum inferior_event_type
   {
-    /* There is a request to quit the inferior, abandon it.  */
-    INF_QUIT_REQ,
     /* Process a normal inferior event which will result in target_wait
        being called.  */
     INF_REG_EVENT,