X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_snack.c;h=e8b29ec6bfdc38cee3ce7dd364d83d0447c0918b;hb=0b5755205d388b5704c040c21285c0b7ab58825e;hp=826851e31c0c11e06c22ab9e89ad7532926fbb51;hpb=51560013d0ab4c823c3d1b28a0d0485cc84b2e40;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_snack.c b/src/server/handler_snack.c
index 826851e..e8b29ec 100644
--- a/src/server/handler_snack.c
+++ b/src/server/handler_snack.c
@@ -37,23 +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;
 	
-	return 1;
+	// Hmm... could we implement slot statuses?
+	
+	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];
@@ -71,5 +77,3 @@ int Snack_DoDispense(int User, int Item)
 
 	return 0;
 }
-
-