First crack at a build workflow

Merge pull request #79 from DavidAntliff/debian-fix
Remove hard-coded destination paths for debian package creation.
2020-11-26 16:18:51 +00:00 · 2020-09-14 15:02:31 +01:00 · 2020-09-14 14:59:54 +01:00 · 2020-09-03 13:18:01 +12:00 · 2020-04-07 21:53:39 -05:00 · 2020-04-07 17:19:45 +08:00
22 changed files with 186 additions and 117 deletions
@@ -0,0 +1,16 @@
+name: Build
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run build
+        run: |
+          ./build
@@ -1,36 +0,0 @@
-Note
-====
-
-This is an unofficial mirror of WiringPi to support ports (Python/Ruby/etc).
-
-Please do not email Gordon if you have issues, he will not be able to help.
-
-Pull-requests are not currently accepted, since this is a mirror.
-
-For support, comments, questions, etc please join the WiringPi Discord channel: https://discord.gg/SM4WUVG
-
-wiringPi README
-===============
-
-Please note that the official way to get wiringPi is via git from
-git.drogon.net and not GitHub.
-
-ie.
-
-  git clone git://git.drogon.net/wiringPi
-
-The version of wiringPi held on GitHub by "Gadgetoid" is used to build the
-wiringPython, Ruby, Perl, etc. wrappers for these other languages. This
-version may lag the official Drogon release.  Pull requests may not be
-accepted to Github....
-
-Please see
-
-  http://wiringpi.com/
-
-for the official documentation, etc. and the best way to submit bug reports, etc.
-is by sending an email to projects@drogon.net
-
-Thanks!
-
-  -Gordon
@@ -0,0 +1,19 @@
+Unofficial WiringPi Mirror
+==========================
+
+This is an unofficial mirror of WiringPi to support ports (Python/Ruby/etc).  With the
+[end of official development](http://wiringpi.com/wiringpi-deprecated/), this repository
+has become a mirror of the last "official" source release as well as a source for small
+updates to support newer hardware (primarily for use by the ports).
+
+  * The final "official" source release can be found at the
+    [`final_source_2.50`](https://github.com/WiringPi/WiringPi/tree/final_official_2.50) tag.
+  * The default `master` branch contains code that has been written since that final source
+    release to provide support for newer hardware.
+
+Please do not email Gordon if you have issues, he will not be able to help.
+
+Pull-requests may be accepted to add or fix support for newer hardware, but new features or
+other changes will not be accepted.
+
+For support, comments, questions, etc please join the WiringPi Discord channel: https://discord.gg/SM4WUVG
@@ -1 +1 @@
-2.50
+2.60
@@ -84,14 +84,15 @@ fi

 if [ x$1 = "xdebian" ]; then
  here=`pwd`
+  deb_destdir=${here}/debian-template/wiringPi
  cd debian-template/wiringPi
  rm -rf usr
  cd $here/wiringPi
-  make install-deb
+  make install-deb DEB_DESTDIR=${deb_destdir}
  cd $here/devLib
-  make install-deb INCLUDE='-I. -I../wiringPi'
+  make install-deb INCLUDE='-I. -I../wiringPi' DEB_DESTDIR=${deb_destdir}
  cd $here/gpio
-  make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib
+  make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib DEB_DESTDIR=${deb_destdir}
  cd $here/debian-template
  fakeroot dpkg-deb --build wiringPi
  mv wiringPi.deb  wiringpi-`cat $here/VERSION`-1.deb
@@ -1,5 +1,5 @@
 Package: wiringpi
-Version: 2.50
+Version: 2.60
 Section: libraries
 Priority: optional
 Architecture: armhf
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)

 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I.
 DEFS	= -D_GNU_SOURCE
-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS)

 LIBS    =

@@ -105,15 +105,21 @@ install-static:	$(STATIC)
 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
 	$Q install -m 0755 libwiringPiDev.a				$(DESTDIR)$(PREFIX)/lib

