(Xbox1/RMenu) Move Xbox init code to xdk/frontend/main.c

This commit is contained in:
twinaphex 2012-08-06 22:53:57 +02:00
parent 72b7ecaaff
commit 8dae2d2179
2 changed files with 18 additions and 11 deletions

View File

@ -71,7 +71,6 @@
#define MENU_ITEM_SELECTED(index) (menuitem_colors[index])
#ifdef _XBOX1
#include "../../xbox1/frontend/RetroLaunch/IoSupport.h"
#include "../../gfx/fonts/xdk1_xfonts.h"
#define ROM_PANEL_WIDTH 510
@ -2263,16 +2262,6 @@ void menu_init (void)
filebrowser_set_root(&tmpBrowser, default_paths.filesystem_root_dir);
#ifdef _XBOX1
// Set file cache size
XSetFileCacheSize(8 * 1024 * 1024);
// Mount drives
xbox_io_mount("A:", "cdrom0");
xbox_io_mount("E:", "Harddisk0\\Partition1");
xbox_io_mount("Z:", "Harddisk0\\Partition2");
xbox_io_mount("F:", "Harddisk0\\Partition6");
xbox_io_mount("G:", "Harddisk0\\Partition7");
// Backbuffer width
int width = device_ptr->d3dpp.BackBufferWidth;

View File

@ -25,6 +25,7 @@
#include "../../360/frontend-xdk/menu.h"
#include "../../xdk/menu_shared.h"
#elif defined(_XBOX1)
#include "../../xbox1/frontend/RetroLaunch/IoSupport.h"
#include "../../console/rmenu/rmenu.h"
#endif
@ -124,6 +125,21 @@ static void get_environment_settings (void)
#endif
}
static void system_init(void)
{
#ifdef _XBOX1
// Set file cache size
XSetFileCacheSize(8 * 1024 * 1024);
// Mount drives
xbox_io_mount("A:", "cdrom0");
xbox_io_mount("E:", "Harddisk0\\Partition1");
xbox_io_mount("Z:", "Harddisk0\\Partition2");
xbox_io_mount("F:", "Harddisk0\\Partition6");
xbox_io_mount("G:", "Harddisk0\\Partition7");
#endif
}
int main(int argc, char *argv[])
{
rarch_main_clear_state();
@ -160,6 +176,8 @@ int main(int argc, char *argv[])
video_null.start();
#endif
system_init();
menu_init();
begin_loop: