qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 18:00:16 +02:00
Code

Removed unused (and broken) TV-out feature.

Browse Source
This commit is contained in:
Paul Cercueil 2012-06-14 22:53:50 +02:00
parent bc2b5d51ed
commit 374371c1d2
2 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/gmenu2x.cpp
View File

@ -292,34 +292,6 @@ void GMenu2X::deinit() {
#endif #endif
} }
void GMenu2X::tvout_on(bool /*pal*/) {
#ifdef PLATFORM_GP2X
/* if (gp2x_mem!=0) {
// Ioctl_Dummy_t *msg;
// int TVHandle = ioctl(SDL_videofd, FBMMSP2CTRL, msg);
if (cx25874!=0) gp2x_tvout_off();
//if tv-out is enabled without cx25874 open, stop
//if (gp2x_memregs[0x2800>>1]&0x100) return;
cx25874 = open("/dev/cx25874",O_RDWR);
ioctl(cx25874, _IOW('v', 0x02, unsigned char), pal ? 4 : 3);
gp2x_memregs[0x2906>>1]=512;
gp2x_memregs[0x28E4>>1]=gp2x_memregs[0x290C>>1];
gp2x_memregs[0x28E8>>1]=239;
}*/
#endif
}
void GMenu2X::tvout_off() {
#ifdef PLATFORM_GP2X
/* if (gp2x_mem!=0) {
close(cx25874);
cx25874 = 0;
gp2x_memregs[0x2906>>1]=1024;
}*/
#endif
}
GMenu2X::GMenu2X() GMenu2X::GMenu2X()
{ {
#ifdef PLATFORM_GP2X #ifdef PLATFORM_GP2X
@ -378,20 +350,6 @@ GMenu2X::GMenu2X()
init(); init();
#ifdef PLATFORM_GP2X
cx25874 = 0;
//Fix tv-out
/* if (gp2x_mem!=0) {
if (gp2x_memregs[0x2800>>1]&0x100) {
gp2x_memregs[0x2906>>1]=512;
//gp2x_memregs[0x290C>>1]=640;
gp2x_memregs[0x28E4>>1]=gp2x_memregs[0x290C>>1];
}
gp2x_memregs[0x28E8>>1]=239;
}*/
#endif
#ifdef UNLOCK_VT #ifdef UNLOCK_VT
unlockVT(); unlockVT();
#endif #endif
@ -572,8 +530,7 @@ void GMenu2X::initMenu() {
#ifdef PLATFORM_GP2X #ifdef PLATFORM_GP2X
if (fwType=="open2x") if (fwType=="open2x")
menu->addActionLink(i,"Open2x",MakeDelegate(this,&GMenu2X::settingsOpen2x),tr["Configure Open2x system settings"],"skin:icons/o2xconfigure.png"); menu->addActionLink(i,"Open2x",MakeDelegate(this,&GMenu2X::settingsOpen2x),tr["Configure Open2x system settings"],"skin:icons/o2xconfigure.png");
/* menu->addActionLink(i,"TV",MakeDelegate(this,&GMenu2X::toggleTvOut),tr["Activate/deactivate tv-out"],"skin:icons/tv.png"); /* menu->addActionLink(i,"USB Sd",MakeDelegate(this,&GMenu2X::activateSdUsb),tr["Activate Usb on SD"],"skin:icons/usb.png");
menu->addActionLink(i,"USB Sd",MakeDelegate(this,&GMenu2X::activateSdUsb),tr["Activate Usb on SD"],"skin:icons/usb.png");
if (fwType=="gph" && !f200) if (fwType=="gph" && !f200)
menu->addActionLink(i,"USB Nand",MakeDelegate(this,&GMenu2X::activateNandUsb),tr["Activate Usb on Nand"],"skin:icons/usb.png"); menu->addActionLink(i,"USB Nand",MakeDelegate(this,&GMenu2X::activateNandUsb),tr["Activate Usb on Nand"],"skin:icons/usb.png");
//menu->addActionLink(i,"USB Root",MakeDelegate(this,&GMenu2X::activateRootUsb),tr["Activate Usb on the root of the Gp2x Filesystem"],"skin:icons/usb.png");*/ //menu->addActionLink(i,"USB Root",MakeDelegate(this,&GMenu2X::activateRootUsb),tr["Activate Usb on the root of the Gp2x Filesystem"],"skin:icons/usb.png");*/
@ -1342,15 +1299,6 @@ void GMenu2X::skinMenu() {
} }
} }
void GMenu2X::toggleTvOut() {
#ifdef PLATFORM_GP2X
/* if (cx25874!=0)
gp2x_tvout_off();
else
gp2x_tvout_on(confStr["tvoutEncoding"] == "PAL");*/
#endif
}
void GMenu2X::setSkin(const string &skin, bool setWallpaper) { void GMenu2X::setSkin(const string &skin, bool setWallpaper) {
confStr["skin"] = skin; confStr["skin"] = skin;

4
src/gmenu2x.h
View File

@ -125,15 +125,11 @@ private:
unsigned long gp2x_mem; unsigned long gp2x_mem;
unsigned short *gp2x_memregs; unsigned short *gp2x_memregs;
volatile unsigned short *MEM_REG; volatile unsigned short *MEM_REG;
int cx25874; //tv-out
#endif #endif
void tvout_on(bool pal);
void tvout_off();
void initCPULimits(); void initCPULimits();
void init(); void init();
void deinit(); void deinit();
void toggleTvOut();
void showManual(); void showManual();