server: use tagPrefix=CONF_

server/Makefile.am

@@ -27,6 +27,6 @@ spec_DATA = LCDd.spec.eqd
 
 KDB ?= kdb
 elektragen.c elektragen.h LCDd.spec.eqd LCDd.mount.sh: specification/LCDd-spec.ini
-	$(KDB) gen -F ni=specification/LCDd-spec.ini highlevel "spec/sw/lcdproc/lcdd/#0/current" elektragen initFn=loadConfiguration helpFn=printHelpMessage embeddedSpec=defaults; mv elektragen.mount.sh LCDd.mount.sh; mv elektragen.spec.eqd LCDd.spec.eqd
+	$(KDB) gen -F ni=specification/LCDd-spec.ini highlevel "spec/sw/lcdproc/lcdd/#0/current" elektragen initFn=loadConfiguration helpFn=printHelpMessage embeddedSpec=defaults tagPrefix=CONF_; mv elektragen.mount.sh LCDd.mount.sh; mv elektragen.spec.eqd LCDd.spec.eqd
 
 ## EOF

server/driver.c

@@ -141,7 +141,7 @@ driver_load(Elektra * elektra, const char * driverpath, kdb_long_long_t index)
 	strcpy(&filename[len_driverpath + len_file], MODULE_EXTENSION);
 
 	/* extract name for passing to driver */
-	const char * reference = elektraGetV(elektra, ELEKTRA_TAG_SERVER_DRIVERS, index);
+	const char * reference = elektraGetV(elektra, CONF_SERVER_DRIVERS, index);
 	const char * index_start = strrchr(reference, '#') - 1;
 	const char * name_start = index_start - 1;
 	while (*name_start != '/') {

server/drivers.c

@@ -65,7 +65,7 @@ drivers_load_driver(Elektra * elektra, kdb_long_long_t index)
 	}
 
 	/* Retrieve data from config file */
-	const char * driverpath = elektraGet(elektra, ELEKTRA_TAG_SERVER_DRIVERPATH);
+	const char * driverpath = elektraGet(elektra, CONF_SERVER_DRIVERPATH);
 
 	/* Load the module */
 	driver = driver_load(elektra, driverpath, index);

server/drivers/CFontz.c

@@ -127,7 +127,7 @@ CFontz_init(Driver *drvthis, Elektra * elektra)
 	/* Read config */
 
   CFontzDriverConfig config;
-  elektraFillStructV (elektra, &config, ELEKTRA_TAG_CFONTZ, drvthis->index);
+  elektraFillStructV (elektra, &config, CONF_CFONTZ, drvthis->index);
 
 	/* Which device should be used */
   report(RPT_INFO, "%s/#"ELEKTRA_LONG_LONG_F": using Device %s", drvthis->name, drvthis->index, config.device);

server/drivers/CFontzPacket.c

@@ -150,7 +150,7 @@ CFontzPacket_init (Driver *drvthis, Elektra * elektra)
 
 	/* Read config */
 	CFontzPacketDriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_CFONTZPACKET, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_CFONTZPACKET, drvthis->index);
 
 	/* Try to find a matching model from our list of known modules */
 	debug(RPT_INFO, "%s: Model (in config) is '%d'", __FUNCTION__, config.model);

server/drivers/CwLnx.c

@@ -474,7 +474,7 @@ CwLnx_init(Driver *drvthis, Elektra * elektra)
     /* Read config */
 
 	CwLnxDriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_CWLNX, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_CWLNX, drvthis->index);
 
     /* Which model is it (1602, 12232 or 12832)? */
     p->model = config.model;

server/drivers/MtxOrb.c

@@ -261,7 +261,7 @@ MtxOrb_init (Driver *drvthis, Elektra *elektra)
 
 	/* READ CONFIG FILE */
 	MtxOrbDriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_MTXORB, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_MTXORB, drvthis->index);
 
 	/* Get serial device to use */
   report(RPT_INFO, "%s/#"ELEKTRA_LONG_LONG_F": using Device %s", drvthis->name, drvthis->index, config.device);

server/drivers/bayrad.c

@@ -97,7 +97,7 @@ bayrad_init(Driver *drvthis, Elektra * elektra)
   /* Read config */
 
   BayradDriverConfig config;
-  elektraFillStructV (elektra, &config, ELEKTRA_TAG_BAYRAD, drvthis->index);
+  elektraFillStructV (elektra, &config, CONF_BAYRAD, drvthis->index);
 
   /* What device should be used */
   report(RPT_INFO, "%s/#"ELEKTRA_LONG_LONG_F": using Device %s", drvthis->name, drvthis->index, config.device);

