Commit 65909c5b authored by claes's avatar claes

Int64 and UInt64 added

parent 8a53951c
/* /*
* Proview $Id: jpwr_rt_gdh.c,v 1.13 2006-06-14 05:06:05 claes Exp $ * Proview $Id: jpwr_rt_gdh.c,v 1.14 2007-04-26 11:26:16 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -1490,9 +1490,11 @@ static void gdh_TranslateSuffixToClassData ( ...@@ -1490,9 +1490,11 @@ static void gdh_TranslateSuffixToClassData (
{"INT8" ,pwr_eType_Int8, sizeof(pwr_tInt8)}, {"INT8" ,pwr_eType_Int8, sizeof(pwr_tInt8)},
{"INT16" ,pwr_eType_Int16, sizeof(pwr_tInt16)}, {"INT16" ,pwr_eType_Int16, sizeof(pwr_tInt16)},
{"INT32" ,pwr_eType_Int32, sizeof(pwr_tInt32)}, {"INT32" ,pwr_eType_Int32, sizeof(pwr_tInt32)},
{"INT64" ,pwr_eType_Int64, sizeof(pwr_tInt64)},
{"UINT8" ,pwr_eType_UInt8, sizeof(pwr_tUInt8)}, {"UINT8" ,pwr_eType_UInt8, sizeof(pwr_tUInt8)},
{"UINT16" ,pwr_eType_UInt16, sizeof(pwr_tInt16)}, {"UINT16" ,pwr_eType_UInt16, sizeof(pwr_tInt16)},
{"UINT32" ,pwr_eType_UInt32, sizeof(pwr_tInt32)}, {"UINT32" ,pwr_eType_UInt32, sizeof(pwr_tInt32)},
{"UINT64" ,pwr_eType_UInt64, sizeof(pwr_tInt64)},
{"OBJID" ,pwr_eType_Objid, sizeof(pwr_tObjid)}, {"OBJID" ,pwr_eType_Objid, sizeof(pwr_tObjid)},
// {"STRING" ,pwr_eType_String, sizeof(void *)}, // {"STRING" ,pwr_eType_String, sizeof(void *)},
{"TIME" ,pwr_eType_Time, sizeof(pwr_tTime)}, {"TIME" ,pwr_eType_Time, sizeof(pwr_tTime)},
...@@ -1625,6 +1627,10 @@ static int gdh_StringToAttr( char *str_value, char *buffer_p, int buffer_size, ...@@ -1625,6 +1627,10 @@ static int gdh_StringToAttr( char *str_value, char *buffer_p, int buffer_size,
if ( sscanf( str_value, "%d", (pwr_tInt32 *)buffer_p) != 1) if ( sscanf( str_value, "%d", (pwr_tInt32 *)buffer_p) != 1)
return GDH__BADARG; return GDH__BADARG;
break; break;
case pwr_eType_Int64:
if ( sscanf( str_value, "%lld", (pwr_tInt64 *)buffer_p) != 1)
return GDH__BADARG;
break;
case pwr_eType_UInt8: case pwr_eType_UInt8:
{ {
pwr_tUInt8 vint8; pwr_tUInt8 vint8;
...@@ -1647,6 +1653,10 @@ static int gdh_StringToAttr( char *str_value, char *buffer_p, int buffer_size, ...@@ -1647,6 +1653,10 @@ static int gdh_StringToAttr( char *str_value, char *buffer_p, int buffer_size,
if ( sscanf( str_value, "%u", (pwr_tUInt32 *)buffer_p) != 1) if ( sscanf( str_value, "%u", (pwr_tUInt32 *)buffer_p) != 1)
return GDH__BADARG; return GDH__BADARG;
break; break;
case pwr_eType_UInt64:
if ( sscanf( str_value, "%llu", (pwr_tUInt64 *)buffer_p) != 1)
return GDH__BADARG;
break;
case pwr_eType_String: case pwr_eType_String:
strncpy( buffer_p, str_value, buffer_size); strncpy( buffer_p, str_value, buffer_size);
break; break;
...@@ -1810,6 +1820,14 @@ static void gdh_AttrToString( int type_id, void *value_ptr, ...@@ -1810,6 +1820,14 @@ static void gdh_AttrToString( int type_id, void *value_ptr,
*len = sprintf( str, format, *(int *)value_ptr); *len = sprintf( str, format, *(int *)value_ptr);
break; break;
} }
case pwr_eType_Int64:
{
if ( !format)
*len = sprintf( str, "%lld", *(pwr_tInt64 *)value_ptr);
else
*len = sprintf( str, format, *(pwr_tInt64 *)value_ptr);
break;
}
case pwr_eType_UInt8: case pwr_eType_UInt8:
{ {
if ( !format) if ( !format)
...@@ -1838,6 +1856,14 @@ static void gdh_AttrToString( int type_id, void *value_ptr, ...@@ -1838,6 +1856,14 @@ static void gdh_AttrToString( int type_id, void *value_ptr,
*len = sprintf( str, format, *(unsigned int *)value_ptr); *len = sprintf( str, format, *(unsigned int *)value_ptr);
break; break;
} }
case pwr_eType_UInt64:
{
if ( !format)
*len = sprintf( str, "%llu", *(pwr_tUInt64 *)value_ptr);
else
*len = sprintf( str, format, *(pwr_tUInt64 *)value_ptr);
break;
}
case pwr_eType_String: case pwr_eType_String:
{ {
strncpy( str, (char *)value_ptr, size); strncpy( str, (char *)value_ptr, size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment