r1892 - in trunk/user/pixil

[dslinux_amadeus at dslinux.in-berlin.de]

Author: amadeus
Date: 2007-09-15 22:44:14 +0200 (Sat, 15 Sep 2007)
New Revision: 1892

Log:
Fixed the target directory and fix the database for non-mmap file systems

Modified: trunk/user/pixil/apps/fltk/mp3/frontend/fspl_panel.cc
===================================================================
--- trunk/user/pixil/apps/fltk/mp3/frontend/fspl_panel.cc	2007-09-15 17:29:29 UTC (rev 1891)
+++ trunk/user/pixil/apps/fltk/mp3/frontend/fspl_panel.cc	2007-09-15 20:44:14 UTC (rev 1892)
@@ -169,7 +169,7 @@
      */
 
     if (!path_ok)
-	strcpy(defaultMusicPath, "/usr/local/pixil/mp3/");
+	strcpy(defaultMusicPath, "/usr/pixil/mp3/");
 
 ////////////////////////////////////////
 // Create song window and timer

Modified: trunk/user/pixil/apps/fltk/netconfig/scripts/pixil-ifdown
===================================================================
--- trunk/user/pixil/apps/fltk/netconfig/scripts/pixil-ifdown	2007-09-15 17:29:29 UTC (rev 1891)
+++ trunk/user/pixil/apps/fltk/netconfig/scripts/pixil-ifdown	2007-09-15 20:44:14 UTC (rev 1892)
@@ -14,7 +14,7 @@
   exit 1
 }
 
-[ -f "${CONFIG}" ] || CONFIG=/usr/local/pixil/scripts/pixil-${CONFIG}.conf
+[ -f "${CONFIG}" ] || CONFIG=/usr/pixil/scripts/pixil-${CONFIG}.conf
 [ -f "${CONFIG}" ] || {
   echo "Usage:  ./pixil-ifdown <config | device>"
   exit 1

Modified: trunk/user/pixil/apps/fltk/netconfig/scripts/pixil-ifup
===================================================================
--- trunk/user/pixil/apps/fltk/netconfig/scripts/pixil-ifup	2007-09-15 17:29:29 UTC (rev 1891)
+++ trunk/user/pixil/apps/fltk/netconfig/scripts/pixil-ifup	2007-09-15 20:44:14 UTC (rev 1892)
@@ -20,9 +20,9 @@
   exit 1
 }
 
-# We assume a default file of /usr/local/pixil/scripts/pixil-<device>.conf
+# We assume a default file of /usr/pixil/scripts/pixil-<device>.conf
 
-[ -f "${CONFIG}" ] || CONFIG=/usr/local/pixil/scripts/pixil-${CONFIG}.conf 
+[ -f "${CONFIG}" ] || CONFIG=/usr/pixil/scripts/pixil-${CONFIG}.conf 
 [ -f "${CONFIG}" ] || {
   echo "No config '${CONFIG}' found"
   echo "Usage:  ./pixil-ifup <config | device>"

Modified: trunk/user/pixil/apps/fltk/schedule/nxschedule.cxx
===================================================================
--- trunk/user/pixil/apps/fltk/schedule/nxschedule.cxx	2007-09-15 17:29:29 UTC (rev 1891)
+++ trunk/user/pixil/apps/fltk/schedule/nxschedule.cxx	2007-09-15 20:44:14 UTC (rev 1892)
@@ -1479,7 +1479,7 @@
     char buf[255];
     int ret = 0;
     char *args[4];
-    char *wave_path = "/usr/local/pixil/bin/waveplay";
+    char *wave_path = "/usr/pixil/bin/waveplay";
 
     par_db = db_openDB(db_getDefaultDB(), PAR_DB_MODE_RDONLY);
     if (!par_db) {

Modified: trunk/user/pixil/config
===================================================================
--- trunk/user/pixil/config	2007-09-15 17:29:29 UTC (rev 1891)
+++ trunk/user/pixil/config	2007-09-15 20:44:14 UTC (rev 1892)
@@ -36,7 +36,7 @@
 # Installation Options
 #
 # INSTALL_PREFIX="/usr/local/pixil"
-TARGET_PREFIX="/usr/local/pixil"
+TARGET_PREFIX="/usr/pixil"
 CONFIG_SAMPLES=y
 
 #

Modified: trunk/user/pixil/sys/par/lib/io.c
===================================================================
--- trunk/user/pixil/sys/par/lib/io.c	2007-09-15 17:29:29 UTC (rev 1891)
+++ trunk/user/pixil/sys/par/lib/io.c	2007-09-15 20:44:14 UTC (rev 1892)
@@ -105,29 +105,21 @@
     else
 	mode = PROT_READ | PROT_WRITE;
 
-#ifndef HAVE_MMAPBUG
-    db->map[bnum].addr =
-	mmap(0, db->blkSize, mode, MAP_SHARED, db->fd, db->blkSize * bnum);
-#else
-    if (db->mode == PAR_DB_READ_BLOCK)
-	db->map[bnum].addr = mmap(0, db->blkSize, mode,
-				  MAP_SHARED, db->fd, db->blkSize * bnum);
-    else {
+    {
 	int ret;
 
 	db->map[bnum].addr = (void *) malloc(db->blkSize);
 
 	if (db->map[bnum].addr) {
 	    lseek(db->fd, db->blkSize * bnum, SEEK_SET);
-	    ret =
-		read(db->fd, (unsigned char *) db->map[bnum].addr,
-		     db->blkSize);
-	    if (ret != db->blkSize)
+	    ret = read(db->fd, (unsigned char *) db->map[bnum].addr, db->blkSize);
+	    if (ret <= 0) {
+		free(db->map[bnum].addr);
 		db->map[bnum].addr = MAP_FAILED;
+	    }
 	} else
 	    db->map[bnum].addr = MAP_FAILED;
     }
-#endif
 
     if (db->map[bnum].addr == MAP_FAILED) {
 	bzero(&db->map[bnum], sizeof(db_map_t));
@@ -145,28 +137,20 @@
 void
 db_unmapBlock(db_handle * db, int block)
 {
-
     if (db->map[block].usage > 0)
 	db->map[block].usage--;
 
-    if (db->map[block].addr && !db->map[block].usage) {
-#ifndef HAVE_MMAPBUG
-	munmap(db->map[block].addr, db->blkSize);
-#else
-	if (db->map[block].mode == PAR_DB_READ_BLOCK)
-	    munmap(db->map[block].addr, db->blkSize);
-	else {
-	    int ret;
-
-	    lseek(db->fd, db->blkSize * block, SEEK_SET);
-	    ret = write(db->fd, db->map[block].addr, db->blkSize);
-
-	    free(db->map[block].addr);
-	}
-#endif
+    if (!db->map[block].usage) {
+    	if (db->map[block].addr) {
+		if ((db->map[block].mode != PAR_DB_READ_BLOCK) && (db->access != PAR_DB_MODE_RDONLY)) {
+			int ret;
+	    		lseek(db->fd, db->blkSize * block, SEEK_SET);
+	    		ret = write(db->fd, db->map[block].addr, db->blkSize);
+		}
+		free(db->map[block].addr);
+    	}
+    	bzero(&db->map[block], sizeof(db_map_t));
     }
-
-    bzero(&db->map[block], sizeof(db_map_t));
 }
 
 void