extern int wpMode ;
+#ifndef TRUE
+# define TRUE (1==1)
+# define FALSE (1==2)
+#endif
+
/*
* doReadallExternal:
* A relatively crude way to read the pins on an external device.
3, 5, // 8...9
24, 26, 19, 21, 23, // 10..14
8, 10, // 15..16
- 3, 4, 5, 6, // 17..20
+ 53, 54, 55, 56, // 17..20
0,0,0,0,0,0,0,0,0,0,0, // 20..31
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 32..47
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 47..63
14, 10,
-1, 11, // 25, 26
-// Padding:
-
-1, -1, -1, -1, -1, // ... 31
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 47
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 63
+ -1, -1, -1, -1, -1, // ... 52
+ 28, 29, 30, 31, // ... 53, 54, 55, 56 - P5
+ -1, -1, -1, -1, -1, -1, -1, // ... 63
} ;
static char *physNames [64] =
"SCLK", "CE0",
"0v", "CE1",
- NULL,NULL,NULL,NULL,NULL,
- NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
- NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+ NULL,NULL,NULL,NULL,NULL, // ... 31
+ NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, // ... 47
+ NULL,NULL,NULL,NULL,NULL, // ... 52
+ "GPIO8", "GPIO9", "GPIO10", "GPIO11", // ... 53, 54, 55, 56 - P5
+ NULL,NULL,NULL,NULL,NULL,NULL, // ... 63
} ;
static void readallPhys (int physPin)
}
+int cmReadall (void)
+{
+ int model, rev, mem ;
+ int pin ;
+ char *maker ;
+
+ piBoardId (&model, &rev, &mem, &maker) ;
+ if (model != PI_MODEL_CM)
+ return FALSE ;
+
+ printf ("+-----+------+-------+ +-----+------+-------+\n") ;
+ printf ("| Pin | Mode | Value | | Pin | Mode | Value |\n") ;
+ printf ("+-----+------+-------+ +-----+------+-------+\n") ;
+
+ for (pin = 0 ; pin < 28 ; ++pin)
+ {
+ printf ("| %3d ", pin) ;
+ printf ("| %-4s ", alts [getAlt (pin)]) ;
+ printf ("| %s ", digitalRead (pin) == HIGH ? "High" : "Low ") ;
+ printf ("| ") ;
+ printf ("| %3d ", pin + 28) ;
+ printf ("| %-4s ", alts [getAlt (pin + 28)]) ;
+ printf ("| %s ", digitalRead (pin + 28) == HIGH ? "High" : "Low ") ;
+ printf ("|\n") ;
+ }
+
+ printf ("+-----+------+-------+ +-----+------+-------+\n") ;
+
+ return TRUE ;
+}
+
+
void doReadall (void)
{
int pin ;
return ;
}
+ if (cmReadall ())
+ return ;
+
/**/ if (wpMode == WPI_MODE_GPIO)
{
printf (" +-----+-------+------+----+-Rev%d-----+----+------+-------+-----+\n", piBoardRev ()) ;
return ;
}
+ if (cmReadall ())
+ return ;
+
printf ("+----------+-Rev%d-+------+--------+------+-------+\n", piBoardRev ()) ;
printf ("| wiringPi | GPIO | Phys | Name | Mode | Value |\n") ;
printf ("+----------+------+------+--------+------+-------+\n") ;
#include <sys/ioctl.h>
#include "softPwm.h"
+#include "softTone.h"
#include "wiringPi.h"
// physToGpio:
// Take a physical pin (1 through 26) and re-map it to the BCM_GPIO pin
// Cope for 2 different board revisions here.
+// Also add in the P5 connector, so the P5 pins are 3,4,5,6, so 53,54,55,56
static int *physToGpio ;
11, 8,
-1, 7, // 25, 26
-// Padding:
-
-1, -1, -1, -1, -1, // ... 31
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 47
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 63
11, 8,
-1, 7, // 25, 26
-// Padding:
+// the P5 connector on the Rev 2 boards:
-1, -1, -1, -1, -1, // ... 31
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 47
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // ... 63
+ -1, -1, -1, -1, -1, // ... 52
+ 28, 29, 30, 31, // ... 53, 54, 55, 56 - P5
+ -1, -1, -1, -1, -1, -1, -1, // ... 63
} ;
*
* Much confusion here )-:
* Seems there are some boards with 0000 in them (mistake in manufacture)
- * and some board with 0005 in them (another mistake in manufacture?)
* So the distinction between boards that I can see is:
* 0000 - Error
- * 0001 - Not used
- * 0002 - Rev 1
- * 0003 - Rev 1
- * 0004 - Rev 2 (Early reports?
- * 0005 - Rev 2 (but error?)
- * 0006 - Rev 2
- * 0008 - Rev 2 - Model A
- * 000e - Rev 2 + 512MB
- * 000f - Rev 2 + 512MB
+ * 0001 - Not used (Compute - default to Rev 2)
+ * 0002 - Model B, Rev 1, 256MB
+ * 0003 - Model B, Rev 1.1, 256MB, Fuses/D14 removed.
+ * 0004 - Model B, Rev 2, 256MB, Sony
+ * 0005 - Model B, Rev 2, 256MB, Qisda
+ * 0006 - Model B, Rev 2, 256MB, Egoman
+ * 0007 - Model A, Rev 2, 256MB, Egoman
+ * 0008 - Model A, Rev 2, 256MB, Sony
+ * 0009 - Model A, Rev 2, 256MB, Qisda
+ * 000d - Model B, Rev 2, 512MB, Egoman
+ * 000e - Model B, Rev 2, 512MB, Sony
+ * 000f - Model B, Rev 2, 512MB, Qisda
+ * 0011 - Pi compute Module
*
* A small thorn is the olde style overvolting - that will add in
* 1000000
*
+ * The Pi compute module has an revision of 0011 - since we only check the
+ * last digit, then it's 1, therefore it'll default to not 2 or 3 for a
+ * Rev 1, so will appear as a Rev 2. This is fine for the most part, but
+ * we'll properly detect the Compute Module later and adjust accordingly.
+ *
*********************************************************************************
*/
}
+/*
+ * piBoardId:
+ * Do more digging into the board revision string as above, but return
+ * as much details as we can.
+ *********************************************************************************
+ */
+
+const char *piModelNames [] =
+{
+ "Model A",
+ "Model B",
+ "Compute Module",
+} ;
+
+const char *piRevisionNames[] =
+{
+ "1",
+ "1.1",
+ "2",
+} ;
+
+void piBoardId (int *model, int *rev, int *mem, char **maker)
+{
+ FILE *cpuFd ;
+ char line [120] ;
+ char *c ;
+
+ piBoardRev () ; // Call this first to make sure all's OK. Don't care about the result.
+
+ if ((cpuFd = fopen ("/proc/cpuinfo", "r")) == NULL)
+ piBoardRevOops ("Unable to open /proc/cpuinfo") ;
+
+ while (fgets (line, 120, cpuFd) != NULL)
+ if (strncmp (line, "Revision", 8) == 0)
+ break ;
+
+ fclose (cpuFd) ;
+
+ if (strncmp (line, "Revision", 8) != 0)
+ piBoardRevOops ("No \"Revision\" line") ;
+
+// Chomp trailing CR/NL
+
+ for (c = &line [strlen (line) - 1] ; (*c == '\n') || (*c == '\r') ; --c)
+ *c = 0 ;
+
+ if (wiringPiDebug)
+ printf ("piboardId: Revision string: %s\n", line) ;
+
+// Scan to first digit
+
+ for (c = line ; *c ; ++c)
+ if (isdigit (*c))
+ break ;
+
+// Make sure its long enough
+
+ if (strlen (c) < 4)
+ piBoardRevOops ("Bogus \"Revision\" line") ;
+
+// Extract last 4 characters:
+
+ c = c + strlen (c) - 4 ;
+
+// Fill out the replys as appropriate
+
+ /**/ if (strcmp (c, "0002") == 0) { *model = 1 ; *rev = 0 ; *mem = 256 ; *maker = "China" ; }
+ else if (strcmp (c, "0003") == 0) { *model = 1 ; *rev = 1 ; *mem = 256 ; *maker = "China" ; }
+ else if (strcmp (c, "0004") == 0) { *model = 1 ; *rev = 2 ; *mem = 256 ; *maker = "Sony" ; }
+ else if (strcmp (c, "0005") == 0) { *model = 1 ; *rev = 2 ; *mem = 256 ; *maker = "Qisda" ; }
+ else if (strcmp (c, "0006") == 0) { *model = 1 ; *rev = 2 ; *mem = 256 ; *maker = "Egoman" ; }
+ else if (strcmp (c, "0007") == 0) { *model = 0 ; *rev = 2 ; *mem = 256 ; *maker = "Egoman" ; }
+ else if (strcmp (c, "0008") == 0) { *model = 0 ; *rev = 2 ; *mem = 256 ; *maker = "Sony" ; }
+ else if (strcmp (c, "0009") == 0) { *model = 1 ; *rev = 2 ; *mem = 256 ; *maker = "Qisda" ; }
+ else if (strcmp (c, "000d") == 0) { *model = 1 ; *rev = 2 ; *mem = 512 ; *maker = "Egoman" ; }
+ else if (strcmp (c, "000e") == 0) { *model = 1 ; *rev = 2 ; *mem = 512 ; *maker = "Sony" ; }
+ else if (strcmp (c, "000f") == 0) { *model = 1 ; *rev = 2 ; *mem = 512 ; *maker = "Egoman" ; }
+ else if (strcmp (c, "0011") == 0) { *model = 2 ; *rev = 1 ; *mem = 512 ; *maker = "Sony" ; }
+ else { *model = 0 ; *rev = 0 ; *mem = 0 ; *maker = "Unkn" ; }
+}
+
+
+
/*
* wpiPinToGpio:
* Translate a wiringPi Pin number to native GPIO pin number.
else if (wiringPiMode != WPI_MODE_GPIO)
return ;
- softPwmStop (origPin) ;
+ softPwmStop (origPin) ;
+ softToneStop (origPin) ;
fSel = gpioToGPFSEL [pin] ;
shift = gpioToShift [pin] ;
*(gpio + fSel) = (*(gpio + fSel) & ~(7 << shift)) | (1 << shift) ;
else if (mode == SOFT_PWM_OUTPUT)
softPwmCreate (origPin, 0, 100) ;
+ else if (mode == SOFT_TONE_OUTPUT)
+ softToneCreate (origPin) ;
else if (mode == PWM_OUTPUT)
{
if ((alt = gpioToPwmALT [pin]) == 0) // Not a hardware capable PWM pin
if (pid == 0) // Child, exec
{
- execl ("/usr/local/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
- return wiringPiFailure (WPI_FATAL, "wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+ if (access ("/usr/local/bin/gpio", X_OK))
+ {
+ execl ("/usr/local/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+ return wiringPiFailure (WPI_FATAL, "wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+ }
+ else if (access ("/usr/bin/gpio", X_OK))
+ {
+ execl ("/usr/bin/gpio", "gpio", "edge", pinS, modeS, (char *)NULL) ;
+ return wiringPiFailure (WPI_FATAL, "wiringPiISR: execl failed: %s\n", strerror (errno)) ;
+ }
+ else
+ return wiringPiFailure (WPI_FATAL, "wiringPiISR: Can't find gpio program\n") ;
}
else // Parent, wait
wait (NULL) ;
*
* Default setup: Initialises the system into wiringPi Pin mode and uses the
* memory mapped hardware directly.
+ *
+ * Changed now to revert to "gpio" mode if we're running on a Compute Module.
*********************************************************************************
*/
int wiringPiSetup (void)
{
- int fd ;
- int boardRev ;
+ int fd ;
+ int boardRev ;
+ int model, rev, mem ;
+ char *maker ;
if (getenv (ENV_DEBUG) != NULL)
wiringPiDebug = TRUE ;
initialiseEpoch () ;
- wiringPiMode = WPI_MODE_PINS ;
+// If we're running on a compute module, then wiringPi pin numbers don't really many anything...
+
+ piBoardId (&model, &rev, &mem, &maker) ;
+ if (model == PI_MODEL_CM)
+ wiringPiMode = WPI_MODE_GPIO ;
+ else
+ wiringPiMode = WPI_MODE_PINS ;
return 0 ;
}
~ianmdlvl / wiringPi.git / commitdiff