--- embedtools/src/pceng.c	2011/10/24 13:41:48	1.1.2.10
+++ embedtools/src/pceng.c	2012/04/05 12:22:44	1.1.2.12
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: pceng.c,v 1.1.2.10 2011/10/24 13:41:48 misho Exp $
+ * $Id: pceng.c,v 1.1.2.12 2012/04/05 12:22:44 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ SUCH DAMAGE.
 
 int Verbose, Kill;
 extern char compiled[], compiledby[], compilehost[];
-sl_config cfg;
+cfg_root_t cfg;
 char szConf[MAXPATHLEN] = DEFAULT_PCENG_CFG;
 
 
@@ -73,8 +73,8 @@ sigHand(int sig)
 
 	switch (sig) {
 		case SIGHUP:
-			UnloadConfig(&cfg);
-			if (LoadConfig(szConf, &cfg)) {
+			cfgUnloadConfig(&cfg);
+			if (cfgLoadConfig(szConf, &cfg)) {
 				syslog(LOG_ERR, "Error:: #%d - %s", cfg_GetErrno(), cfg_GetError());
 				raise(SIGTERM);
 			}
@@ -96,7 +96,7 @@ main(int argc, char **argv)
 	char ch, ledno, *pos;
 	int i, ret = 0, mode = 1;
 	struct sigaction sact;
-#ifdef HAVE_IO
+#ifdef __FreeBSD__
 	int io;
 #endif
 
@@ -124,7 +124,7 @@ main(int argc, char **argv)
 	else
 		openlog("pceng", LOG_CONS | LOG_PID | LOG_PERROR, LOG_USER);
 
-#ifdef HAVE_IO
+#ifdef __FreeBSD__
 	io = open(_PATH_DEVIO, O_RDONLY);
 	if (io == -1) {
 		printf("Error:: in open dev %s #%d - %s\n", _PATH_DEVIO, errno, strerror(errno));
@@ -133,7 +133,7 @@ main(int argc, char **argv)
 	}
 #endif
 
-	if (LoadConfig(szConf, &cfg)) {
+	if (cfgLoadConfig(szConf, &cfg)) {
 		printf("Error:: #%d - %s\n", cfg_GetErrno(), cfg_GetError());
 		ret = 1;
 		goto end;
@@ -190,8 +190,8 @@ main(int argc, char **argv)
 	ret = Run();
 
 end:
-	UnloadConfig(&cfg);
-#ifdef HAVE_IO
+	cfgUnloadConfig(&cfg);
+#ifdef __FreeBSD__
 	if (io > 2)
 		close(io);
 #endif