Skip to content

Commit 2bcf5fa

Browse files
author
David Antliff
committed
Time values should be signed, and a signed 32-bit long on MIPS is too small to hold the dummy value provided. Fixed by changing to an explicit signed 64-bit integer.
Signed-off-by: David Antliff <[email protected]>
1 parent 4bab2b9 commit 2bcf5fa

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

‎core/src/client/lwm2m_device_object.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
# include "lwm2m_client_xml_handlers.h"
3535
#endif
3636

37-
3837
#define DEVICE_MANUFACTURER "Imagination Technologies"
3938
#define DEVICE_MODEL_NUMBER "Awa Client"
4039
#define DEVICE_SERIAL_NUMBER "SN12345678"
@@ -48,7 +47,7 @@ static int DEVICE_POWER_CURRENT_2 = 900;
4847
static int DEVICE_BATTERY_LEVEL = 100;
4948
static int DEVICE_MEMORY_FREE = 15;
5049
static int DEVICE_ERROR_CODE = 0;
51-
static unsigned long DEVICE_TIME = 0xA20AD72B; // 1435019474;
50+
static int64_t DEVICE_TIME = 0xA20AD72B;
5251
#define DEVICE_TIMEOFFSET "+12:00"
5352
#define DEVICE_TIME_ZONE "Pacific/Wellington"
5453
#define DEVICE_BINDING_MODE "U"
@@ -99,19 +98,20 @@ void Lwm2m_RegisterDeviceObject(Lwm2mContextType * context)
9998

10099
// Register Device object definition.
101100
Lwm2mCore_RegisterObjectType(context, "Device" , LWM2M_DEVICE_OBJECT, MultipleInstancesEnum_Single, MandatoryEnum_Mandatory, &defaultObjectOperationHandlers);
101+
102102
Lwm2mCore_RegisterResourceType(context, "Manufacturer", LWM2M_DEVICE_OBJECT, 0, AwaResourceType_String, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
103103
Lwm2mCore_RegisterResourceType(context, "ModelNumber", LWM2M_DEVICE_OBJECT, 1, AwaResourceType_String, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
104104
Lwm2mCore_RegisterResourceType(context, "SerialNumber", LWM2M_DEVICE_OBJECT, 2, AwaResourceType_String, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
105105
Lwm2mCore_RegisterResourceType(context, "FirmwareVersion", LWM2M_DEVICE_OBJECT, 3, AwaResourceType_String, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
106-
Lwm2mCore_RegisterResourceType(context, "Reboot", LWM2M_DEVICE_OBJECT, 4, AwaResourceType_None, MultipleInstancesEnum_Single, MandatoryEnum_Mandatory, AwaResourceOperations_Execute, &rebootOperationHandlers);
107-
Lwm2mCore_RegisterResourceType(context, "FactoryReset", LWM2M_DEVICE_OBJECT, 5, AwaResourceType_None, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_Execute, &factoryResetOperationHandlers);
106+
Lwm2mCore_RegisterResourceType(context, "Reboot", LWM2M_DEVICE_OBJECT, 4, AwaResourceType_None, MultipleInstancesEnum_Single, MandatoryEnum_Mandatory, AwaResourceOperations_Execute, &rebootOperationHandlers);
107+
Lwm2mCore_RegisterResourceType(context, "FactoryReset", LWM2M_DEVICE_OBJECT, 5, AwaResourceType_None, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_Execute, &factoryResetOperationHandlers);
108108
Lwm2mCore_RegisterResourceType(context, "AvailablePowerSources", LWM2M_DEVICE_OBJECT, 6, AwaResourceType_Integer, MultipleInstancesEnum_Multiple, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
109109
Lwm2mCore_RegisterResourceType(context, "PowerSourceVoltage", LWM2M_DEVICE_OBJECT, 7, AwaResourceType_Integer, MultipleInstancesEnum_Multiple, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
110110
Lwm2mCore_RegisterResourceType(context, "PowerSourceCurrent", LWM2M_DEVICE_OBJECT, 8, AwaResourceType_Integer, MultipleInstancesEnum_Multiple, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
111111
Lwm2mCore_RegisterResourceType(context, "BatteryLevel", LWM2M_DEVICE_OBJECT, 9, AwaResourceType_Integer, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
112112
Lwm2mCore_RegisterResourceType(context, "MemoryFree", LWM2M_DEVICE_OBJECT, 10, AwaResourceType_Integer, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
113113
Lwm2mCore_RegisterResourceType(context, "ErrorCode", LWM2M_DEVICE_OBJECT, 11, AwaResourceType_Integer, MultipleInstancesEnum_Multiple, MandatoryEnum_Mandatory, AwaResourceOperations_ReadOnly, &defaultResourceOperationHandlers);
114-
Lwm2mCore_RegisterResourceType(context, "ResetErrorCode", LWM2M_DEVICE_OBJECT, 12, AwaResourceType_None, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_Execute, &defaultResourceOperationHandlers);
114+
Lwm2mCore_RegisterResourceType(context, "ResetErrorCode", LWM2M_DEVICE_OBJECT, 12, AwaResourceType_None, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_Execute, &defaultResourceOperationHandlers);
115115
Lwm2mCore_RegisterResourceType(context, "CurrentTime", LWM2M_DEVICE_OBJECT, 13, AwaResourceType_Time, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadWrite, &defaultResourceOperationHandlers);
116116
Lwm2mCore_RegisterResourceType(context, "UTCOffset", LWM2M_DEVICE_OBJECT, 14, AwaResourceType_String, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadWrite, &defaultResourceOperationHandlers);
117117
Lwm2mCore_RegisterResourceType(context, "Timezone", LWM2M_DEVICE_OBJECT, 15, AwaResourceType_String, MultipleInstancesEnum_Single, MandatoryEnum_Optional, AwaResourceOperations_ReadWrite, &defaultResourceOperationHandlers);

0 commit comments

Comments
 (0)