libaitpelco/src/get.c - diff

Return to get.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitpelco / src

Diff for /libaitpelco/src/get.c between versions 1.1.1.1 and 1.1.1.1.2.1

version 1.1.1.1, 2010/01/22 00:57:32	version 1.1.1.1.2.1, 2010/03/17 13:34:34
Line 19 inline u_char pelco_GetVersion(void * __restrict p)	Line 19 inline u_char pelco_GetVersion(void * __restrict p)
u_char ptr = (u_char ) p;	u_char ptr = (u_char ) p;

if (!p) {	if (!p) {
pelcoSetErr(EINVAL, "Error:: invalid argument!\n");	pelcoSetErr(EINVAL, "invalid argument!\n");
return 0;	return 0;
}	}

Line 29 inline u_char pelco_GetVersion(void * __restrict p)	Line 29 inline u_char pelco_GetVersion(void * __restrict p)
case VER_P_STX:	case VER_P_STX:
if (VER_P_ETX == ptr[6])	if (VER_P_ETX == ptr[6])
return 'p';	return 'p';
pelcoSetErr(ENOEXEC, "Error:: broken Pelco P packet ...\n");	pelcoSetErr(ENOEXEC, "broken Pelco P packet ...\n");
break;	break;
default:	default:
pelcoSetErr(ENOEXEC, "Error:: unsupported Pelco protocol version!\n");	pelcoSetErr(ENOEXEC, "unsupported Pelco protocol version!\n");
}	}

return 0;	return 0;
Line 50 inline u_char pelco_GetCamNo(void * __restrict p)	Line 50 inline u_char pelco_GetCamNo(void * __restrict p)
u_char ptr = (u_char ) p;	u_char ptr = (u_char ) p;

if (!p) {	if (!p) {
pelcoSetErr(EINVAL, "Error:: invalid argument!\n");	pelcoSetErr(EINVAL, "invalid argument!\n");
return 0;	return 0;
}	}

Line 60 inline u_char pelco_GetCamNo(void * __restrict p)	Line 60 inline u_char pelco_GetCamNo(void * __restrict p)
if (crcPelco(ver, p) == ptr[6])	if (crcPelco(ver, p) == ptr[6])
return ptr[1];	return ptr[1];

pelcoSetErr(ENOEXEC, "Error:: broken Pelco D packet!!!\n");	pelcoSetErr(ENOEXEC, "broken Pelco D packet!!!\n");
break;	break;
case 'p':	case 'p':
if (crcPelco(ver, p) == ptr[7])	if (crcPelco(ver, p) == ptr[7])
return ptr[1] + 1;	return ptr[1] + 1;

pelcoSetErr(ENOEXEC, "Error:: broken Pelco P packet!!!\n");	pelcoSetErr(ENOEXEC, "broken Pelco P packet!!!\n");
break;	break;
}	}

Line 88 inline u_char pelco_GetCamCmdData(void * __restrict p,	Line 88 inline u_char pelco_GetCamCmdData(void * __restrict p,
u_char ptr = (u_char ) p;	u_char ptr = (u_char ) p;

if (!p) {	if (!p) {
pelcoSetErr(EINVAL, "Error:: invalid argument!\n");	pelcoSetErr(EINVAL, "invalid argument!\n");
return 0;	return 0;
}	}

Line 96 inline u_char pelco_GetCamCmdData(void * __restrict p,	Line 96 inline u_char pelco_GetCamCmdData(void * __restrict p,
switch (ret) {	switch (ret) {
case 'd':	case 'd':
if (crcPelco(ret, p) != ptr[6]) {	if (crcPelco(ret, p) != ptr[6]) {
pelcoSetErr(ENOEXEC, "Error:: broken Pelco D packet!!!\n");	pelcoSetErr(ENOEXEC, "broken Pelco D packet!!!\n");
return 0;	return 0;
}	}

Line 105 inline u_char pelco_GetCamCmdData(void * __restrict p,	Line 105 inline u_char pelco_GetCamCmdData(void * __restrict p,
break;	break;
case 'p':	case 'p':
if (crcPelco(ret, p) != ptr[7]) {	if (crcPelco(ret, p) != ptr[7]) {
pelcoSetErr(ENOEXEC, "Error:: broken Pelco P packet!!!\n");	pelcoSetErr(ENOEXEC, "broken Pelco P packet!!!\n");
return 0;	return 0;
}	}

Line 134 inline u_char pelco_D_toCmd(u_char * __restrict cmd,	Line 134 inline u_char pelco_D_toCmd(u_char * __restrict cmd,
u_char ret = 0;	u_char ret = 0;

if (!cmd) {	if (!cmd) {
pelcoSetErr(EINVAL, "Error:: invalid argument!\n");	pelcoSetErr(EINVAL, "invalid argument!\n");
return 0xFF;	return 0xFF;
}	}

Line 163 inline u_char pelco_P_toCmd(u_char * __restrict cmd,	Line 163 inline u_char pelco_P_toCmd(u_char * __restrict cmd,
u_char ret = 0;	u_char ret = 0;

if (!cmd) {	if (!cmd) {
pelcoSetErr(EINVAL, "Error:: invalid argument!\n");	pelcoSetErr(EINVAL, "invalid argument!\n");
return 0xFF;	return 0xFF;
}	}

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

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.1.2.1