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

Diff for /libaitpelco/inc/aitpelco.h between versions 1.1.1.1 and 1.1.1.1.2.5

version 1.1.1.1, 2010/01/22 00:57:32 version 1.1.1.1.2.5, 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.
 */
 #ifndef __AITPELCO_H  #ifndef __AITPELCO_H
 #define __AITPELCO_H  #define __AITPELCO_H
   
Line 131  inline void *pelcoOpen(u_char pelcoVer, u_char camNo); Line 168  inline void *pelcoOpen(u_char pelcoVer, u_char camNo);
 inline void pelcoClose(void * __restrict p);  inline void pelcoClose(void * __restrict p);
   
 /*  /*
    * pelcoLoad() Load packet from input buffer
    * @buffer = Pelco packet from input buffer
    * return: NULL error, !=NULL ok, allocated memory for packet
    */
   inline void *pelcoLoad(u_char *buffer);
   
   
   /*
  * pelcoAddCmdData() Add commands and datas for already opened packet   * pelcoAddCmdData() Add commands and datas for already opened packet
  * @p = Input Packet structure   * @p = Input Packet structure
  * @cmd[2] = Input Commands 1 & 2   * @cmd[2] = Input Commands 1 & 2
Line 139  inline void pelcoClose(void * __restrict p); Line 184  inline void pelcoClose(void * __restrict p);
  */   */
 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);
   
   /*
    * pelcoGetCmdData() Get from packet commands and datas with verify packet
    * @p = Input Packet structure
    * @cmd[2] = Output Commands 1 & 2
    * @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);
   
 /*  /*
    * pelcoChkSum() Check ot Correct check sum in packet
    * @p = Input Packet structure
    * @correct = Calculate new check sum if incorrect !=0, if ==0 only check
    * return: 0xFF - bad packet, invalid check sum, 0 check sum is correct.
    */
   inline u_char pelcoChkSum(void * __restrict p, u_char correct);
   
   
   /*
  * pelco_GetVersion() Return Pelco protocol version   * pelco_GetVersion() Return Pelco protocol version
  * @p = Packet structure   * @p = Packet structure
  * return: 'd' - PelcoD, 'p' - PelcoP, 0 - unknown or bad packet   * return: 'd' - PelcoD, 'p' - PelcoP, 0 - unknown or bad packet
Line 166  inline u_char pelco_GetCamNo(void * __restrict p); Line 228  inline u_char pelco_GetCamNo(void * __restrict p);
 inline u_char pelco_GetCamCmdData(void * __restrict p, u_char * __restrict cam,   inline u_char pelco_GetCamCmdData(void * __restrict p, u_char * __restrict cam, 
                 u_char * __restrict cmd, u_char * __restrict data);                  u_char * __restrict cmd, u_char * __restrict data);
   
   
 /*  /*
  * pelco_D_toCmd() Convert to Pelco D commands   * pelco_D_toCmd() Convert to Pelco D commands
  * @cmd[2] = Input Commands 1 & 2   * @cmd[2] = Input Commands 1 & 2
Line 216  inline u_char pelco_P_fromCmd(struct bitP_Cmd1 cmd1, s Line 277  inline u_char pelco_P_fromCmd(struct bitP_Cmd1 cmd1, s
  * @p = Output Packet structure   * @p = Output Packet structure
  * return: 0xFF - error, 0 - ok   * return: 0xFF - error, 0 - ok
  */   */
inline u_char pelco_SetCamCmdData(u_char ver, u_char __restrict cam, inline u_char pelco_SetCamCmdData(u_char ver, u_char cam, 
                 u_char * __restrict cmd, u_char * __restrict data, void * __restrict p);                  u_char * __restrict cmd, u_char * __restrict data, void * __restrict p);
   
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.1.2.5

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