Moved on_screen, f2_screen, f3_screen and handle_usb (renamed usb_screen) to a new file: screens.c.

typedef Menu replaced with a bool.
All code now calls usb_screen() for usb handling.
Nearly all code now deals with USB connect/disconnect properly.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2401 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 1 deletions

diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 7ad005838d..fa65130555 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -81,7 +81,8 @@ FIRMSRCS = lcd-recorder.c sprintf.c id3.c debug.c usb.c mpeg.c power.c\
   powermgmt.c font.c panic.c sysfont.c
 
 APPS = main.c tree.c menu.c credits.c main_menu.c language.c\
-        playlist.c showtext.c wps.c wps-display.c settings.c status.c icons.c
+        playlist.c showtext.c wps.c wps-display.c settings.c status.c icons.c\
+        screens.c
 
 MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c
 
@@ -237,6 +238,9 @@ $(OBJDIR)/settings.o: $(APPDIR)/settings.c
 $(OBJDIR)/status.o: $(APPDIR)/status.c
         $(CC) $(APPCFLAGS) -c $< -o $@
 
+$(OBJDIR)/screens.o: $(APPDIR)/screens.c
+        $(CC) $(APPCFLAGS) -c $< -o $@
+
 $(OBJDIR)/id3.o: $(FIRMWAREDIR)/id3.c
         $(CC) $(APPCFLAGS) -c $< -o $@