Skip to content

Commit 3402415

Browse files
Device code should be 16-bits
1 parent 86ed953 commit 3402415

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/vscp/common/vscp-bootdevice-pic1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ CBootDevice_PIC1::deviceInfo(void)
228228
//
229229

230230
int
231-
CBootDevice_PIC1::deviceInit(cguid& ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail)
231+
CBootDevice_PIC1::deviceInit(cguid& ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail)
232232
{
233233
int rv;
234234

src/vscp/common/vscp-bootdevice-pic1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class CBootDevice_PIC1 : public CBootDevice {
186186
MDF is not the same as the one read from the remote device.
187187
@return VSCP_ERROR_SUCCESS on success.
188188
*/
189-
int deviceInit(cguid& ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail = false);
189+
int deviceInit(cguid& ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail = false);
190190

191191
/*!
192192
Write a boot block to the device

src/vscp/common/vscp-bootdevice-vscp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ CBootDevice_VSCP::deviceInfo(void)
211211
//
212212

213213
int
214-
CBootDevice_VSCP::deviceInit(cguid &ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail)
214+
CBootDevice_VSCP::deviceInit(cguid &ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail)
215215
{
216216
int rv;
217217
vscpEventEx ex;

src/vscp/common/vscp-bootdevice-vscp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class CBootDevice_VSCP : public CBootDevice {
175175
MDF is not the same as the one read from the remote device.
176176
@return VSCP_ERROR_SUCCESS on success.
177177
*/
178-
int deviceInit(cguid &ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail = false);
178+
int deviceInit(cguid &ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail = false);
179179

180180
/*!
181181
Perform the actual firmware load process

src/vscp/common/vscp-bootdevice.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ class CBootDevice {
235235
MDF is not the same as the one read from the remote device.
236236
@return VSCP_ERROR_SUCCESS on success.
237237
*/
238-
virtual int deviceInit(cguid &ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail = false) = 0;
238+
virtual int deviceInit(cguid &ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail = false) = 0;
239239

240240
/*!
241241
Perform the actual firmware load process
@@ -272,12 +272,12 @@ class CBootDevice {
272272

273273
/*!
274274
The device code tell the type of hardware of the remote device
275-
Must be the same as the firmware we try to load is intended for.
275+
Must/should be the same as for the firmware we try to load.
276276
277277
Some (old) devices will have this code set to 0 in this cae no check
278278
should be performed.
279279
*/
280-
uint8_t m_firmwaredeviceCode;
280+
uint16_t m_firmwaredeviceCode;
281281

282282
/// Our local GUID
283283
cguid m_ourguid;

0 commit comments

Comments
 (0)