server/drivers/curses_drv.c

@@ -179,7 +179,7 @@ curses_init (Driver *drvthis, Elektra * elektra)
 	/* Get settings from config */
 
 	CursesDriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_CURSES, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_CURSES, drvthis->index);
 
 	/* Get color settings */
 

server/drivers/glk.c

@@ -118,7 +118,7 @@ glk_init(Driver *drvthis, Elektra * elektra)
 
   /* Read config */
   GlkDriverConfig config;
-  elektraFillStructV(elektra, &config, ELEKTRA_TAG_GLK, drvthis->index);
+  elektraFillStructV(elektra, &config, CONF_GLK, drvthis->index);
 
   /* What device should be used */
   report(RPT_INFO, "%s/#"ELEKTRA_LONG_LONG_F": using Device %s", drvthis->name, drvthis->index, config.device);

server/drivers/hd44780.c

@@ -193,10 +193,10 @@ static int get_config_backlight_type(Driver *drvthis, const Hd44780DriverConfig
 	}
 
 	int result = BACKLIGHT_NONE;
-	kdb_long_long_t size = elektraSizeV(elektra, ELEKTRA_TAG_HD44780_BACKLIGHTMODE, drvthis->index);
+	kdb_long_long_t size = elektraSizeV(elektra, CONF_HD44780_BACKLIGHTMODE, drvthis->index);
 	for (kdb_long_long_t i = 0; i < size; ++i)
 	{
-		ElektraEnumHd44780Backlightmode elektraMode = elektraGetV(elektra, ELEKTRA_TAG_HD44780_BACKLIGHTMODE, drvthis->index, i);
+		ElektraEnumHd44780Backlightmode elektraMode = elektraGetV(elektra, CONF_HD44780_BACKLIGHTMODE, drvthis->index, i);
 		int mode = map_backlight_mode(elektraMode);
 		if (mode < 0) {
 			report(RPT_ERR, "%s ("ELEKTRA_LONG_LONG_F"): unknown Backlight mode: %d", drvthis->name, drvthis->index, elektraMode);
@@ -299,7 +299,7 @@ HD44780_init(Driver *drvthis, Elektra * elektra)
 
 	/* READ THE CONFIG */
 	Hd44780DriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_HD44780, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_HD44780, drvthis->index);
 
 	// TODO (elektra): use hexnumber?
 	p->port			= (unsigned int)strtoul(config.port, NULL, 16); /* works because, spec enforces hex string */
@@ -449,7 +449,7 @@ HD44780_init(Driver *drvthis, Elektra * elektra)
 
 		/* Read keymap */
 		for (x = 0; x < KEYPAD_MAXX; x++) {
-			const char * key = elektraGetV(elektra, ELEKTRA_TAG_HD44780_KEYDIRECT, drvthis->index, x);
+			const char * key = elektraGetV(elektra, CONF_HD44780_KEYDIRECT, drvthis->index, x);
 
 			/* Was a key specified in the config file ? */
 			if (strlen(key) == 0) {
@@ -461,7 +461,7 @@ HD44780_init(Driver *drvthis, Elektra * elektra)
 			p->keyMapDirect[x] = strdup(key);
 
 			for (y = 0; y < KEYPAD_MAXY; y++) {
-				key = elektraGetV(elektra, ELEKTRA_TAG_HD44780_KEYMATRIX, drvthis->index, x, y);
+				key = elektraGetV(elektra, CONF_HD44780_KEYMATRIX, drvthis->index, x, y);
 
 				/* Was a key specified in the config file ? */
 				if (strlen(key) == 0) {

server/drivers/lb216.c

@@ -95,7 +95,7 @@ LB216_init(Driver *drvthis, Elektra * elektra)
 
   /* Read config */
   Lb216DriverConfig config;
-  elektraFillStructV(elektra, &config, ELEKTRA_TAG_LB216, drvthis->index);
+  elektraFillStructV(elektra, &config, CONF_LB216, drvthis->index);
 
   /* What device should be used */
   report(RPT_INFO, "%s/#"ELEKTRA_LONG_LONG_F": using Device %s", drvthis->name, drvthis->index, config.device);

server/drivers/lcdm001.c

@@ -161,7 +161,7 @@ lcdm001_init (Driver *drvthis, Elektra * elektra)
 
 	/* READ CONFIG FILE: */
 	Lcdm001DriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_LCDM001, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_LCDM001, drvthis->index);
 
 	/* which serial device should be used */
 	report(RPT_INFO, "%s/#"ELEKTRA_LONG_LONG_F": using Device %s", drvthis->name, drvthis->index, config.device);

server/drivers/linux_input.c

@@ -75,7 +75,7 @@ linuxInput_init (Driver *drvthis, Elektra * elektra)
 	/* not using struct, since it is inconvenient for keymap */
 
 	/* What device should be used */
-	const char * device = elektraGetV(elektra, ELEKTRA_TAG_LINUX_INPUT_DEVICE, drvthis->index);
+	const char * device = elektraGetV(elektra, CONF_LINUX_INPUT_DEVICE, drvthis->index);
 	report(RPT_INFO, "%s: using Device %s", drvthis->name, device);
 
 
@@ -85,12 +85,12 @@ linuxInput_init (Driver *drvthis, Elektra * elektra)
 		return -1;
 	}
 
-	kdb_long_long_t size = elektraSizeV(elektra, ELEKTRA_TAG_LINUX_INPUT_KEYS, drvthis->index);
+	kdb_long_long_t size = elektraSizeV(elektra, CONF_LINUX_INPUT_KEYS, drvthis->index);
 
 	for (kdb_long_long_t i = 0; i < size; ++i) {
 		struct keycode * key = malloc(sizeof(struct keycode));
-		key->code = elektraGetV(elektra, ELEKTRA_TAG_LINUX_INPUT_KEYS_CODE, drvthis->index, i);
-		key->button = strdup(elektraGetV(elektra, ELEKTRA_TAG_LINUX_INPUT_KEYS_BUTTON, drvthis->index, i));
+		key->code = elektraGetV(elektra, CONF_LINUX_INPUT_KEYS_CODE, drvthis->index, i);
+		key->button = strdup(elektraGetV(elektra, CONF_LINUX_INPUT_KEYS_BUTTON, drvthis->index, i));
 		LL_AddNode(p->buttonmap, key);
 	}
 

server/drivers/pylcd.c

@@ -327,7 +327,7 @@ pyramid_init(Driver *drvthis, Elektra * elektra)
      */
 
 	PyramidDriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_PYRAMID, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_PYRAMID, drvthis->index);
 
     /* Which serial device should be used? */
 	report(RPT_INFO, "%s/#"ELEKTRA_LONG_LONG_F": using Device %s", drvthis->name, drvthis->index, config.device);

server/drivers/text.c

@@ -71,7 +71,7 @@ text_init (Driver *drvthis, Elektra * elektra)
 	/* initialize private data */
 
 	TextDriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_TEXT, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_TEXT, drvthis->index);
 
 	// Set display sizes
 	if ((drvthis->request_display_width() > 0)

server/drivers/xosdlib_drv.c

@@ -82,7 +82,7 @@ xosdlib_drv_init (Driver *drvthis, Elektra * elektra)
 
 	/* Read config */
 	XosdDriverConfig config;
-	elektraFillStructV(elektra, &config, ELEKTRA_TAG_XOSD, drvthis->index);
+	elektraFillStructV(elektra, &config, CONF_XOSD, drvthis->index);
 
 	/* Which size */
 	if ((drvthis->request_display_width() > 0)

server/input.c

@@ -51,11 +51,11 @@ int input_init(Elektra * elektra)
 	keylist = LL_new();
 
 	/* Get rotate/scroll keys from config file */
-	toggle_rotate_key = strdup(elektraGet(elektra, ELEKTRA_TAG_SERVER_TOGGLEROTATEKEY));
-	prev_screen_key = strdup(elektraGet(elektra, ELEKTRA_TAG_SERVER_PREVSCREENKEY));
-	next_screen_key = strdup(elektraGet(elektra, ELEKTRA_TAG_SERVER_NEXTSCREENKEY));
-	scroll_up_key = strdup(elektraGet(elektra, ELEKTRA_TAG_SERVER_SCROLLUPKEY));
-	scroll_down_key = strdup(elektraGet(elektra, ELEKTRA_TAG_SERVER_SCROLLDOWNKEY));
+	toggle_rotate_key = strdup(elektraGet(elektra, CONF_SERVER_TOGGLEROTATEKEY));
+	prev_screen_key = strdup(elektraGet(elektra, CONF_SERVER_PREVSCREENKEY));
+	next_screen_key = strdup(elektraGet(elektra, CONF_SERVER_NEXTSCREENKEY));
+	scroll_up_key = strdup(elektraGet(elektra, CONF_SERVER_SCROLLUPKEY));
+	scroll_down_key = strdup(elektraGet(elektra, CONF_SERVER_SCROLLDOWNKEY));
 
 	return 0;
 }

server/main.c

@@ -306,27 +306,27 @@ process_config()
 
 	elektraFatalErrorHandler(elektra, on_fatal_error);
 
-	bind_port = elektraGet(elektra, ELEKTRA_TAG_SERVER_PORT);
-	strncpy(bind_addr, elektraGet(elektra, ELEKTRA_TAG_SERVER_BIND), sizeof(bind_addr));
-	strncpy(user, elektraGet(elektra, ELEKTRA_TAG_SERVER_USER), sizeof(user));
+	bind_port = elektraGet(elektra, CONF_SERVER_PORT);
+	strncpy(bind_addr, elektraGet(elektra, CONF_SERVER_BIND), sizeof(bind_addr));
+	strncpy(user, elektraGet(elektra, CONF_SERVER_USER), sizeof(user));
 
-	frame_interval = elektraGet(elektra, ELEKTRA_TAG_SERVER_FRAMEINTERVAL);
-	default_duration = elektraGet(elektra, ELEKTRA_TAG_SERVER_WAITTIME) * 1e6 / frame_interval;
+	frame_interval = elektraGet(elektra, CONF_SERVER_FRAMEINTERVAL);
+	default_duration = elektraGet(elektra, CONF_SERVER_WAITTIME) * 1e6 / frame_interval;
 	if (default_duration * frame_interval < 2e6) {
 		report(RPT_WARNING, "Waittime should be at least 2 (seconds). Set to 2 seconds.");
 		default_duration = 2e6 / frame_interval;
 	}
 
-	foreground_mode = elektraGet(elektra, ELEKTRA_TAG_SERVER_FOREGROUND);
-	rotate_server_screen = elektraGet(elektra, ELEKTRA_TAG_SERVER_SERVERSCREEN);
-	backlight = elektraGet(elektra, ELEKTRA_TAG_SERVER_BACKLIGHT);
-	heartbeat = elektraGet(elektra, ELEKTRA_TAG_SERVER_HEARTBEAT);
-	autorotate = elektraGet(elektra, ELEKTRA_TAG_SERVER_AUTOROTATE);
+	foreground_mode = elektraGet(elektra, CONF_SERVER_FOREGROUND);
+	rotate_server_screen = elektraGet(elektra, CONF_SERVER_SERVERSCREEN);
+	backlight = elektraGet(elektra, CONF_SERVER_BACKLIGHT);
+	heartbeat = elektraGet(elektra, CONF_SERVER_HEARTBEAT);
+	autorotate = elektraGet(elektra, CONF_SERVER_AUTOROTATE);
 
-	titlespeed = elektraGet(elektra, ELEKTRA_TAG_SERVER_TITLESPEED);
-	report_dest = (elektraGet(elektra, ELEKTRA_TAG_SERVER_REPORTTOSYSLOG)) ? RPT_DEST_SYSLOG : RPT_DEST_STDERR;
+	titlespeed = elektraGet(elektra, CONF_SERVER_TITLESPEED);
+	report_dest = (elektraGet(elektra, CONF_SERVER_REPORTTOSYSLOG)) ? RPT_DEST_SYSLOG : RPT_DEST_STDERR;
 
-	report_level = elektraGet(elektra, ELEKTRA_TAG_SERVER_REPORTLEVEL);
+	report_level = elektraGet(elektra, CONF_SERVER_REPORTLEVEL);
 
 	return 0;
 }
@@ -458,7 +458,7 @@ init_drivers(void)
 	debug(RPT_DEBUG, "%s()", __FUNCTION__);
 
 	/* Read drivers */
-	num_drivers = elektraSize(elektra, ELEKTRA_TAG_SERVER_DRIVERS);
+	num_drivers = elektraSize(elektra, CONF_SERVER_DRIVERS);
 	for (kdb_long_long_t i = 0; i < num_drivers; ++i) {
 		if(i > MAX_DRIVERS)
 		{

server/menuscreens.c

@@ -85,7 +85,7 @@ menuscreens_init(Elektra * elektra)
 
 	debug(RPT_DEBUG, "%s()", __FUNCTION__);
 
-	menu_permissive_goto = elektraGet(elektra, ELEKTRA_TAG_MENU_PERMISSIVEGOTO);
+	menu_permissive_goto = elektraGet(elektra, CONF_MENU_PERMISSIVEGOTO);
 
 	/*
 	 * Get keys from config file: MenuKey, EnterKey, UpKey, DownKey,
@@ -94,36 +94,36 @@ menuscreens_init(Elektra * elektra)
 	 */
 	keymask = 0;
 	menu_key = enter_key = NULL;
-	tmp = elektraGet(elektra, ELEKTRA_TAG_MENU_MENUKEY);
+	tmp = elektraGet(elektra, CONF_MENU_MENUKEY);
 	if (strlen(tmp) > 0) {
 		menu_key = strdup(tmp);
 		keymask |= MENUTOKEN_MENU;
 	}
-	tmp = elektraGet(elektra, ELEKTRA_TAG_MENU_ENTERKEY);
+	tmp = elektraGet(elektra, CONF_MENU_ENTERKEY);
 	if (strlen(tmp) > 0) {
 		enter_key = strdup(tmp);
 		keymask |= MENUTOKEN_ENTER;
 	}
 
 	up_key = down_key = NULL;
-	tmp = elektraGet(elektra, ELEKTRA_TAG_MENU_UPKEY);
+	tmp = elektraGet(elektra, CONF_MENU_UPKEY);
 	if (strlen(tmp) > 0) {
 		up_key = strdup(tmp);
 		keymask |= MENUTOKEN_UP;
 	}
-	tmp = elektraGet(elektra, ELEKTRA_TAG_MENU_DOWNKEY);
+	tmp = elektraGet(elektra, CONF_MENU_DOWNKEY);
 	if (strlen(tmp) > 0) {
 		down_key = strdup(tmp);
 		keymask |= MENUTOKEN_DOWN;
 	}
 
 	left_key = right_key = NULL;
-	tmp = elektraGet(elektra, ELEKTRA_TAG_MENU_LEFTKEY);
+	tmp = elektraGet(elektra, CONF_MENU_LEFTKEY);
 	if (strlen(tmp) > 0) {
 		left_key = strdup(tmp);
 		keymask |= MENUTOKEN_LEFT;
 	}
-	tmp = elektraGet(elektra, ELEKTRA_TAG_MENU_RIGHTKEY);
+	tmp = elektraGet(elektra, CONF_MENU_RIGHTKEY);
 	if (strlen(tmp) > 0) {
 		right_key = strdup(tmp);
 		keymask |= MENUTOKEN_RIGHT;

server/serverscreens.c

@@ -64,7 +64,7 @@ server_screen_init(Elektra * elektra)
 	Widget *w;
 	int i;
 
-	kdb_long_long_t helloArraySize = elektraSize(elektra, ELEKTRA_TAG_SERVER_GOODBYE);
+	kdb_long_long_t helloArraySize = elektraSize(elektra, CONF_SERVER_GOODBYE);
 	has_hello_msg = helloArraySize > 0;
 
 	debug(RPT_DEBUG, "%s()", __FUNCTION__);
@@ -100,7 +100,7 @@ server_screen_init(Elektra * elektra)
 	/* set the widgets depending on the Hello option in LCDd.conf */
 	if (has_hello_msg) {		/* show whole Hello message */
 		for (kdb_long_long_t i = 0; i < display_props->height && i < helloArraySize; i++) {
-	 		const char *line = elektraGetV(elektra, ELEKTRA_TAG_SERVER_HELLO, i);
+	 		const char *line = elektraGetV(elektra, CONF_SERVER_HELLO, i);
 			char id[30];
 
 			sprintf(id, "line"ELEKTRA_LONG_LONG_F, i+1);
@@ -218,11 +218,11 @@ goodbye_screen(Elektra * elektra)
 
 	drivers_clear();
 
-	kdb_long_long_t arraySize = elektraSize(elektra, ELEKTRA_TAG_SERVER_GOODBYE);
+	kdb_long_long_t arraySize = elektraSize(elektra, CONF_SERVER_GOODBYE);
 	if (arraySize > 0) {	/* custom GoodBye */
 		/* loop over all display lines to read config & display message */
 		for (kdb_long_long_t i = 0; i < display_props->height && i < arraySize; i++) {
-			const char *line = elektraGetV(elektra, ELEKTRA_TAG_SERVER_GOODBYE, i);
+			const char *line = elektraGetV(elektra, CONF_SERVER_GOODBYE, i);
 
 			drivers_string(1, 1+i, line);
 		}