Merge branch 'master' of git://mutabah.net/opendispense2

[tpg/opendispense2.git] / src / server / handler_snack.c

diff --git a/src/server/handler_snack.c b/src/server/handler_snack.c
index 2e7c4a6..e8b29ec 100644 (file)
--- a/src/server/handler_snack.c
+++ b/src/server/handler_snack.c
@@ -37,25 +37,29 @@ regex_t     gSnack_ResponseRegex;
 // == CODE ===
 int Snack_InitHandler()
 {
-       giSnack_SerialFD = open(gsSnack_SerialPort, O_RDWR);
+       giSnack_SerialFD = InitSerial(gsSnack_SerialPort, 9600);
+       if( giSnack_SerialFD == -1 ) {
+               fprintf(stderr, "ERROR: Unable to open snack serial port ('%s')\n", gsSnack_SerialPort);
+       }
+       
        regcomp(&gSnack_ResponseRegex, "^(\\d\\d\\d)(.*)$", REG_EXTENDED);
        return 0;
 }
 
-int Snack_CanDispense(int User, int Item)
+int Snack_CanDispense(int UNUSED(User), int Item)
 {
        // Sanity please
        if( Item < 0 || Item > 99 )     return -1;
        
        // Hmm... could we implement slot statuses?
        
-       return 1;
+       return 0;
 }
 
 /**
  * \brief Actually do a dispense from the coke machine
  */
-int Snack_DoDispense(int User, int Item)
+int Snack_DoDispense(int UNUSED(User), int Item)
 {
        char    tmp[32];
        regmatch_t      matches[4];