+.PHONY: check-deb-destdir
+check-deb-destdir:
+ifndef DEB_DESTDIR
+	$(error DEB_DESTDIR is undefined)
+endif
+
 .PHONY:	install-deb
-install-deb:	$(DYNAMIC)
+install-deb:	$(DYNAMIC) check-deb-destdir
 	$Q echo "[Install Headers: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/include
-	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian-template/wiringPi/usr/include
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/include
+	$Q install -m 0644 $(HEADERS)						$(DEB_DESTDIR)/usr/include
 	$Q echo "[Install Dynamic Lib: deb]"
-	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/lib
-	install -m 0755 libwiringPiDev.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
-	ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so
+	install -m 0755 -d							$(DEB_DESTDIR)/usr/lib
+	install -m 0755 libwiringPiDev.so.$(VERSION)				$(DEB_DESTDIR)/usr/lib/libwiringPiDev.so.$(VERSION)
+	ln -sf $(DEB_DESTDIR)/usr/lib/libwiringPiDev.so.$(VERSION)		$(DEB_DESTDIR)/usr/lib/libwiringPiDev.so

 .PHONY:	uninstall
 uninstall:
@@ -11,9 +11,9 @@ endif

 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)

 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
@@ -28,9 +28,9 @@ endif

 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)

 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm -lcrypt -lrt
@@ -28,9 +28,9 @@ endif

 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)

 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
@@ -28,9 +28,9 @@ endif

 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)

 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
@@ -28,9 +28,9 @@ endif

 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)

 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
@@ -28,9 +28,9 @@ endif

 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)

 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
@@ -32,9 +32,9 @@ endif

 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
-CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)

 LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
@@ -80,13 +80,19 @@ endif
 	$Q mkdir -p		$(DESTDIR)$(PREFIX)/share/man/man1
 	$Q cp gpio.1		$(DESTDIR)$(PREFIX)/share/man/man1

+.PHONY: check-deb-destdir
+check-deb-destdir:
+ifndef DEB_DESTDIR
+	$(error DEB_DESTDIR is undefined)
+endif
+
 .PHONY:	install-deb
-install-deb:	gpio
+install-deb:	gpio check-deb-destdir
 	$Q echo "[Install: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/bin
-	$Q install -m 0755 gpio							~/wiringPi/debian-template/wiringPi/usr/bin
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/share/man/man1
-	$Q install -m 0644 gpio.1						~/wiringPi/debian-template/wiringPi/usr/share/man/man1
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/bin
+	$Q install -m 0755 gpio							$(DEB_DESTDIR)/usr/bin
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/share/man/man1
+	$Q install -m 0644 gpio.1						$(DEB_DESTDIR)/usr/share/man/man1

 .PHONY:	uninstall
 uninstall:
@@ -80,7 +80,7 @@ static char *alts [] =
  "IN", "OUT", "ALT5", "ALT4", "ALT0", "ALT1", "ALT2", "ALT3"
 } ;

-static int physToWpi [64] = 
+static int physToWpi [64] =
 {
  -1,           // 0
  -1, -1,       // 1, 2
@@ -113,7 +113,7 @@ static int physToWpi [64] =
  -1, -1, -1, -1, -1, -1, -1, -1, -1
 } ;

-static char *physNames [64] = 
+static char *physNames [64] =
 {
  NULL,

@@ -309,6 +309,8 @@ static void plus2header (int model)
    printf (" +-----+-----+---------+------+---+---Pi 3B+-+---+------+---------+-----+-----+\n") ;
  else if (model == PI_MODEL_3AP)
    printf (" +-----+-----+---------+------+---+---Pi 3A+-+---+------+---------+-----+-----+\n") ;
+  else if (model == PI_MODEL_4B)
+    printf (" +-----+-----+---------+------+---+---Pi 4B--+---+------+---------+-----+-----+\n") ;
  else
    printf (" +-----+-----+---------+------+---+---Pi ?---+---+------+---------+-----+-----+\n") ;
 }
