Diff for /libaitpelco/src/get.c between versions 1.3 and 1.4

version 1.3, 2012/07/22 22:21:50 version 1.4, 2013/05/30 09:20:16
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 51  SUCH DAMAGE. Line 51  SUCH DAMAGE.
  * @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
  */   */
inline u_charu_char
 pelco_GetVersion(void * __restrict p)  pelco_GetVersion(void * __restrict p)
 {  {
         u_char *ptr = (u_char *) p;          u_char *ptr = (u_char *) p;
Line 82  pelco_GetVersion(void * __restrict p) Line 82  pelco_GetVersion(void * __restrict p)
  * return: 0xFF and pelco_GetErrno() == ENOEXEC - error,    * return: 0xFF and pelco_GetErrno() == ENOEXEC - error, 
         any number is camera address          any number is camera address
  */   */
inline u_charu_char
 pelco_GetCamNo(void * __restrict p)  pelco_GetCamNo(void * __restrict p)
 {  {
         u_char ver;          u_char ver;
Line 120  pelco_GetCamNo(void * __restrict p) Line 120  pelco_GetCamNo(void * __restrict p)
  * @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_charu_char
 pelco_GetCamCmdData(void * __restrict p, u_char * __restrict cam,   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)
 {  {
Line 168  pelco_GetCamCmdData(void * __restrict p, u_char * __re Line 168  pelco_GetCamCmdData(void * __restrict p, u_char * __re
  * @cmd2 = Output typecasted commands 2   * @cmd2 = Output typecasted commands 2
  * return: 0xFF - error, !=0 return number arguments   * return: 0xFF - error, !=0 return number arguments
  */   */
inline u_charu_char
 pelco_D_toCmd(u_char * __restrict cmd, struct bitD_Cmd1 * __restrict cmd1,   pelco_D_toCmd(u_char * __restrict cmd, struct bitD_Cmd1 * __restrict cmd1, 
                 struct bitD_Cmd2 * __restrict cmd2)                  struct bitD_Cmd2 * __restrict cmd2)
 {  {
Line 198  pelco_D_toCmd(u_char * __restrict cmd, struct bitD_Cmd Line 198  pelco_D_toCmd(u_char * __restrict cmd, struct bitD_Cmd
  * @cmd2 = Output typecasted commands 2   * @cmd2 = Output typecasted commands 2
  * return: 0xFF - error, !=0 return number arguments   * return: 0xFF - error, !=0 return number arguments
  */   */
inline u_charu_char
 pelco_P_toCmd(u_char * __restrict cmd, struct bitP_Cmd1 * __restrict cmd1,   pelco_P_toCmd(u_char * __restrict cmd, struct bitP_Cmd1 * __restrict cmd1, 
                 struct bitP_Cmd2 * __restrict cmd2)                  struct bitP_Cmd2 * __restrict cmd2)
 {  {

Removed from v.1.3  
changed lines
  Added in v.1.4


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