Remove confusing typedef

1 files changed, 20 insertions, 22 deletions

diff --git a/camera.h b/camera.h
index b24d508..2ef0f03 100644
--- a/camera.h
+++ b/camera.h
@@ -37,50 +37,48 @@
 #define VC0706_GET_ZOOM 0x53
 
 #define CAM_BAUD_RATE LE_TTY_SPEED_38400
-#define BUFF_SIZE 1000
+#define BUFF_SIZE 100
 #define DELAY 10
 #define TIMEOUT 200
 #define CAM_SERIAL 0
 
 static const char SERIAL_PATH[] = "/dev/ttyHS0";
 
-typedef uint8_t byte;
-
 typedef struct {
   int fd; // file descriptor for the serial port
-  byte serialNum; // camera serial number
-  byte buff[BUFF_SIZE]; // byte array to store camera data
-  int bufferLen; // current length of data in buffer
+  uint8_t serialNum; // camera serial number
+  uint8_t buff[BUFF_SIZE]; // uint8_t array to store camera data
+  uint8_t bufferLen; // current length of data in buffer
   uint16_t frameptr;
 } Camera;
 
 void delay (unsigned int msecs);
 int openCameraFd ();
-void sendCommand (Camera *cam, byte cmd, byte args[]);
-bool runCommand (Camera *cam, byte cmd, byte args[], int respLen);
-int readResponse (Camera *cam, int nBytes, unsigned int timeout);
-bool verifyResponse (Camera *cam, byte cmd);
-bool cameraFrameBuffCtrl (Camera *cam, byte cmd);
+void sendCommand (Camera *cam, uint8_t cmd, uint8_t args[]);
+bool runCommand (Camera *cam, uint8_t cmd, uint8_t args[], int respLen);
+uint8_t readResponse (Camera *cam, int nBytes, unsigned int timeout);
+bool verifyResponse (Camera *cam, uint8_t cmd);
+bool cameraFrameBuffCtrl (Camera *cam, uint8_t cmd);
 bool takePicture (Camera *cam);
 bool reset (Camera *cam);
 bool TVon (Camera *cam);
 bool TVOff (Camera *cam);
-byte *readPicture (Camera *cam, byte n);
+uint8_t *readPicture (Camera *cam, uint8_t n);
 bool resumeVideo (Camera *cam);
 uint32_t frameLength (Camera *cam);
 char *getVersion (Camera *cam);
-byte available (Camera *cam);
-byte getDownsize (Camera *cam);
-bool setDownsize(Camera *cam, byte newSize);
-int getImageSize (Camera *cam);
-bool setImageSize (Camera *cam, byte x);
+uint8_t available (Camera *cam);
+uint8_t getDownsize (Camera *cam);
+bool setDownsize(Camera *cam, uint8_t newSize);
+uint8_t getImageSize (Camera *cam);
+bool setImageSize (Camera *cam, uint8_t x);
 bool getMotionDetect (Camera *cam);
-byte getMotionStatus(Camera *cam, byte x);
+uint8_t getMotionStatus(Camera *cam, uint8_t x);
 bool motionDetected (Camera *cam);
 bool setMotionDetect (Camera *cam, bool flag);
-bool setMotionStatus (Camera *cam, byte x, byte d1, byte d2);
-byte getCompression (Camera *cam);
-bool setCompression(Camera *cam, byte c);
+bool setMotionStatus (Camera *cam, uint8_t x, uint8_t d1, uint8_t d2);
+uint8_t getCompression (Camera *cam);
+bool setCompression(Camera *cam, uint8_t c);
 bool getPTZ(Camera *cam, uint16_t *w, uint16_t *h, uint16_t *wz, uint16_t *hz, uint16_t *pan, uint16_t *tilt);
 bool setPTZ(Camera *cam, uint16_t wz, uint16_t hz, uint16_t pan, uint16_t tilt);
-bool snapshotToFile (Camera *cam, char *path, byte imgSize);
+bool snapshotToFile (Camera *cam, char *path, uint8_t imgSize);