@@ -356,6 +358,7 @@ void doReadall (void)
 	(model == PI_MODEL_2)    ||
 	(model == PI_MODEL_3AP)  ||
 	(model == PI_MODEL_3B)   || (model == PI_MODEL_3BP) ||
+	(model == PI_MODEL_4B)   ||
 	(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W))
    piPlusReadall (model) ;
  else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || ((model == PI_MODEL_CM3P)))
@@ -1,3 +1,3 @@
-#define VERSION "2.50"
+#define VERSION "2.60"
 #define VERSION_MAJOR 2
-#define VERSION_MINOR 50
+#define VERSION_MINOR 60
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)

 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I.
 DEFS	= -D_GNU_SOURCE
-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
+CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS)
 #CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC

 LIBS    = -lm -lpthread -lrt -lcrypt
@@ -104,15 +104,21 @@ install:	$(DYNAMIC)
 	$Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
 	$Q $(LDCONFIG)

+.PHONY: check-deb-destdir
+check-deb-destdir:
+ifndef DEB_DESTDIR
+	$(error DEB_DESTDIR is undefined)
+endif
+
 .PHONY:	install-deb
-install-deb:	$(DYNAMIC)
+install-deb:	$(DYNAMIC) check-deb-destdir
 	$Q echo "[Install Headers: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/include
-	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian-template/wiringPi/usr/include
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/include
+	$Q install -m 0644 $(HEADERS)						$(DEB_DESTDIR)/usr/include
 	$Q echo "[Install Dynamic Lib: deb]"
-	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/lib
-	install -m 0755 libwiringPi.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
-	ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so
+	install -m 0755 -d							$(DEB_DESTDIR)/usr/lib
+	install -m 0755 libwiringPi.so.$(VERSION)				$(DEB_DESTDIR)/usr/lib/libwiringPi.so.$(VERSION)
+	ln -sf $(DEB_DESTDIR)/usr/lib/libwiringPi.so.$(VERSION)	$(DEB_DESTDIR)/usr/lib/libwiringPi.so

 .PHONY:	uninstall
 uninstall:
@@ -213,8 +213,9 @@ volatile unsigned int *_wiringPiTimerIrqRaw ;
 // piGpioBase:
 //	The base address of the GPIO memory mapped hardware IO

-#define	GPIO_PERI_BASE_OLD	0x20000000
-#define	GPIO_PERI_BASE_NEW	0x3F000000
+#define	GPIO_PERI_BASE_OLD  0x20000000
+#define	GPIO_PERI_BASE_2835 0x3F000000
+#define	GPIO_PERI_BASE_2711 0xFE000000

 static volatile unsigned int piGpioBase = 0 ;

@@ -237,7 +238,7 @@ const char *piModelNames [20] =
  "Pi 3A+",	// 14
  "Unknown15",	// 15
  "CM3+",	// 16
-  "Unknown17",	// 17
+  "Pi 4B",	// 17
  "Unknown18",	// 18
  "Unknown19",	// 19
 } ;
@@ -287,8 +288,8 @@ const int piMemorySize [8] =
   256,		//	 0
   512,		//	 1
  1024,		//	 2
-     0,		//	 3
-     0,		//	 4
+  2048,		//	 3
+  4096,		//	 4
     0,		//	 5
     0,		//	 6
     0,		//	 7
@@ -542,6 +543,14 @@ static uint8_t gpioToFEN [] =

 #define	GPPUD	37

+/* 2711 has a different mechanism for pin pull-up/down/enable  */
+#define GPPUPPDN0                57        /* Pin pull-up/down for pins 15:0  */
+#define GPPUPPDN1                58        /* Pin pull-up/down for pins 31:16 */
+#define GPPUPPDN2                59        /* Pin pull-up/down for pins 47:32 */
+#define GPPUPPDN3                60        /* Pin pull-up/down for pins 57:48 */
+
+static volatile unsigned int piGpioPupOffset = 0 ;
+
 // gpioToPUDCLK
 //	(Word) offset to the Pull Up Down Clock regsiter

