Refactor:core:Introduce enum for debug levels, and use it everywhere.|First part of #1269.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5960 ffa7fe5e-494d-0410-b361-a75ebd5db220

12 files changed, 258 insertions, 240 deletions

diff --git a/navit/vehicle/android/vehicle_android.c b/navit/vehicle/android/vehicle_android.c
index 34ba7a30..31f13031 100644
--- a/navit/vehicle/android/vehicle_android.c
+++ b/navit/vehicle/android/vehicle_android.c
@@ -67,7 +67,7 @@ struct vehicle_priv {
 static void
 vehicle_android_destroy(struct vehicle_priv *priv)
 {
-	dbg(0,"enter\n");
+	dbg(lvl_error,"enter\n");
 	g_free(priv);
 }
 
@@ -83,7 +83,7 @@ static int
 vehicle_android_position_attr_get(struct vehicle_priv *priv,
 			       enum attr_type type, struct attr *attr)
 {
-	dbg(1,"enter %s\n",attr_to_name(type));
+	dbg(lvl_warning,"enter %s\n",attr_to_name(type));
 	switch (type) {
 	case attr_position_fix_type:
 		attr->u.num = priv->fix_type;
@@ -120,7 +120,7 @@ vehicle_android_position_attr_get(struct vehicle_priv *priv,
 	default:
 		return 0;
 	}
-	dbg(1,"ok\n");
+	dbg(lvl_warning,"ok\n");
 	attr->type = type;
 	return 1;
 }
@@ -142,7 +142,7 @@ static void
 vehicle_android_position_callback(struct vehicle_priv *v, jobject location) {
 	time_t tnow;
 	struct tm *tm;
-	dbg(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 
 	v->geo.lat = (*jnienv)->CallDoubleMethod(jnienv, location, v->Location_getLatitude);
 	v->geo.lng = (*jnienv)->CallDoubleMethod(jnienv, location, v->Location_getLongitude);
@@ -153,7 +153,7 @@ vehicle_android_position_callback(struct vehicle_priv *v, jobject location) {
 	tnow=(*jnienv)->CallLongMethod(jnienv, location, v->Location_getTime)/1000;
 	tm = gmtime(&tnow);
 	strftime(v->fixiso8601, sizeof(v->fixiso8601), "%Y-%m-%dT%TZ", tm);
-	dbg(1,"lat %f lon %f time %s\n",v->geo.lat,v->geo.lng,v->fixiso8601);
+	dbg(lvl_warning,"lat %f lon %f time %s\n",v->geo.lat,v->geo.lng,v->fixiso8601);
 	if (v->valid != attr_position_valid_valid) {
 		v->valid = attr_position_valid_valid;
 		callback_list_call_attr_0(v->cbl, attr_position_valid);
@@ -235,15 +235,33 @@ vehicle_android_init(struct vehicle_priv *ret)
                 return 0;
 	if (!android_find_class_global("org/navitproject/navit/NavitVehicle", &ret->NavitVehicleClass))
                 return 0;
+<<<<<<< HEAD
         dbg(0,"at 3\n");
         cid = (*jnienv)->GetMethodID(jnienv, ret->NavitVehicleClass, "<init>", "(Landroid/content/Context;III)V");
+||||||| merged common ancestors
+        dbg(0,"at 3\n");
+        cid = (*jnienv)->GetMethodID(jnienv, ret->NavitVehicleClass, "<init>", "(Landroid/content/Context;I)V");
+=======
+        dbg(lvl_error,"at 3\n");
+        cid = (*jnienv)->GetMethodID(jnienv, ret->NavitVehicleClass, "<init>", "(Landroid/content/Context;I)V");
+>>>>>>> Refactor:core:Introduce enum for debug levels, and use it everywhere.|First part of #1269.
         if (cid == NULL) {
-                dbg(0,"no method found\n");
+                dbg(lvl_error,"no method found\n");
                 return 0; /* exception thrown */
         }
+<<<<<<< HEAD
         dbg(0,"at 4 android_activity=%p\n",android_activity);
         ret->NavitVehicle=(*jnienv)->NewObject(jnienv, ret->NavitVehicleClass, cid, android_activity, (int) ret->pcb, (int) ret->scb, (int) ret->fcb);
         dbg(0,"result=%p\n",ret->NavitVehicle);
+||||||| merged common ancestors
+        dbg(0,"at 4 android_activity=%p\n",android_activity);
+        ret->NavitVehicle=(*jnienv)->NewObject(jnienv, ret->NavitVehicleClass, cid, android_activity, (int) ret->cb);
+        dbg(0,"result=%p\n",ret->NavitVehicle);
+=======
+        dbg(lvl_error,"at 4 android_activity=%p\n",android_activity);
+        ret->NavitVehicle=(*jnienv)->NewObject(jnienv, ret->NavitVehicleClass, cid, android_activity, (int) ret->cb);
+        dbg(lvl_error,"result=%p\n",ret->NavitVehicle);
+>>>>>>> Refactor:core:Introduce enum for debug levels, and use it everywhere.|First part of #1269.
 	if (!ret->NavitVehicle)
 		return 0;
         if (ret->NavitVehicle)
@@ -267,7 +285,7 @@ vehicle_android_new_android(struct vehicle_methods *meth,
 {
 	struct vehicle_priv *ret;
 
-	dbg(0, "enter\n");
+	dbg(lvl_error, "enter\n");
 	ret = g_new0(struct vehicle_priv, 1);
 	ret->cbl = cbl;
 	ret->pcb = callback_new_1(callback_cast(vehicle_android_position_callback), ret);
@@ -278,7 +296,7 @@ vehicle_android_new_android(struct vehicle_methods *meth,
 	ret->sats_used = 0;
 	*meth = vehicle_android_methods;
 	vehicle_android_init(ret);
-	dbg(0, "return\n");
+	dbg(lvl_error, "return\n");
 	return ret;
 }
 
@@ -290,6 +308,6 @@ vehicle_android_new_android(struct vehicle_methods *meth,
 void
 plugin_init(void)
 {
-	dbg(0, "enter\n");
+	dbg(lvl_error, "enter\n");
 	plugin_register_vehicle_type("android", vehicle_android_new_android);
 }
diff --git a/navit/vehicle/demo/vehicle_demo.c b/navit/vehicle/demo/vehicle_demo.c
index ecaa0800..f2591852 100644
--- a/navit/vehicle/demo/vehicle_demo.c
+++ b/navit/vehicle/demo/vehicle_demo.c
@@ -163,7 +163,7 @@ vehicle_demo_set_attr_do(struct vehicle_priv *priv, struct attr *attr)
 			callback_list_call_attr_0(priv->cbl, attr_position_valid);
 		}
 		priv->position_set=1;
-		dbg(1,"position_set %f %f\n", priv->geo.lat, priv->geo.lng);
+		dbg(lvl_warning,"position_set %f %f\n", priv->geo.lat, priv->geo.lng);
 		break;
 	case attr_profilename:
 	case attr_source:
@@ -171,7 +171,7 @@ vehicle_demo_set_attr_do(struct vehicle_priv *priv, struct attr *attr)
 		// Ignore; used by Navit's infrastructure, but not relevant for this vehicle.
 		break;
 	default:
-		dbg(0,"unsupported attribute %s\n",attr_to_name(attr->type));
+		dbg(lvl_error,"unsupported attribute %s\n",attr_to_name(attr->type));
 		return 0;
 	}
 	return 1;
@@ -200,7 +200,7 @@ vehicle_demo_timer(struct vehicle_priv *priv)
 	struct item *item=NULL;
 
 	len = (priv->config_speed * priv->interval / 1000)/ 3.6;
-	dbg(1, "###### Entering simulation loop\n");
+	dbg(lvl_warning, "###### Entering simulation loop\n");
 	if (!priv->config_speed)
 		return;
 	if (priv->route)
@@ -219,10 +219,10 @@ vehicle_demo_timer(struct vehicle_priv *priv)
 		item=map_rect_get_item(mr);
 	if (item && item_coord_get(item, &pos, 1)) {
 		priv->position_set=0;
-		dbg(1, "current pos=0x%x,0x%x\n", pos.x, pos.y);
-		dbg(1, "last pos=0x%x,0x%x\n", priv->last.x, priv->last.y);
+		dbg(lvl_warning, "current pos=0x%x,0x%x\n", pos.x, pos.y);
+		dbg(lvl_warning, "last pos=0x%x,0x%x\n", priv->last.x, priv->last.y);
 		if (priv->last.x == pos.x && priv->last.y == pos.y) {
-			dbg(1, "endless loop\n");
+			dbg(lvl_warning, "endless loop\n");
 		}
 		priv->last = pos;
 		while (item && priv->config_speed) {
@@ -230,9 +230,9 @@ vehicle_demo_timer(struct vehicle_priv *priv)
 				item=map_rect_get_item(mr);
 				continue;
 			}
-			dbg(1, "next pos=0x%x,0x%x\n", c.x, c.y);
+			dbg(lvl_warning, "next pos=0x%x,0x%x\n", c.x, c.y);
 			slen = transform_distance(projection_mg, &pos, &c);
-			dbg(1, "len=%d slen=%d\n", len, slen);
+			dbg(lvl_warning, "len=%d slen=%d\n", len, slen);
 			if (slen < len) {
 				len -= slen;
 				pos = c;
@@ -249,9 +249,9 @@ vehicle_demo_timer(struct vehicle_priv *priv)
 					ci.x = pos.x;
 					ci.y = pos.y;
 					priv->speed=0;
-					dbg(0,"destination reached\n");
+					dbg(lvl_error,"destination reached\n");
 				}
-				dbg(1, "ci=0x%x,0x%x\n", ci.x, ci.y);
+				dbg(lvl_warning, "ci=0x%x,0x%x\n", ci.x, ci.y);
 				transform_to_geo(projection_mg, &ci,
 						 &priv->geo);
 				if (priv->valid != attr_position_valid_valid) {
@@ -279,7 +279,7 @@ vehicle_demo_new(struct vehicle_methods
 {
 	struct vehicle_priv *ret;
 
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	ret = g_new0(struct vehicle_priv, 1);
 	ret->cbl = cbl;
 	ret->interval=1000;
@@ -297,6 +297,6 @@ vehicle_demo_new(struct vehicle_methods
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("demo", vehicle_demo_new);
 }
diff --git a/navit/vehicle/file/vehicle_file.c b/navit/vehicle/file/vehicle_file.c
index 4df7b500..f82e33fd 100644
--- a/navit/vehicle/file/vehicle_file.c
+++ b/navit/vehicle/file/vehicle_file.c
@@ -148,7 +148,7 @@ static int vehicle_win32_serial_track(struct vehicle_priv *priv)
     int rc = 0;
     int dwBytes;
 
-    dbg(1, "enter, *priv='%x', priv->source='%s'\n", priv, priv->source);
+    dbg(lvl_warning, "enter, *priv='%x', priv->source='%s'\n", priv, priv->source);
 
     if ( priv->no_data_count > 5 )
     {
@@ -194,7 +194,7 @@ static int vehicle_win32_serial_track(struct vehicle_priv *priv)
             priv->no_data_count = 0;
             callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
             if (rc > 1)
-                dbg(0, "Can not keep with gps data delay is %d seconds\n", rc - 1);
+                dbg(lvl_error, "Can not keep with gps data delay is %d seconds\n", rc - 1);
 
         }
     }
@@ -202,7 +202,7 @@ static int vehicle_win32_serial_track(struct vehicle_priv *priv)
     {
         priv->no_data_count++;
     }
-    dbg(2, "leave, return '1', priv->no_data_count='%d'\n", priv->no_data_count);
+    dbg(lvl_info, "leave, return '1', priv->no_data_count='%d'\n", priv->no_data_count);
     return 1;
 }
 #endif
@@ -264,7 +264,7 @@ vehicle_file_open(struct vehicle_priv *priv)
 		struct sockaddr_in sin;
 		p=strchr(s,':');
 		if (!p) {
-			dbg(0,"port number missing in %s\n",s);
+			dbg(lvl_error,"port number missing in %s\n",s);
 			g_free(s);
 			return 0;
 		}
@@ -272,14 +272,14 @@ vehicle_file_open(struct vehicle_priv *priv)
 		sin.sin_family=AF_INET;
 		sin.sin_port=ntohs(atoi(p));
 		if (!inet_aton(s, &sin.sin_addr)) {
-			dbg(0,"failed to parse %s\n",s);
+			dbg(lvl_error,"failed to parse %s\n",s);
 			g_free(s);
 			return 0;
 		}
 		priv->fd = socket(PF_INET, SOCK_STREAM, 0);
 		if (priv->fd != -1) {
 			if (connect(priv->fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-				dbg(0,"failed to connect to %s:%s\n",s,p);
+				dbg(lvl_error,"failed to connect to %s:%s\n",s,p);
 				g_free(s);
 				return 0;
 			}
@@ -309,7 +309,7 @@ vehicle_file_open(struct vehicle_priv *priv)
 		g_free( raw_setting_str );
 		priv->file_type = file_type_serial;
 		// Add the callback
-		dbg(2, "Add the callback ...\n", priv->source);
+		dbg(lvl_info, "Add the callback ...\n", priv->source);
 			priv->timeout_callback=callback_new_1(callback_cast(vehicle_win32_serial_track), priv);
 #else
 		//TODO - add linux serial
@@ -329,7 +329,7 @@ vehicle_file_open(struct vehicle_priv *priv)
 static void
 vehicle_file_close(struct vehicle_priv *priv)
 {
-    dbg(1, "enter, priv->fd='%d'\n", priv->fd);
+    dbg(lvl_warning, "enter, priv->fd='%d'\n", priv->fd);
 	vehicle_file_disable_watch(priv);
 #ifdef _WIN32
     if(priv->file_type == file_type_serial)
@@ -369,7 +369,7 @@ vehicle_file_close(struct vehicle_priv *priv)
 static int
 vehicle_file_enable_watch_timer(struct vehicle_priv *priv)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	vehicle_file_enable_watch(priv);
 
 	return FALSE;
@@ -400,10 +400,10 @@ vehicle_file_parse(struct vehicle_priv *priv, char *buffer)
 	int valid=0;
 	int ret = 0;
 
-	dbg(2, "enter: buffer='%s'\n", buffer);
+	dbg(lvl_info, "enter: buffer='%s'\n", buffer);
 	for (;;) {
 		if (len < 4) {
-			dbg(0, "'%s' too short\n", buffer);
+			dbg(lvl_error, "'%s' too short\n", buffer);
 			return ret;
 		}
 		if (buffer[len - 1] == '\r' || buffer[len - 1] == '\n') {
@@ -414,22 +414,22 @@ vehicle_file_parse(struct vehicle_priv *priv, char *buffer)
 			break;
 	}
 	if (buffer[0] != '$') {
-		dbg(0, "no leading $ in '%s'\n", buffer);
+		dbg(lvl_error, "no leading $ in '%s'\n", buffer);
 		return ret;
 	}
 	if (buffer[len - 3] != '*') {
-		dbg(0, "no *XX in '%s'\n", buffer);
+		dbg(lvl_error, "no *XX in '%s'\n", buffer);
 		return ret;
 	}
 	for (i = 1; i < len - 3; i++) {
 		csum ^= (unsigned char) (buffer[i]);
 	}
 	if (!sscanf(buffer + len - 2, "%x", &bcsum) && priv->checksum_ignore != 2) {
-		dbg(0, "no checksum in '%s'\n", buffer);
+		dbg(lvl_error, "no checksum in '%s'\n", buffer);
 		return ret;
 	}
 	if (bcsum != csum && priv->checksum_ignore == 0) {
-		dbg(0, "wrong checksum in '%s was %x should be %x'\n", buffer,bcsum,csum);
+		dbg(lvl_error, "wrong checksum in '%s was %x should be %x'\n", buffer,bcsum,csum);
 		return ret;
 	}
 
@@ -438,7 +438,7 @@ vehicle_file_parse(struct vehicle_priv *priv, char *buffer)
 		g_free(priv->nmea_data_buf);
 		priv->nmea_data_buf=nmea_data_buf;
 	} else {
-		dbg(0, "nmea buffer overflow (len %zu), discarding '%s'\n", priv->nmea_data_buf?strlen(priv->nmea_data_buf):-1,buffer);
+		dbg(lvl_error, "nmea buffer overflow (len %zu), discarding '%s'\n", priv->nmea_data_buf?strlen(priv->nmea_data_buf):-1,buffer);
 	}
 	i = 0;
 	p = buffer;
@@ -475,7 +475,7 @@ vehicle_file_parse(struct vehicle_priv *priv, char *buffer)
 			if (!g_ascii_strcasecmp(item[5],"W"))
 				priv->geo.lng=-priv->geo.lng;
 			priv->valid=attr_position_valid_valid;
-            dbg(2, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng);
+            dbg(lvl_info, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng);
 
 		} else
 			priv->valid=attr_position_valid_invalid;
@@ -513,7 +513,7 @@ vehicle_file_parse(struct vehicle_priv *priv, char *buffer)
 		if (valid) {
 			priv->direction = g_ascii_strtod( item[1], NULL );
 			priv->speed = g_ascii_strtod( item[7], NULL );
-			dbg(2,"direction %lf, speed %2.1lf\n", priv->direction, priv->speed);
+			dbg(lvl_info,"direction %lf, speed %2.1lf\n", priv->direction, priv->speed);
 		}
 	}
 	if (!strncmp(buffer, "$GPRMC", 6)) {
@@ -603,7 +603,7 @@ vehicle_file_parse(struct vehicle_priv *priv, char *buffer)
 	*/
 		if (item[1]) {
 			priv->magnetic_direction = g_ascii_strtod( item[1], NULL );
-			dbg(1,"magnetic %d\n", priv->magnetic_direction);
+			dbg(lvl_warning,"magnetic %d\n", priv->magnetic_direction);
 		}
 	}
 	return ret;
@@ -624,7 +624,7 @@ vehicle_file_io(struct vehicle_priv *priv)
 {
 	int size, rc = 0;
 	char *str, *tok;
-    dbg(1, "vehicle_file_io : enter\n");
+    dbg(lvl_warning, "vehicle_file_io : enter\n");
 
 	if (priv->process_statefile) {
 		unsigned char *data;
@@ -657,12 +657,12 @@ vehicle_file_io(struct vehicle_priv *priv)
 	}
 	priv->buffer_pos += size;
 	priv->buffer[priv->buffer_pos] = '\0';
-	dbg(1, "size=%d pos=%d buffer='%s'\n", size,
+	dbg(lvl_warning, "size=%d pos=%d buffer='%s'\n", size,
 	    priv->buffer_pos, priv->buffer);
 	str = priv->buffer;
 	while ((tok = strchr(str, '\n'))) {
 		*tok++ = '\0';
-		dbg(1, "line='%s'\n", str);
+		dbg(lvl_warning, "line='%s'\n", str);
 		rc +=vehicle_file_parse(priv, str);
 		str = tok;
 		if (priv->file_type == file_type_file && rc)
@@ -673,10 +673,10 @@ vehicle_file_io(struct vehicle_priv *priv)
 		size = priv->buffer + priv->buffer_pos - str;
 		memmove(priv->buffer, str, size + 1);
 		priv->buffer_pos = size;
-		dbg(1, "now pos=%d buffer='%s'\n",
+		dbg(lvl_warning, "now pos=%d buffer='%s'\n",
 		    priv->buffer_pos, priv->buffer);
 	} else if (priv->buffer_pos == buffer_size - 1) {
-		dbg(0,
+		dbg(lvl_error,
 		    "Overflow. Most likely wrong baud rate or no nmea protocol\n");
 		priv->buffer_pos = 0;
 	}
@@ -695,7 +695,7 @@ vehicle_file_io(struct vehicle_priv *priv)
 static void
 vehicle_file_enable_watch(struct vehicle_priv *priv)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 #ifdef _WIN32
 	// add an event : don't use glib timers and g_timeout_add
     if (priv->file_type == file_type_serial)
@@ -703,7 +703,7 @@ vehicle_file_enable_watch(struct vehicle_priv *priv)
 	if (priv->timeout_callback != NULL)
             priv->timeout = event_add_timeout(500, 1, priv->timeout_callback);
         else
-            dbg(1, "error : watch not enabled : priv->timeout_callback is null\n"); }
+            dbg(lvl_warning, "error : watch not enabled : priv->timeout_callback is null\n"); }
     else
 #endif
     {
@@ -723,7 +723,7 @@ vehicle_file_enable_watch(struct vehicle_priv *priv)
 static void
 vehicle_file_disable_watch(struct vehicle_priv *priv)
 {
-	dbg(1, "vehicle_file_disable_watch : enter\n");
+	dbg(lvl_warning, "vehicle_file_disable_watch : enter\n");
 #ifdef _WIN32
     if(priv->file_type == file_type_serial)
     {
@@ -844,7 +844,7 @@ vehicle_file_position_attr_get(struct vehicle_priv *priv,
 		attr->u.str=priv->fixiso8601;
 		break;
 	case attr_position_sat_item:
-		dbg(0,"at here\n");
+		dbg(lvl_error,"at here\n");
 		priv->sat_item.id_lo++;
 		if (priv->sat_item.id_lo > priv->current_count) {
 			priv->sat_item.id_lo=0;
@@ -951,11 +951,11 @@ vehicle_file_new_file(struct vehicle_methods
 	struct attr *checksum_ignore;
 	struct attr *state_file;
 
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 
 	source = attr_search(attrs, NULL, attr_source);
 	if(source == NULL){
-		 dbg(0,"Missing source attribute");
+		 dbg(lvl_error,"Missing source attribute");
 		 return NULL;
     }
 	ret = g_new0(struct vehicle_priv, 1);   // allocate and initialize to 0
@@ -1009,7 +1009,7 @@ vehicle_file_new_file(struct vehicle_methods
 		ret->on_eof=1;
 	if (on_eof && !g_ascii_strcasecmp(on_eof->u.str, "exit"))
 		ret->on_eof=2;
-	dbg(0,"on_eof=%d\n", ret->on_eof);
+	dbg(lvl_error,"on_eof=%d\n", ret->on_eof);
 	*meth = vehicle_file_methods;
 	ret->cb=callback_new_1(callback_cast(vehicle_file_io), ret);
 	ret->cbt=callback_new_1(callback_cast(vehicle_file_enable_watch_timer), ret);
@@ -1025,15 +1025,15 @@ vehicle_file_new_file(struct vehicle_methods
 	ret->no_data_count = 0;
 #endif
 
-	dbg(1, "vehicle_file_new_file:open\n");
+	dbg(lvl_warning, "vehicle_file_new_file:open\n");
 	if (!vehicle_file_open(ret)) {
-        dbg(0, "Failed to open '%s'\n", ret->source);
+        dbg(lvl_error, "Failed to open '%s'\n", ret->source);
 	}
 
 	vehicle_file_enable_watch(ret);
 	// vehicle_file_destroy(ret);
 	// return NULL;
-	dbg(1, "leave\n");
+	dbg(lvl_warning, "leave\n");
 	return ret;
 }
 
@@ -1045,7 +1045,7 @@ vehicle_file_new_file(struct vehicle_methods
 **/
 void plugin_init(void)
 {
-	dbg(1, "vehicle_file:plugin_init:enter\n");
+	dbg(lvl_warning, "vehicle_file:plugin_init:enter\n");
 	plugin_register_vehicle_type("file", vehicle_file_new_file);
 	plugin_register_vehicle_type("pipe", vehicle_file_new_file);
 	plugin_register_vehicle_type("socket", vehicle_file_new_file);
diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c
index 5bb39b7b..a871cb07 100644
--- a/navit/vehicle/gpsd/vehicle_gpsd.c
+++ b/navit/vehicle/gpsd/vehicle_gpsd.c
@@ -97,11 +97,11 @@ vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len,
 				g_free(priv->nmea_data_buf);
 				priv->nmea_data_buf=nmea_data_buf;
 			} else {
-				dbg(0, "nmea buffer overflow, discarding '%s'\n", buffer);
+				dbg(lvl_error, "nmea buffer overflow, discarding '%s'\n", buffer);
 			}
 		}
 	}	
-	dbg(1,"data->set="LONGLONG_HEX_FMT"\n", data->set);
+	dbg(lvl_warning,"data->set="LONGLONG_HEX_FMT"\n", data->set);
 	if (data->set & SPEED_SET) {
 		priv->speed = data->fix.speed * 3.6;
 		if(!isnan(data->fix.speed))
@@ -164,12 +164,12 @@ vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len,
 	}
 #ifdef HAVE_LIBGPS19
 	if (data->set & DOP_SET) {
-		dbg(1, "pdop : %g\n", data->dop.pdop);
+		dbg(lvl_warning, "pdop : %g\n", data->dop.pdop);
 		priv->hdop = data->dop.pdop;
 		data->set &= ~DOP_SET;
 #else
 	if (data->set & PDOP_SET) {
-		dbg(1, "pdop : %g\n", data->pdop);
+		dbg(lvl_warning, "pdop : %g\n", data->pdop);
 		priv->hdop = data->hdop;
 		data->set &= ~PDOP_SET;
 #endif
@@ -177,7 +177,7 @@ vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len,
 	if (data->set & LATLON_SET) {
 		priv->geo.lat = data->fix.latitude;
 		priv->geo.lng = data->fix.longitude;
-		dbg(1,"lat=%f lng=%f\n", priv->geo.lat, priv->geo.lng);
+		dbg(lvl_warning,"lat=%f lng=%f\n", priv->geo.lat, priv->geo.lng);
 		g_free(priv->nmea_data);
 		priv->nmea_data=priv->nmea_data_buf;
 		priv->nmea_data_buf=NULL;
@@ -187,7 +187,7 @@ vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len,
 	if (! isnan(data->fix.speed) && priv->fix_type > 0) {
 		callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
 	}
-	dbg(2,"speed ok\n");
+	dbg(lvl_info,"speed ok\n");
 }
 
 /**
@@ -205,7 +205,7 @@ vehicle_gpsd_try_open(struct vehicle_priv *priv)
 		*colon = '\0';
 		port=colon+1;
 	}
-	dbg(0,"Trying to connect to %s:%s\n",source+7,port?port:"default");
+	dbg(lvl_error,"Trying to connect to %s:%s\n",source+7,port?port:"default");
 
 #if GPSD_API_MAJOR_VERSION >= 5
         /* gps_open returns 0 on success */
@@ -214,7 +214,7 @@ vehicle_gpsd_try_open(struct vehicle_priv *priv)
 	priv->gps = gps_open(source + 7, port);
 	if(!priv->gps) {
 #endif
-		dbg(0,"gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?\n", priv->source, priv->retry_interval);
+		dbg(lvl_error,"gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?\n", priv->source, priv->retry_interval);
                 g_free(source);
 		return TRUE;
 	}
@@ -236,9 +236,9 @@ vehicle_gpsd_try_open(struct vehicle_priv *priv)
 	priv->cbt = callback_new_1(callback_cast(vehicle_gpsd_try_open), priv);
 	priv->evwatch = event_add_watch(priv->gps->gps_fd, event_watch_cond_read, priv->cb);
 	if (!priv->gps->gps_fd) {
-		dbg(0,"Warning: gps_fd is 0, most likely you have used a gps.h incompatible to libgps");
+		dbg(lvl_error,"Warning: gps_fd is 0, most likely you have used a gps.h incompatible to libgps");
 	}
-	dbg(0,"Connected to gpsd fd=%d evwatch=%p\n", priv->gps->gps_fd, priv->evwatch);
+	dbg(lvl_error,"Connected to gpsd fd=%d evwatch=%p\n", priv->gps->gps_fd, priv->evwatch);
 	event_remove_timeout(priv->retry_timer2);
 	priv->retry_timer2=NULL;
 	return FALSE;
@@ -257,11 +257,11 @@ vehicle_gpsd_open(struct vehicle_priv *priv)
 	memset(&priv->context, 0, sizeof(gpsbt_t));
 	if(gpsbt_start(NULL, 0, 0, 0, errstr, sizeof(errstr),
 		0, &priv->context) < 0) {
-	       dbg(0,"Error connecting to GPS with gpsbt: (%d) %s (%s)\n",
+	       dbg(lvl_error,"Error connecting to GPS with gpsbt: (%d) %s (%s)\n",
 		  errno, strerror(errno), errstr);
 	}
 	sleep(1);       /* give gpsd time to start */
-	dbg(1,"gpsbt_start: completed\n");
+	dbg(lvl_warning,"gpsbt_start: completed\n");
 #endif
 	priv->retry_timer2=NULL;
 	if (vehicle_gpsd_try_open(priv)) 
@@ -301,21 +301,21 @@ vehicle_gpsd_close(struct vehicle_priv *priv)
 #ifdef HAVE_GPSBT
 	err = gpsbt_stop(&priv->context);
 	if (err < 0) {
-		dbg(0,"Error %d while gpsbt_stop", err);
+		dbg(lvl_error,"Error %d while gpsbt_stop", err);
 	}
-	dbg(1,"gpsbt_stop: completed, (%d)",err);
+	dbg(lvl_warning,"gpsbt_stop: completed, (%d)",err);
 #endif
 }
 
 static void
 vehicle_gpsd_io(struct vehicle_priv *priv)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	if (priv->gps) {
 	 	vehicle_last = priv;
 #if GPSD_API_MAJOR_VERSION >= 5
                 if(gps_read(priv->gps)==-1) {
-                  dbg(0,"gps_poll failed\n");
+                  dbg(lvl_error,"gps_poll failed\n");
                   vehicle_gpsd_close(priv);
                   vehicle_gpsd_open(priv);
                 }
@@ -326,7 +326,7 @@ vehicle_gpsd_io(struct vehicle_priv *priv)
                 }
 #else
                 if (gps_poll(priv->gps)) {
-			dbg(0,"gps_poll failed\n");
+			dbg(lvl_error,"gps_poll failed\n");
 			vehicle_gpsd_close(priv);
 			vehicle_gpsd_open(priv);
                 }
@@ -427,7 +427,7 @@ vehicle_gpsd_new_gpsd(struct vehicle_methods
 	struct vehicle_priv *ret;
 	struct attr *source, *query, *retry_int;
 
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	source = attr_search(attrs, NULL, attr_source);
 	ret = g_new0(struct vehicle_priv, 1);
 #if GPSD_API_MAJOR_VERSION >= 5
@@ -440,16 +440,16 @@ vehicle_gpsd_new_gpsd(struct vehicle_methods
 	} else {
 		ret->gpsd_query = g_strdup("w+x\n");
 	}
-	dbg(1,"Format string for gpsd_query: %s\n",ret->gpsd_query);
+	dbg(lvl_warning,"Format string for gpsd_query: %s\n",ret->gpsd_query);
 	retry_int = attr_search(attrs, NULL, attr_retry_interval);
 	if (retry_int) {
 		ret->retry_interval = retry_int->u.num;
 		if (ret->retry_interval < MIN_RETRY_INTERVAL) {
-			dbg(0, "Retry interval %d too small, setting to %d\n", ret->retry_interval, MIN_RETRY_INTERVAL);
+			dbg(lvl_error, "Retry interval %d too small, setting to %d\n", ret->retry_interval, MIN_RETRY_INTERVAL);
 			ret->retry_interval = MIN_RETRY_INTERVAL;
 		}
 	} else {
-		dbg(1, "Retry interval not defined, setting to %d\n", DEFAULT_RETRY_INTERVAL);
+		dbg(lvl_warning, "Retry interval not defined, setting to %d\n", DEFAULT_RETRY_INTERVAL);
 		ret->retry_interval = DEFAULT_RETRY_INTERVAL;
 	}
 	ret->cbl = cbl;
@@ -462,6 +462,6 @@ vehicle_gpsd_new_gpsd(struct vehicle_methods
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("gpsd", vehicle_gpsd_new_gpsd);
 }
diff --git a/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c b/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c
index fb1a9972..c599d3cc 100644
--- a/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c
+++ b/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c
@@ -114,7 +114,7 @@ vehicle_gpsd_dbus_open(struct vehicle_priv *priv)
 		priv->connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
 	}
 	if (!priv->connection) {
-		dbg(0,"Failed to open connection to %s message bus: %s\n", priv->address?priv->address:"session",error.message);
+		dbg(lvl_error,"Failed to open connection to %s message bus: %s\n", priv->address?priv->address:"session",error.message);
 		dbus_error_free(&error);
 		return 0;
 	}
@@ -122,12 +122,12 @@ vehicle_gpsd_dbus_open(struct vehicle_priv *priv)
 	dbus_bus_add_match(priv->connection,"type='signal',interface='org.gpsd'",&error);
 	dbus_connection_flush(priv->connection);
 	if (dbus_error_is_set(&error)) {
-		dbg(0,"Failed to add match to connection: %s\n", error.message);
+		dbg(lvl_error,"Failed to add match to connection: %s\n", error.message);
 		vehicle_gpsd_dbus_close(priv);
 		return 0;
 	}
 	if (!dbus_connection_add_filter(priv->connection, vehicle_gpsd_dbus_filter, priv, NULL)) {
-		dbg(0,"Failed to add filter to connection\n");
+		dbg(lvl_error,"Failed to add filter to connection\n");
 		vehicle_gpsd_dbus_close(priv);
 		return 0;
 	}
@@ -187,7 +187,7 @@ vehicle_gpsd_dbus_set_attr_do(struct vehicle_priv *priv, struct attr *attr, int
 	switch (attr->type) {
 	case attr_source:
 		if (strncmp(vehicle_gpsd_dbus_prefix,attr->u.str,strlen(vehicle_gpsd_dbus_prefix))) {
-			dbg(0,"source must start with '%s'\n", vehicle_gpsd_dbus_prefix);
+			dbg(lvl_error,"source must start with '%s'\n", vehicle_gpsd_dbus_prefix);
 			return 0;
 		}
 		g_free(priv->source);
@@ -243,6 +243,6 @@ vehicle_gpsd_dbus_new(struct vehicle_methods
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("gpsd_dbus", vehicle_gpsd_dbus_new);
 }
diff --git a/navit/vehicle/gypsy/vehicle_gypsy.c b/navit/vehicle/gypsy/vehicle_gypsy.c
index 3fbb8bae..f63312bd 100644
--- a/navit/vehicle/gypsy/vehicle_gypsy.c
+++ b/navit/vehicle/gypsy/vehicle_gypsy.c
@@ -286,7 +286,7 @@ vehicle_gypsy_try_open(gpointer *data)
 	}
 
 	vehicle_last = priv;
-	dbg(0,"gypsy connected to %d\n", source+8);
+	dbg(lvl_error,"gypsy connected to %d\n", source+8);
 	g_free(source);
 	return FALSE;
 }
@@ -457,11 +457,11 @@ vehicle_gypsy_new_gypsy(struct vehicle_methods *meth,
 			dbus_message_unref(message);
 			dbus_connection_unref(conn);
 		} else {
-			dbg(0,"failed to connect to session bus\n");
+			dbg(lvl_error,"failed to connect to session bus\n");
 		}
 	}
 #endif
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	source = attr_search(attrs, NULL, attr_source);
 	ret = g_new0(struct vehicle_priv, 1);
 	ret->have_cords = 0;
@@ -471,11 +471,11 @@ vehicle_gypsy_new_gypsy(struct vehicle_methods *meth,
 	if (retry_int) {
 		ret->retry_interval = retry_int->u.num;
 		if (ret->retry_interval < MIN_RETRY_INTERVAL) {
-			dbg(0, "Retry interval %d too small, setting to %d\n", ret->retry_interval, MIN_RETRY_INTERVAL);
+			dbg(lvl_error, "Retry interval %d too small, setting to %d\n", ret->retry_interval, MIN_RETRY_INTERVAL);
 			ret->retry_interval = MIN_RETRY_INTERVAL;
 		}
 	} else {
-		dbg(0, "Retry interval not defined, setting to %d\n", DEFAULT_RETRY_INTERVAL);
+		dbg(lvl_error, "Retry interval not defined, setting to %d\n", DEFAULT_RETRY_INTERVAL);
 		ret->retry_interval = DEFAULT_RETRY_INTERVAL;
 	}
 	ret->cbl = cbl;
@@ -492,6 +492,6 @@ vehicle_gypsy_new_gypsy(struct vehicle_methods *meth,
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("gypsy", vehicle_gypsy_new_gypsy);
 }
diff --git a/navit/vehicle/iphone/vehicle_iphone.c b/navit/vehicle/iphone/vehicle_iphone.c
index e69747a1..ad5fd6ea 100644
--- a/navit/vehicle/iphone/vehicle_iphone.c
+++ b/navit/vehicle/iphone/vehicle_iphone.c
@@ -119,7 +119,7 @@ vehicle_iphone_update(void *arg,
 	strcpy(priv->str_time, str_time);
 	priv->radius = radius;
 
-	dbg(0,"position_get lat:%f lng:%f (spd:%f dir:%f time:%s)\n", priv->geo.lat, priv->geo.lng, priv->speed, priv->direction, priv->str_time);
+	dbg(lvl_error,"position_get lat:%f lng:%f (spd:%f dir:%f time:%s)\n", priv->geo.lat, priv->geo.lng, priv->speed, priv->direction, priv->str_time);
 	callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
 }
 
@@ -133,7 +133,7 @@ vehicle_iphone_new(struct vehicle_methods
 	struct vehicle_priv *ret;
 	struct attr *interval,*speed,*position_coord_geo;
 
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	ret = g_new0(struct vehicle_priv, 1);
 	ret->cbl = cbl;
 	ret->interval=1000;
@@ -146,7 +146,7 @@ vehicle_iphone_new(struct vehicle_methods
 	if ((position_coord_geo=attr_search(attrs, NULL, attr_position_coord_geo))) {
 		ret->geo=*(position_coord_geo->u.coord_geo);
 		ret->position_set=1;
-		dbg(0,"position_set %f %f\n", ret->geo.lat, ret->geo.lng);
+		dbg(lvl_error,"position_set %f %f\n", ret->geo.lat, ret->geo.lng);
 	}
 	*meth = vehicle_iphone_methods;
 	ret->str_time[0] = '\0';
@@ -160,6 +160,6 @@ vehicle_iphone_new(struct vehicle_methods
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("iphone", vehicle_iphone_new);
 }
diff --git a/navit/vehicle/maemo/vehicle_maemo.c b/navit/vehicle/maemo/vehicle_maemo.c
index ff5fd5e8..67a31186 100644
--- a/navit/vehicle/maemo/vehicle_maemo.c
+++ b/navit/vehicle/maemo/vehicle_maemo.c
@@ -67,7 +67,7 @@ static void vehicle_maemo_callback(LocationGPSDevice *device, gpointer user_data
 	priv->sats_used=device->satellites_in_use;
 	callback_list_call_attr_0(priv->cbl, attr_position_sats);
 
-	dbg(1,"Got update with %u/%u satellites\n",priv->sats_used,priv->sats);
+	dbg(lvl_warning,"Got update with %u/%u satellites\n",priv->sats_used,priv->sats);
 
 	if (device->fix) {
 		switch(device->fix->mode) {
@@ -86,28 +86,28 @@ static void vehicle_maemo_callback(LocationGPSDevice *device, gpointer user_data
 			priv->geo.lng=device->fix->longitude;
 			priv->hdop=device->fix->eph/100;
 			callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
-			dbg(1,"Position: %f %f with error %f meters\n",priv->geo.lat,priv->geo.lng,priv->hdop);
+			dbg(lvl_warning,"Position: %f %f with error %f meters\n",priv->geo.lat,priv->geo.lng,priv->hdop);
 		}
 
 		if (device->fix->fields & LOCATION_GPS_DEVICE_SPEED_SET) {
 			priv->speed=device->fix->speed;
 			callback_list_call_attr_0(priv->cbl, attr_position_speed);
-			dbg(1,"Speed: %f\n ",priv->speed);
+			dbg(lvl_warning,"Speed: %f\n ",priv->speed);
 		}
 
 		if (device->fix->fields & LOCATION_GPS_DEVICE_TRACK_SET) {
 			priv->direction=device->fix->track;
-			dbg(1,"Direction: %f\n",priv->direction);
+			dbg(lvl_warning,"Direction: %f\n",priv->direction);
 		}
 
 		if (device->fix->fields & LOCATION_GPS_DEVICE_TIME_SET) {
 			priv->fix_time=device->fix->time;
-			dbg(1,"Time: %f\n",priv->fix_time);
+			dbg(lvl_warning,"Time: %f\n",priv->fix_time);
 		}
 
 		if (device->fix->fields & LOCATION_GPS_DEVICE_ALTITUDE_SET) {
 			priv->height=device->fix->altitude;
-			dbg(1,"Elevation: %f\n",priv->height);
+			dbg(lvl_warning,"Elevation: %f\n",priv->height);
 		}
 
 	}
@@ -119,19 +119,19 @@ static void vehicle_maemo_error(LocationGPSDControl *control, LocationGPSDContro
 { 
   switch (error) {
   case LOCATION_ERROR_USER_REJECTED_DIALOG:
-    dbg(0,"User didn't enable requested methods\n");
+    dbg(lvl_error,"User didn't enable requested methods\n");
     break;
   case LOCATION_ERROR_USER_REJECTED_SETTINGS:
-    dbg(0,"User changed settings, which disabled location\n");
+    dbg(lvl_error,"User changed settings, which disabled location\n");
     break;
   case LOCATION_ERROR_BT_GPS_NOT_AVAILABLE:
-    dbg(0,"Problems with BT GPS\n");
+    dbg(lvl_error,"Problems with BT GPS\n");
     break;
   case LOCATION_ERROR_METHOD_NOT_ALLOWED_IN_OFFLINE_MODE:
-    dbg(0,"Requested method is not allowed in offline mode\n");
+    dbg(lvl_error,"Requested method is not allowed in offline mode\n");
     break;
   case LOCATION_ERROR_SYSTEM:
-    dbg(0,"System error\n");
+    dbg(lvl_error,"System error\n");
     break;
   }
 }
@@ -148,54 +148,54 @@ vehicle_maemo_open(struct vehicle_priv *priv)
 
 	if (!strcasecmp(priv->source+8,"cwp")) {
 		g_object_set(G_OBJECT(priv->control),	"preferred-method", LOCATION_METHOD_CWP, NULL);
-		dbg(1,"Method set: CWP\n");
+		dbg(lvl_warning,"Method set: CWP\n");
 	} else if (!strcasecmp(priv->source+8,"acwp")) {
 		g_object_set(G_OBJECT(priv->control),	"preferred-method", LOCATION_METHOD_ACWP, NULL);
-		dbg(1,"Method set: ACWP\n");
+		dbg(lvl_warning,"Method set: ACWP\n");
 	} else if (!strcasecmp(priv->source+8,"gnss")) {
 		g_object_set(G_OBJECT(priv->control),	"preferred-method", LOCATION_METHOD_GNSS, NULL);
-		dbg(1,"Method set: GNSS\n");
+		dbg(lvl_warning,"Method set: GNSS\n");
 	} else if (!strcasecmp(priv->source+8,"agnss")) {
 		g_object_set(G_OBJECT(priv->control),	"preferred-method", LOCATION_METHOD_AGNSS, NULL); 
-		dbg(1,"Method set: AGNSS\n");
+		dbg(lvl_warning,"Method set: AGNSS\n");
 	} else {
 		g_object_set(G_OBJECT(priv->control),	"preferred-method", LOCATION_METHOD_USER_SELECTED, NULL); 
-		dbg(1,"Method set: ANY\n");
+		dbg(lvl_warning,"Method set: ANY\n");
 	}
 
 	switch (priv->retry_interval) {
 	case 2:
 		g_object_set(G_OBJECT(priv->control),	"preferred-interval", LOCATION_INTERVAL_2S,	NULL);
-		dbg(1,"Interval set: 2s\n");
+		dbg(lvl_warning,"Interval set: 2s\n");
 		break;
 	case 5:
 		g_object_set(G_OBJECT(priv->control),	"preferred-interval", LOCATION_INTERVAL_5S,	NULL);
-		dbg(1,"Interval set: 5s\n");
+		dbg(lvl_warning,"Interval set: 5s\n");
 		break;
 	case 10:
 		g_object_set(G_OBJECT(priv->control),	"preferred-interval", LOCATION_INTERVAL_10S,	NULL);
-		dbg(1,"Interval set: 10s\n");
+		dbg(lvl_warning,"Interval set: 10s\n");
 		break;
 	case 20:
 		g_object_set(G_OBJECT(priv->control),	"preferred-interval", LOCATION_INTERVAL_20S,	NULL);
-		dbg(1,"Interval set: 20s\n");
+		dbg(lvl_warning,"Interval set: 20s\n");
 		break;
 	case 30:
 		g_object_set(G_OBJECT(priv->control),	"preferred-interval", LOCATION_INTERVAL_30S,	NULL);
-		dbg(1,"Interval set: 30s\n");
+		dbg(lvl_warning,"Interval set: 30s\n");
 		break;
 	case 60:
 		g_object_set(G_OBJECT(priv->control),	"preferred-interval", LOCATION_INTERVAL_60S,	NULL);
-		dbg(1,"Interval set: 60s\n");
+		dbg(lvl_warning,"Interval set: 60s\n");
 		break;
 	case 120:
 		g_object_set(G_OBJECT(priv->control),	"preferred-interval", LOCATION_INTERVAL_120S,	NULL);
-		dbg(1,"Interval set: 120s\n");
+		dbg(lvl_warning,"Interval set: 120s\n");
 		break;
 	case 1:
 	default:
 		g_object_set(G_OBJECT(priv->control),	"preferred-interval", LOCATION_INTERVAL_1S,	NULL);
-		dbg(1,"Interval set: 1s\n");
+		dbg(lvl_warning,"Interval set: 1s\n");
 		break;
 	}
 
@@ -225,41 +225,41 @@ vehicle_maemo_position_attr_get(struct vehicle_priv *priv,
 	struct attr * active=NULL;
 	switch (type) {
 	case attr_position_fix_type:
-		dbg(1,"Attr requested: position_fix_type\n");
+		dbg(lvl_warning,"Attr requested: position_fix_type\n");
 		attr->u.num = priv->fix_type;
 		break;
 	case attr_position_height:
-		dbg(1,"Attr requested: position_height\n");
+		dbg(lvl_warning,"Attr requested: position_height\n");
 		attr->u.numd = &priv->height;
 		break;
 	case attr_position_speed:
-		dbg(1,"Attr requested: position_speed\n");
+		dbg(lvl_warning,"Attr requested: position_speed\n");
 		attr->u.numd = &priv->speed;
 		break;
 	case attr_position_direction:
-		dbg(1,"Attr requested: position_direction\n");
+		dbg(lvl_warning,"Attr requested: position_direction\n");
 		attr->u.numd = &priv->direction;
 		break;
 	case attr_position_hdop:
-		dbg(1,"Attr requested: position_hdop\n");
+		dbg(lvl_warning,"Attr requested: position_hdop\n");
 		attr->u.numd = &priv->hdop;
 		break;
 	case attr_position_sats:
-		dbg(1,"Attr requested: position_sats\n");
+		dbg(lvl_warning,"Attr requested: position_sats\n");
 		attr->u.num = priv->sats;
 		break;
 	case attr_position_sats_used:
-		dbg(1,"Attr requested: position_sats_used\n");
+		dbg(lvl_warning,"Attr requested: position_sats_used\n");
 		attr->u.num = priv->sats_used;
 		break;
 	case attr_position_coord_geo:
-		dbg(1,"Attr requested: position_coord_geo\n");
+		dbg(lvl_warning,"Attr requested: position_coord_geo\n");
 		attr->u.coord_geo = &priv->geo;
 		break;
 	case attr_position_time_iso8601:
 		{
 		struct tm tm;
-		dbg(1,"Attr requested: position_time_iso8601\n");
+		dbg(lvl_warning,"Attr requested: position_time_iso8601\n");
 		if (!priv->fix_time)
 			return 0;
 		if (gmtime_r(&priv->fix_time, &tm)) {
@@ -271,7 +271,7 @@ vehicle_maemo_position_attr_get(struct vehicle_priv *priv,
 		}
 		break;
 	case attr_active:
-		dbg(1,"Attr requested: position_active\n");
+		dbg(lvl_warning,"Attr requested: position_active\n");
 		active = attr_search(priv->attrs,NULL,attr_active);
 		if(active != NULL) {
 			attr->u.num=active->u.num;
@@ -299,7 +299,7 @@ vehicle_maemo_new_maemo(struct vehicle_methods
 	struct vehicle_priv *ret;
 	struct attr *source, *retry_int;
 
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	source = attr_search(attrs, NULL, attr_source);
 	ret = g_new0(struct vehicle_priv, 1);
 	ret->source = g_strdup(source->u.str);
@@ -307,13 +307,13 @@ vehicle_maemo_new_maemo(struct vehicle_methods
 	if (retry_int) {
 		ret->retry_interval = retry_int->u.num;
 		if (ret->retry_interval !=1 && ret->retry_interval !=2 && ret->retry_interval !=5 && ret->retry_interval !=10 && ret->retry_interval !=20 && ret->retry_interval !=30 && ret->retry_interval !=60 && ret->retry_interval !=120 ) {
-			dbg(0, "Retry interval %d invalid, setting to 1\n", ret->retry_interval,1);
+			dbg(lvl_error, "Retry interval %d invalid, setting to 1\n", ret->retry_interval,1);
 			ret->retry_interval = 1;
 		}
 	} else {
 		ret->retry_interval = 1;
 	}
-	dbg(1,"source: %s, interval: %u\n",ret->source,ret->retry_interval);
+	dbg(lvl_warning,"source: %s, interval: %u\n",ret->source,ret->retry_interval);
 	ret->cbl = cbl;
 	*meth = vehicle_maemo_methods;
 	ret->attrs = attrs;
@@ -324,6 +324,6 @@ vehicle_maemo_new_maemo(struct vehicle_methods
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("maemo", vehicle_maemo_new_maemo);
 }
diff --git a/navit/vehicle/null/vehicle_null.c b/navit/vehicle/null/vehicle_null.c
index 79d15bcd..30e9a4d9 100644
--- a/navit/vehicle/null/vehicle_null.c
+++ b/navit/vehicle/null/vehicle_null.c
@@ -59,7 +59,7 @@ struct vehicle_priv {
 static void
 vehicle_null_destroy(struct vehicle_priv *priv)
 {
-	dbg(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 	g_free(priv);
 }
 
@@ -75,7 +75,7 @@ static int
 vehicle_null_position_attr_get(struct vehicle_priv *priv,
 			       enum attr_type type, struct attr *attr)
 {
-	dbg(1,"enter %s\n",attr_to_name(type));
+	dbg(lvl_warning,"enter %s\n",attr_to_name(type));
 	switch (type) {
 #if 0
 	case attr_position_fix_type:
@@ -114,7 +114,7 @@ vehicle_null_position_attr_get(struct vehicle_priv *priv,
 	default:
 		return 0;
 	}
-	dbg(1,"ok\n");
+	dbg(lvl_warning,"ok\n");
 	attr->type = type;
 	return 1;
 }
@@ -162,11 +162,11 @@ vehicle_null_new_null(struct vehicle_methods *meth,
 {
 	struct vehicle_priv *ret;
 
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	ret = g_new0(struct vehicle_priv, 1);
 	ret->cbl = cbl;
 	*meth = vehicle_null_methods;
-	dbg(1, "return\n");
+	dbg(lvl_warning, "return\n");
 	return ret;
 }
 
@@ -178,6 +178,6 @@ vehicle_null_new_null(struct vehicle_methods *meth,
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("null", vehicle_null_new_null);
 }
diff --git a/navit/vehicle/webos/bluetooth.c b/navit/vehicle/webos/bluetooth.c
index 12271141..13534237 100644
--- a/navit/vehicle/webos/bluetooth.c
+++ b/navit/vehicle/webos/bluetooth.c
@@ -25,10 +25,10 @@ static void
 mlPDL_ServiceCall_callback(struct callback_list *cbl, char *service, char *parameters/*, struct callback *fail_cb*/)
 {
 	PDL_Err err;
-	dbg(1,"PDL_ServiceCall(%s) parameters(%s)\n",service,parameters);
+	dbg(lvl_warning,"PDL_ServiceCall(%s) parameters(%s)\n",service,parameters);
 	err = PDL_ServiceCall(service, parameters);
 	if (err != PDL_NOERROR) {
-		dbg(0,"PDL_ServiceCall to (%s) with (%s) failed with (%d): (%s)\n", service, parameters, err, PDL_GetError());
+		dbg(lvl_error,"PDL_ServiceCall to (%s) with (%s) failed with (%d): (%s)\n", service, parameters, err, PDL_GetError());
 	}
 
 	callback_list_destroy(cbl);
@@ -50,7 +50,7 @@ mlPDL_ServiceCall(const char *service, const char *parameters/*, struct callback
 
 	callback_list_add(cbl, cb);
 
-dbg(0,"event_call_callback(%p)\n",cbl);
+dbg(lvl_error,"event_call_callback(%p)\n",cbl);
 	event_call_callback(cbl);
 }
 
@@ -65,10 +65,10 @@ mlPDL_ServiceCallWithCallback_callback(struct callback_list *cbl,
 		PDL_bool removeAfterResponse)
 {
 	PDL_Err err;
-	dbg(1,"PDL_ServiceCallWithCallback(%s) parameters(%s)\n",service,parameters);
+	dbg(lvl_warning,"PDL_ServiceCallWithCallback(%s) parameters(%s)\n",service,parameters);
 	err = PDL_ServiceCallWithCallback(service, parameters, callback, user, removeAfterResponse);
 	if (err != PDL_NOERROR) {
-		dbg(0,"PDL_ServiceCallWithCallback to (%s) with (%s) failed with (%d): (%s)\n", service, parameters, err, PDL_GetError());
+		dbg(lvl_error,"PDL_ServiceCallWithCallback to (%s) with (%s) failed with (%d): (%s)\n", service, parameters, err, PDL_GetError());
 	}
 
 	callback_list_destroy(cbl);
@@ -94,7 +94,7 @@ mlPDL_ServiceCallWithCallback(const char *service,
 
 	callback_list_add(cbl, cb);
 
-	dbg(0,"event_call_callback(%p)\n",cbl);
+	dbg(lvl_error,"event_call_callback(%p)\n",cbl);
 	event_call_callback(cbl);
 }
 
@@ -107,11 +107,11 @@ vehicle_webos_init_pdl_locationtracking_callback(struct vehicle_priv *priv, stru
 
 	priv->gps_type = param ? GPS_TYPE_INT: GPS_TYPE_NONE;
 
-	dbg(1,"Calling PDL_EnableLocationTracking(%i)\n",param);
+	dbg(lvl_warning,"Calling PDL_EnableLocationTracking(%i)\n",param);
 	err = PDL_EnableLocationTracking(param);
 
 	if (err != PDL_NOERROR) {
-		dbg(0,"PDL_EnableLocationTracking failed with (%d): (%s)\n", err, PDL_GetError());
+		dbg(lvl_error,"PDL_EnableLocationTracking failed with (%d): (%s)\n", err, PDL_GetError());
 //		vehicle_webos_close(priv);
 //		return 0;
 	}
@@ -146,10 +146,10 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer)
 	int valid=0;
 	int ret = 0;
 
-	dbg(2, "enter: buffer='%s'\n", buffer);
+	dbg(lvl_info, "enter: buffer='%s'\n", buffer);
 	for (;;) {
 		if (len < 4) {
-			dbg(0, "'%s' too short\n", buffer);
+			dbg(lvl_error, "'%s' too short\n", buffer);
 			return ret;
 		}
 		if (buffer[len - 1] == '\r' || buffer[len - 1] == '\n') {
@@ -160,22 +160,22 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer)
 			break;
 	}
 	if (buffer[0] != '$') {
-		dbg(0, "no leading $ in '%s'\n", buffer);
+		dbg(lvl_error, "no leading $ in '%s'\n", buffer);
 		return ret;
 	}
 	if (buffer[len - 3] != '*') {
-		dbg(0, "no *XX in '%s'\n", buffer);
+		dbg(lvl_error, "no *XX in '%s'\n", buffer);
 		return ret;
 	}
 	for (i = 1; i < len - 3; i++) {
 		csum ^= (unsigned char) (buffer[i]);
 	}
 	if (!sscanf(buffer + len - 2, "%x", &bcsum) /*&& priv->checksum_ignore != 2*/) {
-		dbg(0, "no checksum in '%s'\n", buffer);
+		dbg(lvl_error, "no checksum in '%s'\n", buffer);
 		return ret;
 	}
 	if (bcsum != csum /*&& priv->checksum_ignore == 0*/) {
-		dbg(0, "wrong checksum in '%s was %x should be %x'\n", buffer,bcsum,csum);
+		dbg(lvl_error, "wrong checksum in '%s was %x should be %x'\n", buffer,bcsum,csum);
 		return ret;
 	}
 
@@ -184,7 +184,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer)
 		g_free(priv->nmea_data_buf);
 		priv->nmea_data_buf=nmea_data_buf;
 	} else {
-		dbg(0, "nmea buffer overflow, discarding '%s'\n", buffer);
+		dbg(lvl_error, "nmea buffer overflow, discarding '%s'\n", buffer);
 	}
 	i = 0;
 	p = buffer;
@@ -203,7 +203,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer)
 
 		priv->delta = 0; //			(unsigned int)difftime(tv.tv_sec, priv->fix_time);
 //		priv->fix_time = tv.tv_sec;
-//		dbg(2,"delta(%i)\n",priv->delta);
+//		dbg(lvl_info,"delta(%i)\n",priv->delta);
 //	}
 
 	if (!strncmp(buffer, "$GPGGA", 6)) {
@@ -230,7 +230,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer)
 			if (!g_strcasecmp(item[5],"W"))
 				priv->geo.lng=-priv->geo.lng;
 			priv->valid=attr_position_valid_valid;
-         dbg(2, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng);
+         dbg(lvl_info, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng);
 
 		} else
 			priv->valid=attr_position_valid_invalid;
@@ -275,7 +275,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer)
 		if (valid) {
 			priv->track = g_ascii_strtod( item[1], NULL );
 			priv->speed = g_ascii_strtod( item[7], NULL );
-			dbg(2,"direction %lf, speed %2.1lf\n", priv->track, priv->speed);
+			dbg(lvl_info,"direction %lf, speed %2.1lf\n", priv->track, priv->speed);
 		}
 	}
 	if (!strncmp(buffer, "$GPRMC", 6)) {
@@ -380,7 +380,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer)
 	*/
 		if (item[1]) {
 			priv->magnetic_direction = g_ascii_strtod( item[1], NULL );
-			dbg(1,"magnetic %d\n", priv->magnetic_direction);
+			dbg(lvl_warning,"magnetic %d\n", priv->magnetic_direction);
 		}
 	}
 	return ret;
@@ -396,14 +396,14 @@ vehicle_webos_spp_handle_read(PDL_ServiceParameters *params, void *user)
 	//PDL_Err err;
 	size = PDL_GetParamInt(params, "dataLength");
 	if (size > buffer_size) {
-		dbg(0, "read returned too much data\n");
+		dbg(lvl_error, "read returned too much data\n");
 		return;
 	}
 
 	char buffer[buffer_size];
 
 	PDL_GetParamString(params,"data",buffer,buffer_size);
-	dbg(9,"data(%s) dataLength(%i)\n",buffer,size);
+	dbg(lvl_debug,"data(%s) dataLength(%i)\n",buffer,size);
 
 	memmove(priv->buffer + priv->buffer_pos, buffer, size);
 
@@ -411,12 +411,12 @@ vehicle_webos_spp_handle_read(PDL_ServiceParameters *params, void *user)
 
 	priv->buffer_pos += size;
 	priv->buffer[priv->buffer_pos] = '\0';
-	dbg(1, "size=%d pos=%d buffer='%s'\n", size,
+	dbg(lvl_warning, "size=%d pos=%d buffer='%s'\n", size,
 	    priv->buffer_pos, priv->buffer);
 	str = priv->buffer;
 	while ((tok = strchr(str, '\n'))) {
 		*tok++ = '\0';
-		dbg(1, "line='%s'\n", str);
+		dbg(lvl_warning, "line='%s'\n", str);
 		rc += vehicle_webos_parse_nmea(priv, str);
 		str = tok;
 //		if (priv->file_type == file_type_file && rc)
@@ -427,10 +427,10 @@ vehicle_webos_spp_handle_read(PDL_ServiceParameters *params, void *user)
 		size = priv->buffer + priv->buffer_pos - str;
 		memmove(priv->buffer, str, size + 1);
 		priv->buffer_pos = size;
-		dbg(1,"now pos=%d buffer='%s'\n",
+		dbg(lvl_warning,"now pos=%d buffer='%s'\n",
 		    priv->buffer_pos, priv->buffer);
 	} else if (priv->buffer_pos == buffer_size - 1) {
-		dbg(0,"Overflow. Most likely wrong baud rate or no nmea protocol\n");
+		dbg(lvl_error,"Overflow. Most likely wrong baud rate or no nmea protocol\n");
 		priv->buffer_pos = 0;
 	}
 	if (rc) {
@@ -466,7 +466,7 @@ vehicle_webos_spp_init_read(struct vehicle_priv *priv, unsigned int length)
 			);
 #if 0
 	if (err != PDL_NOERROR) {
-		dbg(0,"PDL_ServiceCall failed with (%d): (%s)\n", err, PDL_GetError());
+		dbg(lvl_error,"PDL_ServiceCall failed with (%d): (%s)\n", err, PDL_GetError());
 		vehicle_webos_close(priv);
 		return;
 	}
@@ -481,7 +481,7 @@ vehicle_webos_spp_handle_open(PDL_ServiceParameters *params, void *user)
 	if (!priv->buffer)
 		priv->buffer = g_malloc(buffer_size);
 	
-	dbg(1,"instanceId(%i)\n",priv->spp_instance_id);
+	dbg(lvl_warning,"instanceId(%i)\n",priv->spp_instance_id);
 
 	priv->gps_type = GPS_TYPE_BT;
 
@@ -497,27 +497,27 @@ vehicle_webos_spp_notify(PDL_ServiceParameters *params, void *user)
 	char parameters[128];
 
 	const char *params_json = PDL_GetParamJson(params);
-	dbg(2,"params_json(%s)\n", params_json);
+	dbg(lvl_info,"params_json(%s)\n", params_json);
 
 	if (PDL_ParamExists(params, "errorText")) {
 		PDL_GetParamString(params, "errorText", notification, sizeof(notification));
-		dbg(0,"errorText(%s)\n",notification);
+		dbg(lvl_error,"errorText(%s)\n",notification);
 		return;
 	}
 
 	PDL_GetParamString(params, "notification", notification, sizeof(notification));
 	notification[sizeof(notification)-1] = '\0';
 
-	dbg(1,"notification(%s) %i\n",notification,PDL_ParamExists(params, "notification"));
+	dbg(lvl_warning,"notification(%s) %i\n",notification,PDL_ParamExists(params, "notification"));
 
 	if(strcmp(notification,"notifnservicenames") == 0) {
 		int instance_id = PDL_GetParamInt(params, "instanceId");
 
-		dbg(1,"instanceId(%i)\n", instance_id);
+		dbg(lvl_warning,"instanceId(%i)\n", instance_id);
 
 		cJSON *root = cJSON_Parse(params_json);
 		if (!root) {
-			dbg(0,"parsing json failed\n");
+			dbg(lvl_error,"parsing json failed\n");
 			return;
 		}
 
@@ -544,7 +544,7 @@ vehicle_webos_spp_notify(PDL_ServiceParameters *params, void *user)
 					PDL_TRUE);
 		}
 		else {
-			dbg(0,"notifnconnected error(%i)\n",PDL_GetParamInt(params,"error"));
+			dbg(lvl_error,"notifnconnected error(%i)\n",PDL_GetParamInt(params,"error"));
 		}
 	}
 	else if(strcmp(notification,"notifndisconnected") == 0) {
@@ -563,7 +563,7 @@ vehicle_webos_init_bt_gps(struct vehicle_priv *priv, char *addr)
 {
 	char parameters[128];
 
-	dbg(1,"subscribeNotifications\n");
+	dbg(lvl_warning,"subscribeNotifications\n");
 	mlPDL_ServiceCallWithCallback("palm://com.palm.bluetooth/spp/subscribenotifications",
 			"{\"subscribe\":true}",
 			(PDL_ServiceCallbackFunc)vehicle_webos_spp_notify,
@@ -571,7 +571,7 @@ vehicle_webos_init_bt_gps(struct vehicle_priv *priv, char *addr)
 			PDL_FALSE);
 #if 0
 	if (err != PDL_NOERROR) {
-		dbg(0,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError());
+		dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError());
 		vehicle_webos_close(priv);
 		return;
 	}
@@ -581,7 +581,7 @@ vehicle_webos_init_bt_gps(struct vehicle_priv *priv, char *addr)
 	mlPDL_ServiceCall("palm://com.palm.bluetooth/spp/connect", parameters);
 #if 0
 	if (err != PDL_NOERROR) {
-		dbg(0,"PDL_ServiceCall failed with (%d): (%s)\n", err, PDL_GetError());
+		dbg(lvl_error,"PDL_ServiceCall failed with (%d): (%s)\n", err, PDL_GetError());
 		vehicle_webos_close(priv);
 		return;
 	}
@@ -598,38 +598,38 @@ vehicle_webos_bt_gap_callback(PDL_ServiceParameters *params, void *param)
 	char *device_addr = NULL;
 	cJSON *root;
 
-	dbg(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 
 	PDL_Err err;
 	err = PDL_GetParamInt(params, "errorCode");
 	if (err != PDL_NOERROR) {
-		dbg(0,"BT GAP Callback errorCode %d\n", err);
+		dbg(lvl_error,"BT GAP Callback errorCode %d\n", err);
 		return /*PDL_EOTHER*/;
 	}
 
 	params_json = PDL_GetParamJson(params);
-	dbg(2,"params_json(%s)\n",params_json);
+	dbg(lvl_info,"params_json(%s)\n",params_json);
 
 	root = cJSON_Parse(params_json);
 	if (!root) {
-		dbg(0,"parsing json failed\n");
+		dbg(lvl_error,"parsing json failed\n");
 		return;
 	}
 
 	cJSON *trusted_devices = cJSON_GetObjectItem(root, "trusteddevices");
 
 	unsigned int i,c = cJSON_GetArraySize(trusted_devices);
-	dbg(1, "trusted_devices(%i)\n",c);
+	dbg(lvl_warning, "trusted_devices(%i)\n",c);
 	for(i=0; i < c && !device_addr; i++) {
 		cJSON *device = cJSON_GetArrayItem(trusted_devices,i);
 		char *name = cJSON_GetObjectItem(device, "name")->valuestring;
 		char *address = cJSON_GetObjectItem(device, "address")->valuestring;
 		char *status = cJSON_GetObjectItem(device, "status")->valuestring;
 
-		dbg(1,"i(%i) name(%s) address(%s) status(%s)\n",i,name,address,status);
+		dbg(lvl_warning,"i(%i) name(%s) address(%s) status(%s)\n",i,name,address,status);
 
 		if (/*strncmp(status, "connected",9) == 0 && */strstr(name, "GPS") != NULL) {
-			dbg(1,"choose name(%s) address(%s)\n",name,address);
+			dbg(lvl_warning,"choose name(%s) address(%s)\n",name,address);
 			device_addr = g_strdup(address);
 			break;
 		}
@@ -649,7 +649,7 @@ vehicle_webos_bt_open(struct vehicle_priv *priv)
 {
 	// Try to connect to BT GPS, or use PDL method
 
-	dbg(1,"enter\n");
+	dbg(lvl_warning,"enter\n");
 
 	PDL_Err err;
 	err = PDL_ServiceCallWithCallback("palm://com.palm.bluetooth/gap/gettrusteddevices",
@@ -658,7 +658,7 @@ vehicle_webos_bt_open(struct vehicle_priv *priv)
 			priv,
 			PDL_TRUE);
 	if (err != PDL_NOERROR) {
-		dbg(0,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError());
+		dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError());
 		vehicle_webos_close(priv);
 		return 0;
 	}
@@ -668,7 +668,7 @@ vehicle_webos_bt_open(struct vehicle_priv *priv)
 void
 vehicle_webos_bt_close(struct vehicle_priv *priv)
 {
-	dbg(0,"XXX\n");
+	dbg(lvl_error,"XXX\n");
 	char parameters[128];
 	if (priv->spp_instance_id) {
 		snprintf(parameters, sizeof(parameters), "{\"instanceId\":%i}", priv->spp_instance_id);
diff --git a/navit/vehicle/webos/vehicle_webos.c b/navit/vehicle/webos/vehicle_webos.c
index bfbf1133..f4fcb0f9 100644
--- a/navit/vehicle/webos/vehicle_webos.c
+++ b/navit/vehicle/webos/vehicle_webos.c
@@ -51,7 +51,7 @@ vehicle_webos_callback(PDL_ServiceParameters *params, void *priv)
 
 	err = PDL_GetParamInt(params, "errorCode");
 	if (err != 0) {
-		dbg(0,"Location Callback errorCode %d\n", err);
+		dbg(lvl_error,"Location Callback errorCode %d\n", err);
 		return /*PDL_EOTHER*/;
 	}
 
@@ -85,14 +85,14 @@ vehicle_webos_gps_update(struct vehicle_priv *priv, PDL_Location *location)
 		gettimeofday(&tv,NULL);
 
 		priv->delta = (int)difftime(tv.tv_sec, priv->fix_time);
-		dbg(2,"delta(%i)\n",priv->delta);
+		dbg(lvl_info,"delta(%i)\n",priv->delta);
 		priv->fix_time = tv.tv_sec;
 		priv->geo.lat = location->latitude;
 		/* workaround for webOS GPS bug following */
 		priv->geo.lng = (priv->pdk_version >= 200 && location->longitude >= -1 && location->longitude <= 1) ?
 			-location->longitude : location->longitude;
 
-		dbg(2,"Location: %f %f %f %.12g %.12g +-%fm\n",
+		dbg(lvl_info,"Location: %f %f %f %.12g %.12g +-%fm\n",
 				location->altitude,
 				location->velocity,
 				location->heading,
@@ -126,7 +126,7 @@ vehicle_webos_timeout_callback(struct vehicle_priv *priv)
 		int delta = (int)difftime(tv.tv_sec, priv->fix_time);
 
 		if (delta >= priv->delta*2) {
-			dbg(1, "GPS timeout triggered cb(%p) delta(%d)\n", priv->timeout_cb, delta);
+			dbg(lvl_warning, "GPS timeout triggered cb(%p) delta(%d)\n", priv->timeout_cb, delta);
 
 			priv->delta = -1;
 
@@ -157,7 +157,7 @@ vehicle_webos_open(struct vehicle_priv *priv)
 	PDL_Err err;
 
 	priv->pdk_version = PDL_GetPDKVersion();
-	dbg(1,"pdk_version(%d)\n", priv->pdk_version);
+	dbg(lvl_warning,"pdk_version(%d)\n", priv->pdk_version);
 
 	if (priv->pdk_version <= 100) {
 		// Use Location Service via callback interface
@@ -167,7 +167,7 @@ vehicle_webos_open(struct vehicle_priv *priv)
 				priv,
 				PDL_FALSE);
 		if (err != PDL_NOERROR) {
-			dbg(0,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError());
+			dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError());
 			vehicle_webos_close(priv);
 			return 0;
 		}
@@ -176,7 +176,7 @@ vehicle_webos_open(struct vehicle_priv *priv)
 		PDL_Err err;
 		err = PDL_EnableLocationTracking(PDL_TRUE);
 		if (err != PDL_NOERROR) {
-			dbg(0,"PDL_EnableLocationTracking failed with (%d): (%s)\n", err, PDL_GetError());
+			dbg(lvl_error,"PDL_EnableLocationTracking failed with (%d): (%s)\n", err, PDL_GetError());
 //			vehicle_webos_close(priv);
 //			return 0;
 		}
@@ -206,15 +206,15 @@ vehicle_webos_position_attr_get(struct vehicle_priv *priv,
 {
 	switch (type) {
 		case attr_position_height:
-			dbg(2,"Altitude: %f\n", priv->altitude);
+			dbg(lvl_info,"Altitude: %f\n", priv->altitude);
 			attr->u.numd = &priv->altitude;
 			break;
 		case attr_position_speed:
-			dbg(2,"Speed: %f\n", priv->speed);
+			dbg(lvl_info,"Speed: %f\n", priv->speed);
 			attr->u.numd = &priv->speed;
 			break;
 		case attr_position_direction:
-			dbg(2,"Direction: %f\n", priv->track);
+			dbg(lvl_info,"Direction: %f\n", priv->track);
 			attr->u.numd = &priv->track;
 			break;
 		case attr_position_magnetic_direction:
@@ -238,11 +238,11 @@ vehicle_webos_position_attr_get(struct vehicle_priv *priv,
 			}
 			break;
 		case attr_position_coord_geo:
-			dbg(2,"Coord: %.12g %.12g\n", priv->geo.lat, priv->geo.lng);
+			dbg(lvl_info,"Coord: %.12g %.12g\n", priv->geo.lat, priv->geo.lng);
 			attr->u.coord_geo = &priv->geo;
 			break;
 		case attr_position_radius:
-			dbg(2,"Radius: %f\n", priv->radius);
+			dbg(lvl_info,"Radius: %f\n", priv->radius);
 			attr->u.numd = &priv->radius;
 			break;
 		case attr_position_time_iso8601:
@@ -257,10 +257,10 @@ vehicle_webos_position_attr_get(struct vehicle_priv *priv,
 					priv->fix_time = 0;
 					return 0;
 				}
-				dbg(2,"Fix Time: %d %s\n", priv->fix_time, priv->fixiso8601);
+				dbg(lvl_info,"Fix Time: %d %s\n", priv->fix_time, priv->fixiso8601);
 			}
 			else {
-				dbg(2,"Fix Time: %d\n", priv->fix_time);
+				dbg(lvl_info,"Fix Time: %d\n", priv->fix_time);
 				return 0;
 			}
 
@@ -318,7 +318,7 @@ vehicle_webos_set_attr_do(struct vehicle_priv *priv, struct attr *attr, int init
 	switch (attr->type) {
 		case attr_source:
 			if (strncmp(vehicle_webos_prefix,attr->u.str,strlen(vehicle_webos_prefix))) {
-				dbg(1,"source must start with '%s'\n", vehicle_webos_prefix);
+				dbg(lvl_warning,"source must start with '%s'\n", vehicle_webos_prefix);
 				return 0;
 			}
 			g_free(priv->source);
@@ -380,7 +380,7 @@ vehicle_webos_new(struct vehicle_methods
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("webos", vehicle_webos_new);
 }
 
diff --git a/navit/vehicle/wince/vehicle_wince.c b/navit/vehicle/wince/vehicle_wince.c
index 1f3f42f4..be68cd94 100644
--- a/navit/vehicle/wince/vehicle_wince.c
+++ b/navit/vehicle/wince/vehicle_wince.c
@@ -146,7 +146,7 @@ static void initBth(struct vehicle_priv *priv)
 			priv->BthSetMode  = (PFN_BthSetMode)GetProcAddress(priv->hBthDll, TEXT("BthSetMode") );
 			if( priv->BthSetMode &&  priv->BthSetMode(1) == ERROR_SUCCESS )
 			{
-				dbg(1, "bluetooth activated\n");
+				dbg(lvl_warning, "bluetooth activated\n");
 				succeeded = TRUE;
 			}
 		}
@@ -154,13 +154,13 @@ static void initBth(struct vehicle_priv *priv)
 	}
 	else
 	{
-		dbg(0, "Bluetooth library notfound\n");
+		dbg(lvl_error, "Bluetooth library notfound\n");
 	}
 
 	if ( !succeeded )
 	{
 
-		dbg(1, "Bluetooth already enabled or failed to enable it.\n");
+		dbg(lvl_warning, "Bluetooth already enabled or failed to enable it.\n");
 		priv->BthSetMode = NULL;
 		if ( priv->hBthDll )
 		{
@@ -178,7 +178,7 @@ static int initDevice(struct vehicle_priv *priv)
 	
 	if ( priv->file_type == file_type_device )
 	{
-		dbg(0, "Init Device\n");
+		dbg(lvl_error, "Init Device\n");
 		/* GPD0 is the control port for the GPS driver */
 		hGPS = CreateFile(L"GPD0:", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
 		if (hGPS != INVALID_HANDLE_VALUE) {
@@ -199,7 +199,7 @@ static int initDevice(struct vehicle_priv *priv)
 				NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) 
 		{
 			Sleep(1000);
-			dbg(0, "Waiting to connect to %s\n", priv->source);
+			dbg(lvl_error, "Waiting to connect to %s\n", priv->source);
 		}
 		GetCommTimeouts (priv->m_hGPSDevice, &commTiming);
 		commTiming.ReadIntervalTimeout = 20;
@@ -230,11 +230,11 @@ static int initDevice(struct vehicle_priv *priv)
 	}
 	else
 	{
-		dbg(0, "Open File\n");
+		dbg(lvl_error, "Open File\n");
 		priv->m_hGPSDevice = CreateFileW( A2W(priv->source),
 			GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0);
 		if ( priv->m_hGPSDevice == INVALID_HANDLE_VALUE) {
-			dbg(0, "Could not open %s\n", priv->source);
+			dbg(lvl_error, "Could not open %s\n", priv->source);
 			return 0;
 		}
 	}
@@ -264,7 +264,7 @@ static DWORD WINAPI wince_reader_thread (LPVOID lParam)
 	DWORD bytes_read;
 	int waitcounter;
 	
-	dbg(0, "GPS Port:[%s]\n", priv->source);
+	dbg(lvl_error, "GPS Port:[%s]\n", priv->source);
 	priv->thread_up = 1;
 	
 	if ( !initDevice(priv) ) {
@@ -272,7 +272,7 @@ static DWORD WINAPI wince_reader_thread (LPVOID lParam)
 	}
 	while (priv->is_running)
 	{
-		dbg(1,"readfile\n");
+		dbg(lvl_warning,"readfile\n");
 		waitcounter = 0;
 		status = ReadFile(priv->m_hGPSDevice,
 			chunk_buffer, sizeof(chunk_buffer),
@@ -280,7 +280,7 @@ static DWORD WINAPI wince_reader_thread (LPVOID lParam)
 
 		if ( !status )
 		{
-			dbg(0,"Error reading file/device. Try again.\n");
+			dbg(lvl_error,"Error reading file/device. Try again.\n");
 			initDevice(priv);
 			continue;
 		}
@@ -290,24 +290,24 @@ static DWORD WINAPI wince_reader_thread (LPVOID lParam)
 			/* TODO (rikky#1#): should use blocking */
 			if ( priv->file_type != file_type_file )
 			{
-				dbg(3, "GPS data comes too fast. Have to wait here\n");
+				dbg(lvl_debug, "GPS data comes too fast. Have to wait here\n");
 			}
 
 			Sleep(50);
 			waitcounter++;
 			if ( waitcounter % 8 == 0 )
 			{
-				dbg(1, "Remind them of the data\n");
+				dbg(lvl_warning, "Remind them of the data\n");
 				event_call_callback(priv->priv_cbl);
 			}
 			if(waitcounter % 200 == 0) {
-				dbg(0,"Will main thread ever be ready for the GPS data? Already %d intervals gone.\n",waitcounter);
+				dbg(lvl_error,"Will main thread ever be ready for the GPS data? Already %d intervals gone.\n",waitcounter);
 			}
 
 		}
 		
 		if(waitcounter>2)
-			dbg(0,"Sent GPS data to the main thread after %d intervals delay.\n",waitcounter);
+			dbg(lvl_error,"Sent GPS data to the main thread after %d intervals delay.\n",waitcounter);
 
 		g_mutex_lock(&priv->lock);
 		memcpy(priv->read_buffer + priv->read_buffer_pos , chunk_buffer, bytes_read );
@@ -348,11 +348,11 @@ vehicle_wince_available_ports(void)
 				regdevtype_length = sizeof(devicetype);
 				if ( RegQueryValueEx( hkSubResult, L"Key", NULL, NULL, (LPBYTE)devicetype, &regdevtype_length) == ERROR_SUCCESS )
 				{
-					dbg(0, "Found device '%s' (%s)\n", W2A(devicename), W2A(devicetype));
+					dbg(lvl_error, "Found device '%s' (%s)\n", W2A(devicename), W2A(devicetype));
 				}
 				else
 				{
-					dbg(0, "Found device '%s'\n", W2A(devicename));
+					dbg(lvl_error, "Found device '%s'\n", W2A(devicename));
 				}
 			}
 			RegCloseKey(hkSubResult);
@@ -372,7 +372,7 @@ vehicle_wince_open(struct vehicle_priv *priv)
 	char* strport;
 	char* strsettings;
 
-	dbg(1, "enter vehicle_wince_open, priv->source='%s'\n", priv->source);
+	dbg(lvl_warning, "enter vehicle_wince_open, priv->source='%s'\n", priv->source);
 
 	if (priv->source ) {
 
@@ -391,7 +391,7 @@ vehicle_wince_open(struct vehicle_priv *priv)
 			*strsettings = '\0';
 			strsettings++;
 
-			dbg(0, "serial('%s', '%s')\n", strport, strsettings );
+			dbg(lvl_error, "serial('%s', '%s')\n", strport, strsettings );
 		}
 		if (raw_setting_str)
 		g_free( raw_setting_str );
@@ -402,7 +402,7 @@ vehicle_wince_open(struct vehicle_priv *priv)
 static void
 vehicle_wince_close(struct vehicle_priv *priv)
 {
-	dbg(1,"enter");
+	dbg(lvl_warning,"enter");
 }
 
 static int
@@ -416,10 +416,10 @@ vehicle_wince_parse(struct vehicle_priv *priv, char *buffer)
 	int valid=0;
 	int ret = 0;
 
-	dbg(2, "enter: buffer='%s'\n", buffer);
+	dbg(lvl_info, "enter: buffer='%s'\n", buffer);
 	for (;;) {
 		if (len < 4) {
-			dbg(0, "'%s' too short\n", buffer);
+			dbg(lvl_error, "'%s' too short\n", buffer);
 			return ret;
 		}
 		if (buffer[len - 1] == '\r' || buffer[len - 1] == '\n') {
@@ -430,22 +430,22 @@ vehicle_wince_parse(struct vehicle_priv *priv, char *buffer)
 			break;
 	}
 	if (buffer[0] != '$') {
-		dbg(0, "no leading $ in '%s'\n", buffer);
+		dbg(lvl_error, "no leading $ in '%s'\n", buffer);
 		return ret;
 	}
 	if (buffer[len - 3] != '*') {
-		dbg(0, "no *XX in '%s'\n", buffer);
+		dbg(lvl_error, "no *XX in '%s'\n", buffer);
 		return ret;
 	}
 	for (i = 1; i < len - 3; i++) {
 		csum ^= (unsigned char) (buffer[i]);
 	}
 	if (!sscanf(buffer + len - 2, "%x", &bcsum) && priv->checksum_ignore != 2) {
-		dbg(0, "no checksum in '%s'\n", buffer);
+		dbg(lvl_error, "no checksum in '%s'\n", buffer);
 		return ret;
 	}
 	if (bcsum != csum && priv->checksum_ignore == 0) {
-		dbg(0, "wrong checksum in '%s'\n", buffer);
+		dbg(lvl_error, "wrong checksum in '%s'\n", buffer);
 		return ret;
 	}
 
@@ -454,7 +454,7 @@ vehicle_wince_parse(struct vehicle_priv *priv, char *buffer)
 		g_free(priv->nmea_data_buf);
 		priv->nmea_data_buf=nmea_data_buf;
 	} else {
-		dbg(0, "nmea buffer overflow, discarding '%s'\n", buffer);
+		dbg(lvl_error, "nmea buffer overflow, discarding '%s'\n", buffer);
 	}
 	i = 0;
 	p = buffer;
@@ -491,7 +491,7 @@ vehicle_wince_parse(struct vehicle_priv *priv, char *buffer)
 			if (!g_strcasecmp(item[5],"W"))
 				priv->geo.lng=-priv->geo.lng;
 			priv->valid=attr_position_valid_valid;
-		dbg(2, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng);
+		dbg(lvl_info, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng);
 
 		} else
 			priv->valid=attr_position_valid_invalid;
@@ -523,7 +523,7 @@ vehicle_wince_parse(struct vehicle_priv *priv, char *buffer)
 		if (valid) {
 			priv->direction = g_ascii_strtod( item[1], NULL );
 			priv->speed = g_ascii_strtod( item[7], NULL );
-			dbg(2,"direction %lf, speed %2.1lf\n", priv->direction, priv->speed);
+			dbg(lvl_info,"direction %lf, speed %2.1lf\n", priv->direction, priv->speed);
 		}
 	}
 	if (!strncmp(buffer, "$GPRMC", 6)) {
@@ -613,7 +613,7 @@ vehicle_wince_parse(struct vehicle_priv *priv, char *buffer)
 	*/
 		if (item[1]) {
 			priv->magnetic_direction = g_ascii_strtod( item[1], NULL );
-			dbg(1,"magnetic %d\n", priv->magnetic_direction);
+			dbg(lvl_warning,"magnetic %d\n", priv->magnetic_direction);
 		}
 	}
 	return ret;
@@ -625,7 +625,7 @@ vehicle_wince_io(struct vehicle_priv *priv)
 	int size, rc = 0;
 	char *str, *tok;
 
-	dbg(1, "vehicle_file_io : enter\n");
+	dbg(lvl_warning, "vehicle_file_io : enter\n");
 
 	size = read_win32(priv, priv->buffer + priv->buffer_pos, buffer_size - priv->buffer_pos - 1);
 	
@@ -646,12 +646,12 @@ vehicle_wince_io(struct vehicle_priv *priv)
 	}
 	priv->buffer_pos += size;
 	priv->buffer[priv->buffer_pos] = '\0';
-	dbg(1, "size=%d pos=%d buffer='%s'\n", size,
+	dbg(lvl_warning, "size=%d pos=%d buffer='%s'\n", size,
 		priv->buffer_pos, priv->buffer);
 	str = priv->buffer;
 	while ((tok = strchr(str, '\n'))) {
 		*tok++ = '\0';
-		dbg(1, "line='%s'\n", str);
+		dbg(lvl_warning, "line='%s'\n", str);
 		rc +=vehicle_wince_parse(priv, str);
 		str = tok;
 		if (priv->file_type == file_type_file && rc)
@@ -662,10 +662,10 @@ vehicle_wince_io(struct vehicle_priv *priv)
 		size = priv->buffer + priv->buffer_pos - str;
 		memmove(priv->buffer, str, size + 1);
 		priv->buffer_pos = size;
-		dbg(2, "now pos=%d buffer='%s'\n",
+		dbg(lvl_info, "now pos=%d buffer='%s'\n",
 			priv->buffer_pos, priv->buffer);
 	} else if (priv->buffer_pos == buffer_size - 1) {
-		dbg(0,
+		dbg(lvl_error,
 			"Overflow. Most likely wrong baud rate or no nmea protocol\n");
 		priv->buffer_pos = 0;
 	}
@@ -676,7 +676,7 @@ vehicle_wince_io(struct vehicle_priv *priv)
 static void
 vehicle_wince_enable_watch(struct vehicle_priv *priv)
 {
-	dbg(1, "enter");
+	dbg(lvl_warning, "enter");
 	vehicle_wince_disable_watch(priv);
 	priv->is_running = 1;
 
@@ -697,7 +697,7 @@ vehicle_wince_disable_watch(struct vehicle_priv *priv)
 {
 	int wait = 5000;
 
-	dbg(1, "enter");
+	dbg(lvl_warning, "enter");
 
 	priv->is_running = 0;
 	while (wait-- > 0 && priv->thread_up) {
@@ -791,7 +791,7 @@ vehicle_wince_position_attr_get(struct vehicle_priv *priv,
 		attr->u.str=priv->fixiso8601;
 		break;
 	case attr_position_sat_item:
-		dbg(0,"at here\n");
+		dbg(lvl_error,"at here\n");
 		priv->sat_item.id_lo++;
 		if (priv->sat_item.id_lo > priv->current_count) {
 			priv->sat_item.id_lo=0;
@@ -881,7 +881,7 @@ vehicle_wince_new(struct vehicle_methods
 	struct attr *handle_bluetooth;
 	char *cp;
 
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	source = attr_search(attrs, NULL, attr_source);
 	ret = g_new0(struct vehicle_priv, 1);
 	ret->fd = -1;
@@ -918,7 +918,7 @@ vehicle_wince_new(struct vehicle_methods
 		ret->on_eof=1;
 	if (on_eof && !g_strcasecmp(on_eof->u.str, "exit"))
 		ret->on_eof=2;
-	dbg(0,"on_eof=%d\n", ret->on_eof);
+	dbg(lvl_error,"on_eof=%d\n", ret->on_eof);
 	*meth = vehicle_wince_methods;
 	ret->priv_cbl = callback_list_new();
 	callback_list_add(ret->priv_cbl, callback_new_1(callback_cast(vehicle_wince_io), ret));
@@ -937,7 +937,7 @@ vehicle_wince_new(struct vehicle_methods
 		vehicle_wince_enable_watch(ret);
 		return ret;
 	}
-	dbg(0, "Failed to open '%s'\n", ret->source);
+	dbg(lvl_error, "Failed to open '%s'\n", ret->source);
 	vehicle_wince_destroy(ret);
 	return NULL;
 }
@@ -948,7 +948,7 @@ vehicle_wince_new(struct vehicle_methods
 void
 plugin_init(void)
 {
-	dbg(1, "enter\n");
+	dbg(lvl_warning, "enter\n");
 	plugin_register_vehicle_type("wince", vehicle_wince_new);
 	plugin_register_vehicle_type("file", vehicle_wince_new);
 }