X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_snack.c;h=e8b29ec6bfdc38cee3ce7dd364d83d0447c0918b;hb=54085f9d3fa0c1b1eeb3a82a0c4a6e3400d9961c;hp=2e7c4a6ef43f87649200171890664b3c47cc5a76;hpb=99cf95b138082d1c02705682ad0dfd8b67a27ac4;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_snack.c b/src/server/handler_snack.c
index 2e7c4a6..e8b29ec 100644
--- 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];