diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2011-03-03 16:09:07 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2011-03-03 16:09:07 +0100 |
| commit | d0380b44396cbcd497f42eb0047b58b309596007 (patch) | |
| tree | 151ef6eac784a3fb26b1090daa93cd84d330917c /lib | |
| parent | 4a3df90cd255278dc238f6bf15040f02e0fec8f3 (diff) | |
| parent | ebc557a0311087e573d497fb454e3a94d24cdbe0 (diff) | |
| download | enigma2-d0380b44396cbcd497f42eb0047b58b309596007.tar.gz enigma2-d0380b44396cbcd497f42eb0047b58b309596007.zip | |
Merge branch 'obi/master'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/driver/rcconsole.cpp | 2 | ||||
| -rw-r--r-- | lib/dvb/frontend.cpp | 6 | ||||
| -rw-r--r-- | lib/gdi/bcm.cpp | 4 | ||||
| -rw-r--r-- | lib/gdi/fb.cpp | 4 | ||||
| -rw-r--r-- | lib/gdi/fb.h | 4 | ||||
| -rwxr-xr-x | lib/python/Tools/Directories.py | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp index 97a6e7c7..77f43227 100644 --- a/lib/driver/rcconsole.cpp +++ b/lib/driver/rcconsole.cpp @@ -103,7 +103,7 @@ class eRCConsoleInit eRCConsoleDriver driver; eRCConsole device; public: - eRCConsoleInit(): driver("/dev/vc/0"), device(&driver) + eRCConsoleInit(): driver("/dev/tty0"), device(&driver) { } }; diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index ea9e7385..b5de46c9 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -1860,11 +1860,11 @@ int eDVBFrontend::tuneLoopInt() // called by m_tuneTimer int slotid = sec_fe->m_slotid; // FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000 if (slotid < 2) - sprintf(dev, "/dev/i2c/%d", slotid); + sprintf(dev, "/dev/i2c-%d", slotid); else if (slotid == 2) - sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2 + sprintf(dev, "/dev/i2c-2"); // first nim socket on DM8000 use /dev/i2c-2 else if (slotid == 3) - sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4 + sprintf(dev, "/dev/i2c-4"); // second nim socket on DM8000 use /dev/i2c-4 int fd = ::open(dev, O_RDWR); unsigned char data[2]; diff --git a/lib/gdi/bcm.cpp b/lib/gdi/bcm.cpp index 12b5f22a..ccf16f41 100644 --- a/lib/gdi/bcm.cpp +++ b/lib/gdi/bcm.cpp @@ -23,10 +23,10 @@ static int exec_list(void); int bcm_accel_init(void) { - fb_fd = open("/dev/fb/0", O_RDWR); + fb_fd = open("/dev/fb0", O_RDWR); if (fb_fd < 0) { - perror("/dev/fb/0"); + perror("/dev/fb0"); return 1; } if (exec_list()) diff --git a/lib/gdi/fb.cpp b/lib/gdi/fb.cpp index cde3e357..7ee555c1 100644 --- a/lib/gdi/fb.cpp +++ b/lib/gdi/fb.cpp @@ -83,12 +83,12 @@ nolfb: int fbClass::showConsole(int state) { - int fd=open("/dev/vc/0", O_RDWR); + int fd=open("/dev/tty0", O_RDWR); if(fd>=0) { if(ioctl(fd, KDSETMODE, state?KD_TEXT:KD_GRAPHICS)<0) { - eDebug("setting /dev/vc/0 status failed."); + eDebug("setting /dev/tty0 status failed."); } close(fd); } diff --git a/lib/gdi/fb.h b/lib/gdi/fb.h index 54473805..fcb5ff27 100644 --- a/lib/gdi/fb.h +++ b/lib/gdi/fb.h @@ -19,7 +19,7 @@ class fbClass int m_number_of_pages; int m_phys_mem; #ifdef SWIG - fbClass(const char *fb="/dev/fb/0"); + fbClass(const char *fb="/dev/fb0"); ~fbClass(); public: #else @@ -41,7 +41,7 @@ public: unsigned int Stride() { return stride; } fb_cmap *CMAP() { return &cmap; } - fbClass(const char *fb="/dev/fb/0"); + fbClass(const char *fb="/dev/fb0"); ~fbClass(); // low level gfx stuff diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py index 518db49d..8e4d0044 100755 --- a/lib/python/Tools/Directories.py +++ b/lib/python/Tools/Directories.py @@ -57,7 +57,7 @@ defaultPaths = { SCOPE_USERETC: ("", PATH_DONTCREATE), # user home directory SCOPE_DEFAULTDIR: (eEnv.resolve("${datadir}/enigma2/defaults/"), PATH_CREATE), - SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/6", PATH_DONTCREATE), + SCOPE_DEFAULTPARTITION: ("/dev/mtdblock6", PATH_DONTCREATE), SCOPE_DEFAULTPARTITIONMOUNTDIR: (eEnv.resolve("${datadir}/enigma2/dealer"), PATH_CREATE), SCOPE_METADIR: (eEnv.resolve("${datadir}/meta"), PATH_CREATE), } |