--- libaitpelco/src/aitpelco.c 2010/03/12 15:30:46 1.1.1.1.2.3 +++ libaitpelco/src/aitpelco.c 2012/07/22 22:21:50 1.3 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitpelco.c,v 1.1.1.1.2.3 2010/03/12 15:30:46 misho Exp $ +* $Id: aitpelco.c,v 1.3 2012/07/22 22:21:50 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "aitpelco.h" @@ -19,26 +56,29 @@ static char pelco_Error[STRSIZ]; // // pelco_GetErrno() Get error code of last operation -inline int pelco_GetErrno() +inline int +pelco_GetErrno() { return pelco_Errno; } // pelco_GetError() Get error text of last operation -inline const char *pelco_GetError() +inline const char * +pelco_GetError() { return pelco_Error; } // pelco_SetErr() Set error to variables for internal use!!! -inline void pelcoSetErr(int eno, char *estr, ...) +inline void +pelcoSetErr(int eno, char *estr, ...) { va_list lst; pelco_Errno = eno; - memset(pelco_Error, 0, STRSIZ); + memset(pelco_Error, 0, sizeof pelco_Error); va_start(lst, estr); - vsnprintf(pelco_Error, STRSIZ, estr, lst); + vsnprintf(pelco_Error, sizeof pelco_Error, estr, lst); va_end(lst); } @@ -50,7 +90,8 @@ inline void pelcoSetErr(int eno, char *estr, ...) * @camNo = Packet for camera number address * return: NULL error, !=NULL ok, allocated memory for packet */ -inline void *pelcoOpen(u_char pelcoVer, u_char camNo) +inline void * +pelcoOpen(u_char pelcoVer, u_char camNo) { pelco_d_t *pd; pelco_p_t *pp; @@ -60,7 +101,7 @@ inline void *pelcoOpen(u_char pelcoVer, u_char camNo) case 'D': case 'd': if (camNo < FIRST_CAM_D) { - pelcoSetErr(ENOEXEC, "Error:: unsupported camera number %d!\n", camNo); + pelcoSetErr(ENOEXEC, "unsupported camera number %d!\n", camNo); return NULL; } @@ -92,7 +133,7 @@ inline void *pelcoOpen(u_char pelcoVer, u_char camNo) p = pp; break; default: - pelcoSetErr(ENOEXEC, "Error:: unsupported Pelco protocol version!\n"); + pelcoSetErr(ENOEXEC, "unsupported Pelco protocol version!\n"); } return p; @@ -102,7 +143,8 @@ inline void *pelcoOpen(u_char pelcoVer, u_char camNo) * pelcoClose() Close packet record and free memory * @p = Packet structure for close */ -inline void pelcoClose(void * __restrict p) +inline void +pelcoClose(void * __restrict p) { if (p) free(p); @@ -113,16 +155,22 @@ inline void pelcoClose(void * __restrict p) * @buffer = Pelco packet from input buffer * return: NULL error, !=NULL ok, allocated memory for packet */ -inline void *pelcoLoad(u_char *buffer) +inline void * +pelcoLoad(u_char *buffer) { pelco_d_t *pd; pelco_p_t *pp; void *p = NULL; + if (!buffer || !*buffer) { + pelcoSetErr(EINVAL, "invalid argument!\n"); + return NULL; + } + switch (pelco_GetVersion(buffer)) { case 'd': if (pelco_GetCamNo(buffer) < FIRST_CAM_D) { - pelcoSetErr(ENOEXEC, "Error:: unsupported camera number %d!\n", + pelcoSetErr(ENOEXEC, "unsupported camera number %d!\n", pelco_GetCamNo(buffer)); return NULL; } @@ -147,7 +195,7 @@ inline void *pelcoLoad(u_char *buffer) p = pp; break; default: - pelcoSetErr(ENOEXEC, "Error:: unsupported Pelco protocol version!\n"); + pelcoSetErr(ENOEXEC, "unsupported Pelco protocol version!\n"); } return p; @@ -160,22 +208,23 @@ inline void *pelcoLoad(u_char *buffer) * @data[2] = Input Data for commands 1 & 2 * return: 0xFF - error, 0 - ok */ -inline u_char pelcoAddCmdData(void * __restrict p, u_char * __restrict cmd, u_char * __restrict data) +inline u_char +pelcoAddCmdData(void * __restrict p, u_char * __restrict cmd, u_char * __restrict data) { u_char ret = 0; pelco_d_t *pd = (pelco_d_t *) p; pelco_p_t *pp = (pelco_p_t *) p; u_char *ptr = p; - if (!p) { - pelcoSetErr(EINVAL, "Error:: invalid argument!\n"); + if (!p || !*ptr) { + pelcoSetErr(EINVAL, "invalid argument!\n"); return 0xFF; } switch (ptr[0]) { case VER_D_SYNC: if (ptr[1] < FIRST_CAM_D) { - pelcoSetErr(ENOEXEC, "Error:: unsupported camera number %d!\n", ptr[1]); + pelcoSetErr(ENOEXEC, "unsupported camera number %d!\n", ptr[1]); return 0xFF; } @@ -187,7 +236,7 @@ inline u_char pelcoAddCmdData(void * __restrict p, u_c break; case VER_P_STX: if (VER_P_ETX != ptr[6]) { - pelcoSetErr(ENOEXEC, "Error:: Broken Pelco P packet!\n"); + pelcoSetErr(ENOEXEC, "Broken Pelco P packet!\n"); return 0xFF; } @@ -198,7 +247,7 @@ inline u_char pelcoAddCmdData(void * __restrict p, u_c pp->p_crc = crcPelco('p', p); break; default: - pelcoSetErr(ENOEXEC, "Error:: Invalid protocol!\n"); + pelcoSetErr(ENOEXEC, "Invalid protocol!\n"); return 0xFF; } @@ -212,7 +261,8 @@ inline u_char pelcoAddCmdData(void * __restrict p, u_c * @data[2] = Output Data for commands 1 & 2 * return: 'd' - PelcoD, 'p' - PelcoP, 0 - unknown or bad packet */ -inline u_char pelcoGetCmdData(void * __restrict p, u_char * __restrict cmd, u_char * __restrict data) +inline u_char +pelcoGetCmdData(void * __restrict p, u_char * __restrict cmd, u_char * __restrict data) { return pelco_GetCamCmdData(p, NULL, cmd, data); } @@ -223,21 +273,22 @@ inline u_char pelcoGetCmdData(void * __restrict p, u_c * @correct = Calculate new check sum if incorrect !=0, if ==0 only check * return: 0xFF - bad packet, 1 invalid check sum, 0 check sum is correct. */ -inline u_char pelcoChkSum(void * __restrict p, u_char correct) +inline u_char +pelcoChkSum(void * __restrict p, u_char correct) { u_char sum, *ptr = p; pelco_d_t *pd = (pelco_d_t *) p; pelco_p_t *pp = (pelco_p_t *) p; - if (!p) { - pelcoSetErr(EINVAL, "Error:: invalid argument!\n"); + if (!p || !*ptr) { + pelcoSetErr(EINVAL, "invalid argument!\n"); return 0xFF; } switch (ptr[0]) { case VER_D_SYNC: if (ptr[1] < FIRST_CAM_D) { - pelcoSetErr(ENOEXEC, "Error:: unsupported camera number %d!\n", ptr[1]); + pelcoSetErr(ENOEXEC, "unsupported camera number %d!\n", ptr[1]); return 0xFF; } @@ -247,7 +298,7 @@ inline u_char pelcoChkSum(void * __restrict p, u_char break; case VER_P_STX: if (VER_P_ETX != ptr[6]) { - pelcoSetErr(ENOEXEC, "Error:: Broken Pelco P packet!\n"); + pelcoSetErr(ENOEXEC, "Broken Pelco P packet!\n"); return 0xFF; } @@ -256,7 +307,7 @@ inline u_char pelcoChkSum(void * __restrict p, u_char pp->p_crc = sum; break; default: - pelcoSetErr(ENOEXEC, "Error:: Invalid protocol!\n"); + pelcoSetErr(ENOEXEC, "Invalid protocol!\n"); return 0xFF; }