tm3d
/
owSlave2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove tools - Create extra repository
[owSlave2.git]
/
common
/
OWRomFunctions.s
diff --git
a/common/OWRomFunctions.s
b/common/OWRomFunctions.s
index
eac94b9
..
fb1d85b
100644
(file)
--- a/
common/OWRomFunctions.s
+++ b/
common/OWRomFunctions.s
@@
-1,4
+1,4
@@
-// Copyright (c) 201
5
, Tobias Mueller tm(at)tm3d.de
\r
+// Copyright (c) 201
7
, Tobias Mueller tm(at)tm3d.de
\r
// All rights reserved.
\r
//
\r
// Redistribution and use in source and binary forms, with or without
\r
// All rights reserved.
\r
//
\r
// Redistribution and use in source and binary forms, with or without
\r
@@
-314,30
+314,36
@@
h_readrom_all:
;---------------------------------------------------
\r
\r
h_fwconfiginfo:
\r
;---------------------------------------------------
\r
\r
h_fwconfiginfo:
\r
- cpi r_bytep,
16
\r
+ cpi r_bytep,
24
\r
breq h_fwconfiginfo_crc
\r
#ifdef _CRC8_
\r
breq h_fwconfiginfo_crc
\r
#ifdef _CRC8_
\r
- cpi r_bytep,
17
\r
+ cpi r_bytep,
25
\r
breq h_fwconfiginfo_all
\r
#elif defined _CRC16_
\r
breq h_fwconfiginfo_all
\r
#elif defined _CRC16_
\r
- cpi r_bytep,17
\r
- breq h_fwconfiginfo_crc2
\r
- cpi r_bytep,18
\r
+ cpi r_bytep,26
\r
breq h_fwconfiginfo_all
\r
#else
\r
breq h_fwconfiginfo_all
\r
#else
\r
- cpi r_bytep,
16
\r
+ cpi r_bytep,
25
\r
breq h_fwconfiginfo_all
\r
#warning No CRC known code implemented
\r
#endif
\r
breq h_fwconfiginfo_all
\r
#warning No CRC known code implemented
\r
#endif
\r
+h_fwconfiginfo_end:
\r
configZ config_info,r_bytep
\r
ld r_rwbyte,Z
\r
rjmp handle_end_inc
\r
h_fwconfiginfo_crc:
\r
configZ config_info,r_bytep
\r
ld r_rwbyte,Z
\r
rjmp handle_end_inc
\r
h_fwconfiginfo_crc:
\r
+#ifdef _CRC8_
\r
lds r_rwbyte,crc
\r
rjmp handle_end_inc
\r
lds r_rwbyte,crc
\r
rjmp handle_end_inc
\r
-h_fwconfiginfo_crc2:
\r
- lds r_rwbyte,crc+1
\r
- rjmp handle_end_inc
\r
+#elif defined _CRC16_
\r
+ lds r_temp,crc
\r
+ com r_temp
\r
+ sts config_info+24,r_temp
\r
+ lds r_temp,crc+1
\r
+ com r_temp
\r
+ sts config_info+25,r_temp
\r
+ rjmp h_fwconfiginfo_end
\r
+#endif
\r
h_fwconfiginfo_all:
\r
rjmp handle_end_sleep
\r
\r
h_fwconfiginfo_all:
\r
rjmp handle_end_sleep
\r
\r