Updates to the build process

[wiringPi.git] / wiringPi / wiringPi.h

diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index 5117cc9185ecf66ac4f317ce9fe8846e7477b0ce..dd110fa52ca08b40c3d42fe7e557341d2be2a35e 100644 (file)
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -44,6 +44,7 @@
 #define        GPIO_CLOCK               3
 #define        SOFT_PWM_OUTPUT          4
 #define        SOFT_TONE_OUTPUT         5
+#define        PWM_TONE_OUTPUT          6
 
 #define        LOW                      0
 #define        HIGH                     1
@@ -66,12 +67,35 @@
 #define        INT_EDGE_RISING         2
 #define        INT_EDGE_BOTH           3
 
-// Pi model types
+// Pi model types and version numbers
+//     Intended for the GPIO program Use at your own risk.
 
-#define        PI_MODEL_A              0
-#define        PI_MODEL_B              1
-#define        PI_MODEL_CM             2
+#define        PI_MODEL_UNKNOWN        0
+#define        PI_MODEL_A              1
+#define        PI_MODEL_B              2
+#define        PI_MODEL_BP             3
+#define        PI_MODEL_CM             4
+#define        PI_MODEL_AP             5
+#define        PI_MODEL_2              6
 
+#define        PI_VERSION_UNKNOWN      0
+#define        PI_VERSION_1            1
+#define        PI_VERSION_1_1          2
+#define        PI_VERSION_1_2          3
+#define        PI_VERSION_2            4
+
+#define        PI_MAKER_UNKNOWN        0
+#define        PI_MAKER_EGOMAN         1
+#define        PI_MAKER_SONY           2
+#define        PI_MAKER_QISDA          3
+#define        PI_MAKER_MBEST          4
+
+extern const char *piModelNames    [7] ;
+extern const char *piRevisionNames [5] ;
+extern const char *piMakerNames    [5] ;
+
+
+//     Intended for the GPIO program Use at your own risk.
 
 // Threads
 
@@ -126,10 +150,6 @@ extern "C" {
 
 // Data
 
-extern const char *piModelNames [] ;
-extern const char *piRevisionNames[] ;
-extern const char *piComputeRevisionNames[] ;
-
 // Internal
 
 extern int wiringPiFailure (int fatal, const char *message, ...) ;
@@ -162,11 +182,12 @@ 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 void piBoardId           (int *model, int *rev, int *mem, int *maker, int *overVolted) ;
 extern int  wpiPinToGpio        (int wpiPin) ;
 extern int  physPinToGpio       (int physPin) ;
 extern void setPadDrive         (int group, int value) ;
 extern int  getAlt              (int pin) ;
+extern void pwmToneWrite        (int pin, int freq) ;
 extern void digitalWriteByte    (int value) ;
 extern void pwmSetMode          (int mode) ;
 extern void pwmSetRange         (unsigned int range) ;