[BACK]Return to aitpelco.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitpelco / src

Diff for /libaitpelco/src/aitpelco.c between versions 1.1.1.1.2.4 and 1.1.1.1.2.6

version 1.1.1.1.2.4, 2010/03/17 13:34:34 version 1.1.1.1.2.6, 2011/05/10 20:25:41
Line 5 Line 5
 * $Author$  * $Author$
 * $Id$  * $Id$
 *  *
*************************************************************************/**************************************************************************
 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 <info@elwix.org>
 
 Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
         by Michael Pounov <misho@elwix.org>.  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 <misho@elwix.org>
 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 "global.h"
 #include "aitpelco.h"  #include "aitpelco.h"
   
Line 19  static char pelco_Error[STRSIZ]; Line 56  static char pelco_Error[STRSIZ];
 //  //
   
 // pelco_GetErrno() Get error code of last operation  // pelco_GetErrno() Get error code of last operation
inline int pelco_GetErrno()inline int
 pelco_GetErrno()
 {  {
         return pelco_Errno;          return pelco_Errno;
 }  }
   
 // pelco_GetError() Get error text of last operation  // pelco_GetError() Get error text of last operation
inline const char *pelco_GetError()inline const char *
 pelco_GetError()
 {  {
         return pelco_Error;          return pelco_Error;
 }  }
   
 // pelco_SetErr() Set error to variables for internal use!!!  // 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;          va_list lst;
   
Line 50  inline void pelcoSetErr(int eno, char *estr, ...) Line 90  inline void pelcoSetErr(int eno, char *estr, ...)
  * @camNo = Packet for camera number address   * @camNo = Packet for camera number address
  * return: NULL error, !=NULL ok, allocated memory for packet   * 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_d_t *pd;
         pelco_p_t *pp;          pelco_p_t *pp;
Line 102  inline void *pelcoOpen(u_char pelcoVer, u_char camNo) Line 143  inline void *pelcoOpen(u_char pelcoVer, u_char camNo)
  * pelcoClose() Close packet record and free memory   * pelcoClose() Close packet record and free memory
  * @p = Packet structure for close   * @p = Packet structure for close
  */   */
inline void pelcoClose(void * __restrict p)inline void
 pelcoClose(void * __restrict p)
 {  {
         if (p)          if (p)
                 free(p);                  free(p);
Line 113  inline void pelcoClose(void * __restrict p) Line 155  inline void pelcoClose(void * __restrict p)
  * @buffer = Pelco packet from input buffer   * @buffer = Pelco packet from input buffer
  * return: NULL error, !=NULL ok, allocated memory for packet   * 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_d_t *pd;
         pelco_p_t *pp;          pelco_p_t *pp;
         void *p = NULL;          void *p = NULL;
   
           if (!buffer || !*buffer) {
                   pelcoSetErr(EINVAL, "invalid argument!\n");
                   return NULL;
           }
   
         switch (pelco_GetVersion(buffer)) {          switch (pelco_GetVersion(buffer)) {
                 case 'd':                  case 'd':
                         if (pelco_GetCamNo(buffer) < FIRST_CAM_D) {                          if (pelco_GetCamNo(buffer) < FIRST_CAM_D) {
Line 160  inline void *pelcoLoad(u_char *buffer) Line 208  inline void *pelcoLoad(u_char *buffer)
  * @data[2] = Input Data for commands 1 & 2   * @data[2] = Input Data for commands 1 & 2
  * return: 0xFF - error, 0 - ok   * 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;          u_char ret = 0;
         pelco_d_t *pd = (pelco_d_t *) p;          pelco_d_t *pd = (pelco_d_t *) p;
         pelco_p_t *pp = (pelco_p_t *) p;          pelco_p_t *pp = (pelco_p_t *) p;
         u_char *ptr = p;          u_char *ptr = p;
   
        if (!p) {        if (!p || !*ptr) {
                 pelcoSetErr(EINVAL, "invalid argument!\n");                  pelcoSetErr(EINVAL, "invalid argument!\n");
                 return 0xFF;                  return 0xFF;
         }          }
Line 212  inline u_char pelcoAddCmdData(void * __restrict p, u_c Line 261  inline u_char pelcoAddCmdData(void * __restrict p, u_c
  * @data[2] = Output Data for commands 1 & 2   * @data[2] = Output Data for commands 1 & 2
  * return: 'd' - PelcoD, 'p' - PelcoP, 0 - unknown or bad packet   * 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);          return pelco_GetCamCmdData(p, NULL, cmd, data);
 }  }
Line 223  inline u_char pelcoGetCmdData(void * __restrict p, u_c Line 273  inline u_char pelcoGetCmdData(void * __restrict p, u_c
  * @correct = Calculate new check sum if incorrect !=0, if ==0 only check   * @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.   * 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;          u_char sum, *ptr = p;
         pelco_d_t *pd = (pelco_d_t *) p;          pelco_d_t *pd = (pelco_d_t *) p;
         pelco_p_t *pp = (pelco_p_t *) p;          pelco_p_t *pp = (pelco_p_t *) p;
   
        if (!p) {        if (!p || !*ptr) {
                 pelcoSetErr(EINVAL, "invalid argument!\n");                  pelcoSetErr(EINVAL, "invalid argument!\n");
                 return 0xFF;                  return 0xFF;
         }          }
Removed from v.1.1.1.1.2.4  
changed lines
  Added in v.1.1.1.1.2.6

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>