@@ -818,7 +827,7 @@ int piGpioLayout (void)

  for (c = &line [strlen (line) - 1] ; (*c == '\n') || (*c == '\r') ; --c)
    *c = 0 ;
-  
+
  if (wiringPiDebug)
    printf ("piGpioLayout: Revision string: %s\n", line) ;

@@ -887,7 +896,7 @@ int piBoardRev (void)
 *	So the distinction between boards that I can see is:
 *
 *		0000 - Error
- *		0001 - Not used 
+ *		0001 - Not used
 *
 *	Original Pi boards:
 *		0002 - Model B,  Rev 1,   256MB, Egoman
@@ -972,7 +981,7 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)

  for (c = &line [strlen (line) - 1] ; (*c == '\n') || (*c == '\r') ; --c)
    *c = 0 ;
-  
+
  if (wiringPiDebug)
    printf ("piBoardId: Revision string: %s\n", line) ;

@@ -1011,7 +1020,7 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)
    bMfg      = (revision & (0x0F << 16)) >> 16 ;
    bMem      = (revision & (0x07 << 20)) >> 20 ;
    bWarranty = (revision & (0x03 << 24)) != 0 ;
-    
+
    *model    = bType ;
    *rev      = bRev ;
    *mem      = bMem ;
@@ -1038,7 +1047,7 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)
 // If longer than 4, we'll assume it's been overvolted

    *warranty = strlen (c) > 4 ;
-  
+
 // Extract last 4 characters:

    c = c + strlen (c) - 4 ;
@@ -1078,7 +1087,7 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)
    else                              { *model = 0           ; *rev = 0              ; *mem =   0 ; *maker = 0 ;               }
  }
 }
