gwj / at91sam9263 · Commits

Commit bf4f74c0f6777ba728d4b4e02981e226eb177d62

Authored by aurel32
1 parent 6c01bf6c

Fix warnings introduced by commit 6081 

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6084 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 6 additions and 3 deletions
hw/hpet.c
  View file @bf4f74c
@@ -26,13 +26,11 @@ @@ -26,13 +26,11 @@
26 */ 26 */
27 27
28 #include "hw.h" 28 #include "hw.h"
  29 +#include "pc.h"
29 #include "console.h" 30 #include "console.h"
30 #include "qemu-timer.h" 31 #include "qemu-timer.h"
31 #include "hpet_emul.h" 32 #include "hpet_emul.h"
32 33
33 -extern void hpet_pit_disable(void);  
34 -extern void hpet_pit_enable(void);  
35 -  
36 //#define HPET_DEBUG 34 //#define HPET_DEBUG
37 #ifdef HPET_DEBUG 35 #ifdef HPET_DEBUG
38 #define dprintf printf 36 #define dprintf printf
@@ -60,6 +60,9 @@ int pit_get_initial_count(PITState *pit, int channel); @@ -60,6 +60,9 @@ int pit_get_initial_count(PITState *pit, int channel);
60 int pit_get_mode(PITState *pit, int channel); 60 int pit_get_mode(PITState *pit, int channel);
61 int pit_get_out(PITState *pit, int channel, int64_t current_time); 61 int pit_get_out(PITState *pit, int channel, int64_t current_time);
62 62
  63 +void hpet_pit_disable(void);
  64 +void hpet_pit_enable(void);
  65 +
63 /* vmport.c */ 66 /* vmport.c */
64 void vmport_init(void); 67 void vmport_init(void);
65 void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque); 68 void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque);
monitor.c
  View file @bf4f74c
@@ -252,10 +252,12 @@ static void do_info_name(void) @@ -252,10 +252,12 @@ static void do_info_name(void)
252 term_printf("%s\n", qemu_name); 252 term_printf("%s\n", qemu_name);
253 } 253 }
254 254
  255 +#if defined(TARGET_I386)
255 static void do_info_hpet(void) 256 static void do_info_hpet(void)
256 { 257 {
257 term_printf("HPET is %s by QEMU\n", (no_hpet) ? "disabled" : "enabled"); 258 term_printf("HPET is %s by QEMU\n", (no_hpet) ? "disabled" : "enabled");
258 } 259 }
  260 +#endif
259 261
260 static void do_info_uuid(void) 262 static void do_info_uuid(void)
261 { 263 {