Merge pull request #22 from I2SE/master

Some fixes and spec file update

mme/UnwantedMessage.c

@@ -41,7 +41,7 @@
 
 /*====================================================================*
  *
- *   bool UnwantedMessage (void const * memory, size_t extent, uint8_t MMV, uint16_t MMTYPE);
+ *   signed UnwantedMessage (void const * memory, size_t extent, uint8_t MMV, uint16_t MMTYPE);
  *
  *   mme.h
  *

open-plc-utils.spec

@@ -4,11 +4,11 @@
 
 Summary: 	Open version of the Qualcomm Atheros Powerline Toolkit
 Name: 		open-plc-utils
-Version: 	0.0.2
+Version: 	0.0.3
 Release: 	1
 Source:	 	https://codeload.github.com/qca/open-plc-utils/zip/master/open-plc-utils-master.zip
 URL:		https://github.com/qca/open-plc-utils.git
-License:	ISC
+License:	BSD
 Vendor:		Qualcomm-Atheros <[email protected]>
 Group: 		Productivity/Networking/Diagnostic
 BuildRoot: 	{_tmppath}/%{name}-%{version}-build
@@ -18,6 +18,15 @@ AutoReqProv:	on
 This package installs the tools required to configure Qualcomm-Atheros
 Powerline devices on the network.
 
+%package slac
+License:        BSD
+Summary:        SLAC tools of the Qualcomm Atheros Powerline Toolkit
+Group:          Development/Tools/Other
+AutoReqProv:    on
+
+%description slac
+This package installs the tools for Signal Level Attenuation Characterization.
+
 %prep -q
 %setup -n open-plc-utils-master 
 
@@ -250,6 +259,17 @@ rm -rf "%buildroot"
 %{_mandir}/man1/weeder.1.gz
 %{_mandir}/man1/xml2pib.1.gz
 
+%files slac
+%defattr (-,root,root)
+/usr/local/bin/evse
+/usr/local/bin/pev
+%{_mandir}/man1/evse.1.gz
+%{_mandir}/man1/pev.1.gz
+
 %changelog
+* Thu Nov 14 2013 Stefan Wahren <[email protected]> - 0.0.3-1
+- Update License
+- Add new package slac 
+
 * Sat Aug 31 2013 Stefan Wahren <[email protected]> - 0.0.2-1
 - Initial package based on the debian branch

pib/getpib.c

@@ -446,7 +446,7 @@ int main (int argc, char const * argv [])
 	argc--;
 	argv++;
 	header = (struct pib_header *)(buffer);
-	if (extent != LE16TOH (header->PIBLENGTH))
+	if (header->PIBLENGTH && (extent != LE16TOH (header->PIBLENGTH)))
 	{
 		error (1, ECANCELED, "Bad PIB filesize: %s", file.name);
 	}

plc/plc.c

@@ -270,6 +270,7 @@ struct plc plc =
 	PLC_COUNT,
 	PLC_INDEX,
 	PLC_FLAGS,
+	PLC_FLAGS,
 };
 
 

plc/plchostd.c

@@ -495,7 +495,7 @@ int main (int argc, char const * argv [])
 	extern void terminate (signo_t);
 	static char const * optv [] =
 	{
-		"dFi:n:N:p:P:qs:t:vw:x",
+		"dFi:n:N:p:P:qs:S:t:vw:x",
 		"-N file -P file [-S file] [-n file] [-p file]",
 		"Qualcomm Atheros PLC Host Daemon",
 		"d\texecute in background as daemon",

scripts/baud.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # ====================================================================
 # set serial port parameters on a Linux system;

slac/evse.sh

@@ -5,6 +5,16 @@
 #   configure a QCA7000 PIB file as a SLAC-EVSE on Linux or Cygwin. 
 #
 
+if [ $# -ne 1 ]; then
+	cat << EOF
+usage: evse.sh PIBFILE
+
+This script configures a QCA7000 PIB file as a SLAC-EVSE
+
+EOF
+	exit 1
+fi 
+
 # ====================================================================
 # Manufacturer HFID; 
 # --------------------------------------------------------------------

slac/pev.sh

@@ -1,4 +1,5 @@
-#!/bin/sëÞöÏfile: slac/pev.sh
+#!/bin/sh
+# file: slac/pev.sh
 
 #
 #  configure a QCA7000 PIB file as a SLAC-PEV on Linux or Cygwin. 

slac/pl16-evse.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 # file: slac/pl16-evse.sh
 
 # ====================================================================