Contents Up Previous Next

Wiring Pi Patch

A patch is applied to the wiringPi source and is included below. The intention of the patch is:

Makefile

wiringPi is built as a static library for HiPi::Wiring. I found that the brackets in the line

@echo "[Link (Static)]"

caused the build to fail when the Makefile is called from within the Perl based build process.

It was also necessary to add on the i2c objects for the static build.

Finally, I removed the static definition of CC as for some versions of Perl I want to pass in a specific gcc version - e.g. gcc-4.7 - as a parameter to make.

wiringPi.c

Within one function the wiringPi library makes a single call to the external program gpio which is part of the full wiringPi distribution. I do not want to stomp on any user installation of wiringPi so the HiPi::Wiring distribution does not build or install gpio. I implemented a simple script to emulate the single function call to gpio and the wiringPi code in the static build for HiPi::Wiring now calls that instead.

Users are recommended to install the full wiringPi library anyway as they will find the gpio utility useful and regular visits to Gordon's site will reward with a wealth of information and tips. I did not, however, want to make this a prerequisite of building the HiPi::Wiring module.

wiringPiI2C.c

To avoid confusion ( possibly only mine ) over which i2c header to use, I have included the required i2c header in the distribution. The file wiringPiI2C.c is patched to include this. From my research on the webternet, it seems other users experience confusion over the version of i2c_dev.h that gets included. One is provided by the kernel headers and one by the i2c-tools headers. We need the i2c-tools version. It maybe that in reality there is no confusion at all - I just haven't investigated properly. When in doubt, use brute force.


wiring.patch
diff -ruNw srcc/wiringPi/wiringPi/Makefile copy/wiringPi/Makefile
--- srcc/wiringPi/Makefile	2013-02-23 02:18:48.353400000 +0000
+++ copy/wiringPi/Makefile	2013-02-23 05:16:14.427400000 +0000
@@ -33,7 +33,7 @@
 
 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+#CC	= gcc
 INCLUDE	= -I.
 CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe -fPIC
 
@@ -59,14 +59,14 @@
 
 static:		$(STATIC)
 
-$(STATIC):	$(OBJ)
-	@echo "[Link (Static)]"
-	@ar rcs $(STATIC) $(OBJ)
+$(STATIC):	$(OBJ) $(OBJ_I2C)
+	@echo "[Link Static]"
+	@ar rcs $(STATIC) $(OBJ) $(OBJ_I2C)
 	@ranlib $(STATIC)
 #	@size   $(STATIC)
 
 $(DYNAMIC):	$(OBJ)
-	@echo "[Link (Dynamic)]"
+	@echo "[Link Dynamic]"
 	@$(CC) -shared -Wl,-soname,libwiringPi.so.1 -o libwiringPi.so.1.0 -lpthread $(OBJ)
 
 i2c:	$(OBJ) $(OBJ_I2C)
diff -ruNw wiring/wiringPi/wiringPi/wiringPi.c trunk/wiring/src/wiringPi/wiringPi.c
--- srcc/wiringPi/wiringPi.c	2013-02-23 02:18:48.390400000 +0000
+++ copy/wiringPi/wiringPi.c	2013-02-23 20:24:16.979400000 +0000
@@ -1119,7 +1119,7 @@
 
     if (pid == 0)	// Child, exec
     {
-      execl ("/usr/local/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+      execl ("/usr/local/bin/hipi-gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
       return -1 ;	// Failure ...
     }
     else		// Parent, wait
diff -ruNw wiring/wiringPi/wiringPi/wiringPiI2C.c trunk/wiring/src/wiringPi/wiringPiI2C.c
--- srcc/wiringPi/wiringPiI2C.c	2013-02-23 02:18:48.400400000 +0000
+++ copy/wiringPi/wiringPiI2C.c	2013-02-23 03:56:18.005400000 +0000
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <fcntl.h>>
 #include <sys/ioctl.h>
-#include <linux/i2c-dev.h>
+#include "../../../mylib/include/local-i2c-dev.h"
 #include "wiringPi.h"
 #include "wiringPiI2C.h"




Contents Up Previous Next


HiPi Modules Copyright © 2013 Mark Dootson