--- libaitpelco/inc/aitpelco.h 2011/05/10 20:26:08 1.2 +++ libaitpelco/inc/aitpelco.h 2013/05/26 20:39:13 1.3.4.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitpelco.h,v 1.2 2011/05/10 20:26:08 misho Exp $ +* $Id: aitpelco.h,v 1.3.4.2 2013/05/26 20:39:13 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -147,9 +147,9 @@ typedef struct tagPelcoP { // ------------------------------------------------------- // pelco_GetErrno() Get error code of last operation -inline int pelco_GetErrno(); +int pelco_GetErrno(); // pelco_GetError() Get error text of last operation -inline const char *pelco_GetError(); +const char *pelco_GetError(); // ------------------------------------------------------- @@ -159,20 +159,20 @@ inline const char *pelco_GetError(); * @camNo = Packet for camera number address * return: NULL error, !=NULL ok, allocated memory for packet */ -inline void *pelcoOpen(u_char pelcoVer, u_char camNo); +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); +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); +void *pelcoLoad(u_char *buffer); /* @@ -182,7 +182,7 @@ 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); +u_char pelcoAddCmdData(void * __restrict p, u_char * __restrict cmd, u_char * __restrict data); /* * pelcoGetCmdData() Get from packet commands and datas with verify packet @@ -191,7 +191,7 @@ 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); +u_char pelcoGetCmdData(void * __restrict p, u_char * __restrict cmd, u_char * __restrict data); /* * pelcoChkSum() Check ot Correct check sum in packet @@ -199,7 +199,7 @@ 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, invalid check sum, 0 check sum is correct. */ -inline u_char pelcoChkSum(void * __restrict p, u_char correct); +u_char pelcoChkSum(void * __restrict p, u_char correct); /* @@ -207,7 +207,7 @@ inline u_char pelcoChkSum(void * __restrict p, u_char * @p = Packet structure * return: 'd' - PelcoD, 'p' - PelcoP, 0 - unknown or bad packet */ -inline u_char pelco_GetVersion(void * __restrict p); +u_char pelco_GetVersion(void * __restrict p); /* * pelco_GetCamNo() Get Camera number and check for valid packet @@ -215,7 +215,7 @@ inline u_char pelco_GetVersion(void * __restrict p); * return: 0xFF and pelco_GetErrno() == ENOEXEC - error, any number is camera address */ -inline u_char pelco_GetCamNo(void * __restrict p); +u_char pelco_GetCamNo(void * __restrict p); /* * pelco_GetCamCmdData() Get from Camera commands and datas with verify packet @@ -225,7 +225,7 @@ inline u_char pelco_GetCamNo(void * __restrict p); * @data[2] = Output Data for commands 1 & 2 * return: 'd' - PelcoD, 'p' - PelcoP, 0 - unknown or bad packet */ -inline u_char pelco_GetCamCmdData(void * __restrict p, u_char * __restrict cam, +u_char pelco_GetCamCmdData(void * __restrict p, u_char * __restrict cam, u_char * __restrict cmd, u_char * __restrict data); /* @@ -235,7 +235,7 @@ inline u_char pelco_GetCamCmdData(void * __restrict p, * @cmd2 = Output typecasted commands 2 * return: 0xFF - error, !=0 return number arguments */ -inline u_char pelco_D_toCmd(u_char * __restrict cmd, +u_char pelco_D_toCmd(u_char * __restrict cmd, struct bitD_Cmd1 * __restrict cmd1, struct bitD_Cmd2 * __restrict cmd2); /* @@ -245,7 +245,7 @@ inline u_char pelco_D_toCmd(u_char * __restrict cmd, * @cmd2 = Output typecasted commands 2 * return: 0xFF - error, !=0 return number arguments */ -inline u_char pelco_P_toCmd(u_char * __restrict cmd, +u_char pelco_P_toCmd(u_char * __restrict cmd, struct bitP_Cmd1 * __restrict cmd1, struct bitP_Cmd2 * __restrict cmd2); /* @@ -255,7 +255,7 @@ inline u_char pelco_P_toCmd(u_char * __restrict cmd, * @cmd[2] = Output Commands 1 & 2 * return: 0xFF - error, 0 - ok */ -inline u_char pelco_D_fromCmd(struct bitD_Cmd1 cmd1, struct bitD_Cmd2 cmd2, +u_char pelco_D_fromCmd(struct bitD_Cmd1 cmd1, struct bitD_Cmd2 cmd2, u_char * __restrict cmd); /* @@ -265,7 +265,7 @@ inline u_char pelco_D_fromCmd(struct bitD_Cmd1 cmd1, s * @cmd[2] = Output Commands 1 & 2 * return: 0xFF - error, 0 - ok */ -inline u_char pelco_P_fromCmd(struct bitP_Cmd1 cmd1, struct bitP_Cmd2 cmd2, +u_char pelco_P_fromCmd(struct bitP_Cmd1 cmd1, struct bitP_Cmd2 cmd2, u_char * __restrict cmd); /* @@ -277,7 +277,7 @@ inline u_char pelco_P_fromCmd(struct bitP_Cmd1 cmd1, s * @p = Output Packet structure * return: 0xFF - error, 0 - ok */ -inline u_char pelco_SetCamCmdData(u_char ver, u_char cam, +u_char pelco_SetCamCmdData(u_char ver, u_char cam, u_char * __restrict cmd, u_char * __restrict data, void * __restrict p);