nps: common/poci.h, poci/nws_poci.c, poci/poci.h - standarized con...

[baggins]

Author: baggins                      Date: Sun Sep 25 20:04:50 2005 GMT
Module: nps                           Tag: HEAD
---- Log message:
- standarized configuration files

---- Files affected:
nps/common:
   poci.h (1.1.1.1 -> 1.2) 
nps/poci:
   nws_poci.c (1.16 -> 1.17) , poci.h (1.1.1.1 -> 1.2) 

---- Diffs:

================================================================
Index: nps/common/poci.h
diff -u nps/common/poci.h:1.1.1.1 nps/common/poci.h:1.2
--- nps/common/poci.h:1.1.1.1	Mon Jul 25 21:42:52 2005
+++ nps/common/poci.h	Sun Sep 25 22:04:45 2005
@@ -56,7 +56,8 @@
 #define LG_STR                  4096
 #define HOST_IP                 "169.254.101.3"
 #define SP_IP                   "sp.D332B385-5567-42e9-8D66-545897E8120A"
-#define SP_IP_CONF              "/etc/jnet/jnet.conf"
+#define SP_IP_CONF              "/etc/newisys/jnet/jnet.conf"
+#define PLATFORM_IP_CONF	"/etc/newisys/jnet/ip_platform"
 
 #define MAX_PARAM               5
 

================================================================
Index: nps/poci/nws_poci.c
diff -u nps/poci/nws_poci.c:1.16 nps/poci/nws_poci.c:1.17
--- nps/poci/nws_poci.c:1.16	Sun Sep 25 21:38:42 2005
+++ nps/poci/nws_poci.c	Sun Sep 25 22:04:45 2005
@@ -68,14 +68,6 @@
 #include "swinventory.h"
 #include "dimm_map.h"
 
-#ifndef PLATFORM_IP_CONFIG
-#define PLATFORM_IP_CONFIG	"/etc/newisys/ip_platform"
-#endif
-
-#ifndef SP_IP_CONFIG
-#define SP_IP_CONFIG		"/etc/newisys/ip_sp"
-#endif
-
 #define	IP_A_SHOW	1
 #define	IP_A_ADD	2
 #define	IP_A_FLUSH	3
@@ -1903,8 +1895,8 @@
         jnetChanged = TRUE;
 
         //Step 1
-	fd = open(PLATFORM_IP_CONFIG, O_RDWR|O_CREAT, 0644);
-	fd1 = open(SP_IP_CONFIG, O_RDWR|O_CREAT, 0644);
+	fd = open(PLATFORM_IP_CONF, O_RDWR|O_CREAT, 0644);
+	fd1 = open(SP_IP_CONF, O_RDWR|O_CREAT, 0644);
 	if ((fd == -1) || (fd1 == -1)) {
             syslog(LOG_CRIT, "Jnet set ip failed\n");
             //Even though the change may have failed, we will return

================================================================
Index: nps/poci/poci.h
diff -u nps/poci/poci.h:1.1.1.1 nps/poci/poci.h:1.2
--- nps/poci/poci.h:1.1.1.1	Mon Jul 25 21:43:02 2005
+++ nps/poci/poci.h	Sun Sep 25 22:04:45 2005
@@ -56,7 +56,8 @@
 #define LG_STR                  4096
 #define HOST_IP                 "169.254.101.3"
 #define SP_IP                   "sp.D332B385-5567-42e9-8D66-545897E8120A"
-#define SP_IP_CONF              "/etc/jnet/jnet.conf"
+#define SP_IP_CONF              "/etc/newisys/jnet/jnet.conf"
+#define PLATFORM_IP_CONF	"/etc/newisys/jnet/ip_platform"
 
 #define MAX_PARAM               5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/nps/common/poci.h?r1=1.1.1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/nps/poci/nws_poci.c?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/nps/poci/poci.h?r1=1.1.1.1&r2=1.2&f=u