Updates for the Raspnerry Pi Compute Module - changes to the gpio program

[wiringPi.git] / wiringPi / wiringPi.h

diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index ce4680abf26b5b6d8e37cd580d5b044aa1497336..5117cc9185ecf66ac4f317ce9fe8846e7477b0ce 100644 (file)
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -42,6 +42,8 @@
 #define        OUTPUT                   1
 #define        PWM_OUTPUT               2
 #define        GPIO_CLOCK               3
+#define        SOFT_PWM_OUTPUT          4
+#define        SOFT_TONE_OUTPUT         5
 
 #define        LOW                      0
 #define        HIGH                     1
@@ -64,6 +66,13 @@
 #define        INT_EDGE_RISING         2
 #define        INT_EDGE_BOTH           3
 
+// Pi model types
+
+#define        PI_MODEL_A              0
+#define        PI_MODEL_B              1
+#define        PI_MODEL_CM             2
+
+
 // Threads
 
 #define        PI_THREAD(X)    void *X (void *dummy)
@@ -115,6 +124,12 @@ extern struct wiringPiNodeStruct *wiringPiNodes ;
 extern "C" {
 #endif
 
+// Data
+
+extern const char *piModelNames [] ;
+extern const char *piRevisionNames[] ;
+extern const char *piComputeRevisionNames[] ;
+
 // Internal
 
 extern int wiringPiFailure (int fatal, const char *message, ...) ;
@@ -147,6 +162,7 @@ extern int  wiringPiSetupPiFaceForGpioProg (void) ; // Don't use this - for gpio
 // On-Board Raspberry Pi hardware specific stuff
 
 extern int  piBoardRev          (void) ;
+extern void piBoardId           (int *model, int *rev, int *mem, char **maker) ;
 extern int  wpiPinToGpio        (int wpiPin) ;
 extern int  physPinToGpio       (int physPin) ;
 extern void setPadDrive         (int group, int value) ;