- 
+


 /*
@@ -1209,6 +1218,11 @@ void pwmSetRange (unsigned int range)
 void pwmSetClock (int divisor)
 {
  uint32_t pwm_control ;
+
+  if (piGpioBase == GPIO_PERI_BASE_2711)
+  {
+    divisor = 540*divisor/192;
+  }
  divisor &= 4095 ;

  if ((wiringPiMode == WPI_MODE_PINS) || (wiringPiMode == WPI_MODE_PHYS) || (wiringPiMode == WPI_MODE_GPIO))
@@ -1264,7 +1278,7 @@ void gpioClockSet (int pin, int freq)
    pin = physToGpio [pin] ;
  else if (wiringPiMode != WPI_MODE_GPIO)
    return ;
-  
+
  divi = 19200000 / freq ;
  divr = 19200000 % freq ;
  divf = (int)((double)divr * 4096.0 / 19200000.0) ;
@@ -1508,11 +1522,36 @@ void pullUpDnControl (int pin, int pud)
    else if (wiringPiMode != WPI_MODE_GPIO)
      return ;

-    *(gpio + GPPUD)              = pud & 3 ;		delayMicroseconds (5) ;
-    *(gpio + gpioToPUDCLK [pin]) = 1 << (pin & 31) ;	delayMicroseconds (5) ;
-    
-    *(gpio + GPPUD)              = 0 ;			delayMicroseconds (5) ;
-    *(gpio + gpioToPUDCLK [pin]) = 0 ;			delayMicroseconds (5) ;
+    if (piGpioPupOffset == GPPUPPDN0)
+    {
+      // Pi 4B pull up/down method
+      int pullreg = GPPUPPDN0 + (pin>>4);
+      int pullshift = (pin & 0xf) << 1;
+      unsigned int pullbits;
+      unsigned int pull;
+
+      switch (pud)
+      {
+        case PUD_OFF: pull = 0; break;
+        case PUD_UP: pull = 1; break;
+        case PUD_DOWN: pull = 2; break;
+        default: return ; /* An illegal value */
+      }
+
+      pullbits = *(gpio + pullreg);
+      pullbits &= ~(3 << pullshift);
+      pullbits |= (pull << pullshift);
+      *(gpio + pullreg) = pullbits;
+    }
+    else
+    {
+      // legacy pull up/down method
+      *(gpio + GPPUD)              = pud & 3 ;		delayMicroseconds (5) ;
+      *(gpio + gpioToPUDCLK [pin]) = 1 << (pin & 31) ;	delayMicroseconds (5) ;
+
+      *(gpio + GPPUD)              = 0 ;			delayMicroseconds (5) ;
+      *(gpio + gpioToPUDCLK [pin]) = 0 ;			delayMicroseconds (5) ;
+    }
  }
  else						// Extension module
  {
@@ -1533,7 +1572,6 @@ int digitalRead (int pin)
 {
  char c ;
  struct wiringPiNodeStruct *node = wiringPiNodes ;
-
  if ((pin & PI_GPIO_MASK) == 0)		// On-Board Pin
  {
    /**/ if (wiringPiMode == WPI_MODE_GPIO_SYS)	// Sys mode
@@ -1684,7 +1722,7 @@ void pwmWrite (int pin, int value)

 /*
 * analogRead:
- *	Read the analog value of a given Pin. 
+ *	Read the analog value of a given Pin.
 *	There is no on-board Pi analog hardware,
 *	so this needs to go to a new node.
 *********************************************************************************
@@ -1703,7 +1741,7 @@ int analogRead (int pin)

 /*
 * analogWrite:
- *	Write the analog value to the given Pin. 
+ *	Write the analog value to the given Pin.
 *	There is no on-board Pi analog hardware,
 *	so this needs to go to a new node.
 *********************************************************************************
@@ -1752,7 +1790,7 @@ void pwmToneWrite (int pin, int freq)
 *	Write an 8-bit byte to the first 8 GPIO pins - try to do it as
 *	fast as possible.
 *	However it still needs 2 operations to set the bits, so any external
- *	hardware must not rely on seeing a change as there will be a change 
+ *	hardware must not rely on seeing a change as there will be a change
 *	to set the outputs bits to zero, then another change to set the 1's
 *	Reading is just bit fiddling.
 *	These are wiringPi pin numbers 0..7, or BCM_GPIO pin numbers
@@ -1808,7 +1846,7 @@ unsigned int digitalReadByte (void)
      data = (data << 1) | x ;
    }
  }
-  else 
+  else
  {
    raw = *(gpio + gpioToGPLEV [0]) ; // First bank for these pins
    for (pin = 0 ; pin < 8 ; ++pin)
@@ -1865,7 +1903,7 @@ unsigned int digitalReadByte2 (void)
      data = (data << 1) | x ;
    }
  }
-  else 
+  else
    data = ((*(gpio + gpioToGPLEV [0])) >> 20) & 0xFF ; // First bank for these pins

  return data ;
@@ -2243,7 +2281,9 @@ int wiringPiSetup (void)

  piBoardId (&model, &rev, &mem, &maker, &overVolted) ;

-  if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || (model == PI_MODEL_CM3P))
+  if ((model == PI_MODEL_CM) ||
+      (model == PI_MODEL_CM3) ||
+      (model == PI_MODEL_CM3P))
    wiringPiMode = WPI_MODE_GPIO ;
  else
    wiringPiMode = WPI_MODE_PINS ;
@@ -2268,16 +2308,23 @@ int wiringPiSetup (void)
    case PI_ALPHA:	case PI_MODEL_CM:
    case PI_MODEL_ZERO:	case PI_MODEL_ZERO_W:
      piGpioBase = GPIO_PERI_BASE_OLD ;
+      piGpioPupOffset = GPPUD ;
+      break ;
+
+    case PI_MODEL_4B:
+      piGpioBase = GPIO_PERI_BASE_2711 ;
+      piGpioPupOffset = GPPUPPDN0 ;
      break ;

    default:
-      piGpioBase = GPIO_PERI_BASE_NEW ;
+      piGpioBase = GPIO_PERI_BASE_2835 ;
+      piGpioPupOffset = GPPUD ;
      break ;
  }

 // Open the master /dev/ memory control device
 // Device strategy: December 2016:
-//	Try /dev/mem. If that fails, then 
+//	Try /dev/mem. If that fails, then
 //	try /dev/gpiomem. If that fails then game over.

  if ((fd = open ("/dev/mem", O_RDWR | O_SYNC | O_CLOEXEC)) < 0)
@@ -2315,13 +2362,13 @@ int wiringPiSetup (void)
  pwm = (uint32_t *)mmap(0, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, GPIO_PWM) ;
  if (pwm == MAP_FAILED)
    return wiringPiFailure (WPI_ALMOST, "wiringPiSetup: mmap (PWM) failed: %s\n", strerror (errno)) ;
- 
+
 //	Clock control (needed for PWM)

  clk = (uint32_t *)mmap(0, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, GPIO_CLOCK_BASE) ;
  if (clk == MAP_FAILED)
    return wiringPiFailure (WPI_ALMOST, "wiringPiSetup: mmap (CLOCK) failed: %s\n", strerror (errno)) ;
- 
+
 //	The drive pads

  pads = (uint32_t *)mmap(0, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, GPIO_PADS) ;
@@ -2441,7 +2488,7 @@ int wiringPiSetupSys (void)

 // Open and scan the directory, looking for exported GPIOs, and pre-open
 //	the 'value' interface to speed things up for later
-  
+
  for (pin = 0 ; pin < 64 ; ++pin)
  {
    sprintf (fName, "/sys/class/gpio/gpio%d/value", pin) ;
@@ -102,6 +102,7 @@
 #define	PI_MODEL_3BP 		13
 #define	PI_MODEL_3AP 		14
 #define	PI_MODEL_CM3P 		16
+#define	PI_MODEL_4B 		17

 #define	PI_VERSION_1		0
 #define	PI_VERSION_1_1		1
@@ -134,7 +135,7 @@ extern const int   piMemorySize    [ 8] ;
 // wiringPiNodeStruct:
 //	This describes additional device nodes in the extended wiringPi
 //	2.0 scheme of things.
-//	It's a simple linked list for now, but will hopefully migrate to 
+//	It's a simple linked list for now, but will hopefully migrate to
 //	a binary tree for efficiency reasons - but then again, the chances
 //	of more than 1 or 2 devices being added are fairly slim, so who
 //	knows....
@@ -211,7 +212,7 @@ extern          void pwmWrite            (int pin, int value) ;
 extern          int  analogRead          (int pin) ;
 extern          void analogWrite         (int pin, int value) ;

-// PiFace specifics 
+// PiFace specifics
 //	(Deprecated)

 extern int  wiringPiSetupPiFace (void) ;
@@ -31,9 +31,9 @@ endif

 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
-CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)

 LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
@@ -78,10 +78,10 @@ install: wiringpid
 .PHONY:	install-deb
 install-deb:	gpio
 	$Q echo "[Install: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/bin
-	$Q install -m 0755 gpio							~/wiringPi/debian-template/wiringPi/usr/bin
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/man/man1
-	$Q install -m 0644 gpio.1						~/wiringPi/debian-template/wiringPi/man/man1
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/bin
+	$Q install -m 0755 gpio							$(DEB_DESTDIR)/usr/bin
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/man/man1
+	$Q install -m 0644 gpio.1						$(DEB_DESTDIR)/man/man1

 .PHONY:	uninstall
 uninstall:
Author	SHA1	Message	Date
Phil Howard	50fa6362f9	First crack at a build workflow	2020-11-26 16:18:51 +00:00
Philip Howard	5c6bab7d42	Merge pull request #79 from DavidAntliff/debian-fix Remove hard-coded destination paths for debian package creation.	2020-09-14 15:02:31 +01:00
Philip Howard	6d9ce35f00	Merge pull request #73 from CoRfr/master Make external CC declaration possible	2020-09-14 14:59:54 +01:00
David Antliff	f9ff3b4d35	Remove hard-coded destination paths for debian package creation.	2020-09-03 13:18:01 +12:00
Mark Liffiton	50b7c5ed7d	Merge pull request #75 from ykla/master Add piMemorySize for rpi4b	2020-04-07 21:53:39 -05:00
FindWaySociety-ykla	7d8188d0bf	Add piMemorySize for rpi4 #include <stdio.h> int main() { int bRev, bType, bProc, bMfg, bMem, bWarranty ; int revision = 12595474; //Convert hexadecimal to decimal bRev = (revision & (0x0F << 0)) >> 0 ; bType = (revision & (0xFF << 4)) >> 4 ; bProc = (revision & (0x0F << 12)) >> 12 ; // Not used for now. bMfg = (revision & (0x0F << 16)) >> 16 ; bMem = (revision & (0x07 << 20)) >> 20 ; bWarranty = (revision & (0x03 << 24)) != 0 ; printf ("piBoardId: rev: %d, type: %d, proc: %d, mfg: %d, mem: %d, warranty: %d\n", bRev, bType, bProc, bMfg, bMem, bWarranty) ; return 0; } /* revision see https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md RPI revision is HEX.\	2020-04-07 17:19:45 +08:00
Bertrand Roussel	33fbcd7e50	Make external CC and CFLAGS declaration possible	2020-01-26 11:13:14 -08:00
Mark Liffiton	5bbb6e34b8	Merge pull request #71 from neuralassembly/master Keeping compatibility of hardware clock of Pi 4 with earlier versions.	2019-12-31 15:24:56 -06:00
neuralassembly	651136a110	Keeping compatibility of hardware clock of Pi 4 with earlier versions.	2019-12-30 23:40:30 +09:00
Mark Liffiton	1f908c5eed	Small change to reflect new version.	2019-12-29 20:40:42 -06:00
Mark Liffiton	2a8e57a1c7	Update README, convert to markdown With Gordon ending development of WiringPi, this repository needs to reflect the situation accurately and differentiate between Gordon's final code release and updates made since then.	2019-12-29 20:39:00 -06:00
Mark Liffiton	16a23e3688	Merge pull request #70 from steveb/master Add support for Raspberry Pi 4B	2019-12-29 20:23:09 -06:00
Steve Baker	9aed9a4415	Increment version to 2.60 Now that the upstream maintainer has abandoned this project without establishing another maintainer, its difficult to choose an appropriate version number. Going with 2.60 for now, as this only has incremental changes to support 4B.	2019-12-14 20:45:00 +00:00
Steve Baker	41f941a78e	Fix GPIO pull up/down for Pi4B Based on this raspi-gpio commit[1] the 2711 chip uses a different method for pull up/down. This change implements that same method. With this change, wiringPi now works for the Pi4B with the subset of functionality used by zynthian. [1] https://github.com/RPi-Distro/raspi-gpio/commit/80fa7d04eafb3ea34fc6f2d32de5f1873b5fb369?diff=unified	2019-12-14 20:42:06 +00:00
Steve Baker	a49f696232	Use correct peripheral address for Pi4B	2019-12-14 02:01:23 +00:00
Steve Baker	aca883a051	Add support for Raspberry Pi 4B This change make the following commands correctly detect the 4B however there may be an issue with reading GPIO inputs on the 4B as they are always returning zero. The aim of this change is to be the source-equivalent of the binary package release 2.52[1] which was the last release before upstream development ceased. [1] http://wiringpi.com/wiringpi-updated-to-2-52-for-the-raspberry-pi-4b/	2019-12-14 01:09:13 +00:00
@@ -1 +1 @@
 .50
 .60