diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | INSTALL | 6 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | dxr3interface.c | 8 |
4 files changed, 10 insertions, 10 deletions
@@ -243,6 +243,7 @@ NOTE: I havent found time to include all of the languages, will be done in pre2 (Christian Gmeiner, Paavo Hartikainen) - added many comments into source (Christian Gmeiner) - using doxygen for docs (Christian Gmeiner) +- made path to microcode configurable in Makefile (Sascha Volkenandt) - extended cDxr3MemcpyBench::Rdtsc(uint32_t config_flags): support for non-x86 archs, support for cpu's, which dont support rdtsc timing (Christian Gmeiner) @@ -7,16 +7,12 @@ Prerequisites: Installation: -- Get the latest dxr3-plugin version from "http://sourceforge.net/projects/dxr3plugin/" +- Get the latest dxr3-plugin version from "http://www.schluenss.de/dxr3.html" - Unpack the package into "PLUGINS/SRC" directory - Make a symbolic link to this dxr3-plugin (ln -s vdr_dxr3_x.x.x dxr3) -- Check FFMDIR and EM8300 in Makefile - Check extra settings in Makefile: # where is the microcode for the dxr3 located? DEFINES += -DMICROCODE=\"/usr/share/misc/em8300.uc\" - - # where should we write our log? - DEFINES += -DLOGPATH=\"/video/\" # note: path must end with / - Call "make plugins" in the VDR root directory - Make sure your DXR3 driver modules are loaded and ready to run - Start VDR with "vdr -Pdxr3" @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.1.2.3 2005/03/14 14:02:54 scop Exp $ +# $Id: Makefile,v 1.1.2.4 2005/03/14 18:22:26 scop Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -55,6 +55,9 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' DEFINES += -DSOCKET_CHMOD=0660 DEFINES += -D_GNU_SOURCE +# where is the microcode for the dxr3 located? +DEFINES += -DMICROCODE=\"/usr/share/misc/em8300.uc\" + ### The object files (add further files here): OBJS = $(PLUGIN).o dxr3multichannelaudio.o dxr3sysclock.o dxr3colormanager.o dxr3syncbuffer.o dxr3audiodecoder.o \ diff --git a/dxr3interface.c b/dxr3interface.c index ec84371..3a3e793 100644 --- a/dxr3interface.c +++ b/dxr3interface.c @@ -864,19 +864,19 @@ void cDxr3Interface::UploadMicroCode() { if (cDxr3ConfigData::Instance().GetDebug()) { - cLog::Instance() << "cDxr3Interface::UploadMicroCode: uploading..."; + cLog::Instance() << "cDxr3Interface::UploadMicroCode: uploading from " << MICROCODE << "..."; } em8300_microcode_t em8300_microcode; - const char* MICRO_CODE_FILE = "/usr/share/misc/em8300.uc"; struct stat s; // try to open it - int UCODE = open(MICRO_CODE_FILE, O_RDONLY); + // MICROCODE comes from makefile + int UCODE = open(MICROCODE, O_RDONLY); if (UCODE <0) { - cLog::Instance() << "Unable to open microcode file " << MICRO_CODE_FILE << " for reading\n"; + cLog::Instance() << "Unable to open microcode file " << MICROCODE << " for reading\n"; exit(1); } |