Mercurial > public > hwos_code

annotate src/external_flash.asm @ 421:3895adc3477f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix Page-Program timing
author heinrichsweikamp
date Fri, 29 Apr 2016 16:40:10 +0200
parents 789230298511
children ccaaac45b61a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
heinrichsweikamp
parents:
diff changeset
1 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
2 ;
heinrichsweikamp
parents:
diff changeset
3 ; File external_flash.asm
heinrichsweikamp
parents:
diff changeset
4 ;
heinrichsweikamp
parents:
diff changeset
5 ; External flash
heinrichsweikamp
parents:
diff changeset
6 ;
heinrichsweikamp
parents:
diff changeset
7 ; Copyright (c) 2011, JD Gascuel, HeinrichsWeikamp, all right reserved.
heinrichsweikamp
parents:
diff changeset
8 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
9 ; HISTORY
heinrichsweikamp
parents:
diff changeset
10 ; 2011-08-12 : [mH] creation
heinrichsweikamp
parents:
diff changeset
11
275
653a3ab08062 rename into hwOS
heinrichsweikamp
parents: 167
diff changeset
12 #include "hwos.inc"
0
heinrichsweikamp
parents:
diff changeset
13 #include "wait.inc"
heinrichsweikamp
parents:
diff changeset
14
heinrichsweikamp
parents:
diff changeset
15 basic CODE
heinrichsweikamp
parents:
diff changeset
16 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
17
heinrichsweikamp
parents:
diff changeset
18 global incf_ext_flash_address_p1
heinrichsweikamp
parents:
diff changeset
19 incf_ext_flash_address_p1: ; Increase by one
heinrichsweikamp
parents:
diff changeset
20 movlw .1
heinrichsweikamp
parents:
diff changeset
21
heinrichsweikamp
parents:
diff changeset
22 global incf_ext_flash_address0
heinrichsweikamp
parents:
diff changeset
23 incf_ext_flash_address0:
heinrichsweikamp
parents:
diff changeset
24 addwf ext_flash_address+0,F ; increase address
heinrichsweikamp
parents:
diff changeset
25 movlw d'0'
heinrichsweikamp
parents:
diff changeset
26 addwfc ext_flash_address+1,F
heinrichsweikamp
parents:
diff changeset
27 addwfc ext_flash_address+2,F
heinrichsweikamp
parents:
diff changeset
28
heinrichsweikamp
parents:
diff changeset
29 movlw 0x40
heinrichsweikamp
parents:
diff changeset
30 cpfseq ext_flash_address+2 ; at address 40FFFF?
heinrichsweikamp
parents:
diff changeset
31 return ; No, return
167
05f2100d2eb8 logbook
heinrichsweikamp
parents: 6
diff changeset
32 ; clrf ext_flash_address+0
05f2100d2eb8 logbook
heinrichsweikamp
parents: 6
diff changeset
33 ; clrf ext_flash_address+1
05f2100d2eb8 logbook
heinrichsweikamp
parents: 6
diff changeset
34 clrf ext_flash_address+2 ; Yes, rollover to 0x000000
0
heinrichsweikamp
parents:
diff changeset
35 return
heinrichsweikamp
parents:
diff changeset
36
heinrichsweikamp
parents:
diff changeset
37 global incf_ext_flash_address0_p1_0x20
heinrichsweikamp
parents:
diff changeset
38 incf_ext_flash_address0_p1_0x20: ; Increase by one
heinrichsweikamp
parents:
diff changeset
39 movlw .1
heinrichsweikamp
parents:
diff changeset
40
heinrichsweikamp
parents:
diff changeset
41 global incf_ext_flash_address0_0x20
heinrichsweikamp
parents:
diff changeset
42 incf_ext_flash_address0_0x20: ; with roll-over at 0x200000 to 0x000000
heinrichsweikamp
parents:
diff changeset
43 addwf ext_flash_address+0,F ; increase address
heinrichsweikamp
parents:
diff changeset
44 movlw d'0'
heinrichsweikamp
parents:
diff changeset
45 addwfc ext_flash_address+1,F
heinrichsweikamp
parents:
diff changeset
46 addwfc ext_flash_address+2,F
heinrichsweikamp
parents:
diff changeset
47
heinrichsweikamp
parents:
diff changeset
48 movlw 0x20
heinrichsweikamp
parents:
diff changeset
49 cpfseq ext_flash_address+2 ; at address 0x200000?
heinrichsweikamp
parents:
diff changeset
50 return ; No, return
167
05f2100d2eb8 logbook
heinrichsweikamp
parents: 6
diff changeset
51 ; clrf ext_flash_address+0
05f2100d2eb8 logbook
heinrichsweikamp
parents: 6
diff changeset
52 ; clrf ext_flash_address+1
05f2100d2eb8 logbook
heinrichsweikamp
parents: 6
diff changeset
53 clrf ext_flash_address+2 ; Yes, rollover to 0x000000
0
heinrichsweikamp
parents:
diff changeset
54 return
heinrichsweikamp
parents:
diff changeset
55
heinrichsweikamp
parents:
diff changeset
56 global decf_ext_flash_address0
heinrichsweikamp
parents:
diff changeset
57 decf_ext_flash_address0:
heinrichsweikamp
parents:
diff changeset
58 subwf ext_flash_address+0,F ; decrease address: do a 16-8bits substract.
heinrichsweikamp
parents:
diff changeset
59 movlw d'0'
heinrichsweikamp
parents:
diff changeset
60 subwfb ext_flash_address+1,F
heinrichsweikamp
parents:
diff changeset
61 movlw d'0'
heinrichsweikamp
parents:
diff changeset
62 subwfb ext_flash_address+2,F
heinrichsweikamp
parents:
diff changeset
63
heinrichsweikamp
parents:
diff changeset
64 btfss ext_flash_address+2,7 ; Rollover to 0xFFFFFF?
heinrichsweikamp
parents:
diff changeset
65 return ; No, return
heinrichsweikamp
parents:
diff changeset
66 clrf ext_flash_address+2 ; Set to 0x00FFFFF
heinrichsweikamp
parents:
diff changeset
67 setf ext_flash_address+1
heinrichsweikamp
parents:
diff changeset
68 setf ext_flash_address+0
heinrichsweikamp
parents:
diff changeset
69 return
heinrichsweikamp
parents:
diff changeset
70
heinrichsweikamp
parents:
diff changeset
71 global ext_flash_byte_read_plus ; Return data read in WREG and SSP2BUF and
heinrichsweikamp
parents:
diff changeset
72 ext_flash_byte_read_plus: ; increase address after read
heinrichsweikamp
parents:
diff changeset
73 rcall ext_flash_byte_read
heinrichsweikamp
parents:
diff changeset
74 movwf temp1 ; store received data
heinrichsweikamp
parents:
diff changeset
75 bra incf_ext_flash_address_p1 ; +1 and return
heinrichsweikamp
parents:
diff changeset
76
heinrichsweikamp
parents:
diff changeset
77 global ext_flash_byte_read_plus_0x20; Return data read in WREG and SSP2BUF and
heinrichsweikamp
parents:
diff changeset
78 ext_flash_byte_read_plus_0x20: ; increase address after read with banking at 0x200000
heinrichsweikamp
parents:
diff changeset
79 rcall ext_flash_byte_read
heinrichsweikamp
parents:
diff changeset
80 movwf temp1 ; store received data
heinrichsweikamp
parents:
diff changeset
81 bra incf_ext_flash_address0_p1_0x20 ;+1 and return
heinrichsweikamp
parents:
diff changeset
82
heinrichsweikamp
parents:
diff changeset
83
heinrichsweikamp
parents:
diff changeset
84 global ext_flash_byte_read ; Return data read in WREG
heinrichsweikamp
parents:
diff changeset
85 ext_flash_byte_read:
heinrichsweikamp
parents:
diff changeset
86 movlw 0x03 ; Read command
heinrichsweikamp
parents:
diff changeset
87 rcall write_spi
heinrichsweikamp
parents:
diff changeset
88 rcall ext_flash_write_address ; Write 24bit address ext_flash_address:3 via SPI
heinrichsweikamp
parents:
diff changeset
89 rcall write_spi ; Dummy write to read data into WREG
heinrichsweikamp
parents:
diff changeset
90 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
91 movwf temp1
heinrichsweikamp
parents:
diff changeset
92 return ; Return data read in WREG and temp1
heinrichsweikamp
parents:
diff changeset
93
heinrichsweikamp
parents:
diff changeset
94 ext_flash_write_address: ; Write 24bit address ext_flash_address:3 via SPI
heinrichsweikamp
parents:
diff changeset
95 movf ext_flash_address+2,W ; 24Bit Address
heinrichsweikamp
parents:
diff changeset
96 rcall write_spi
heinrichsweikamp
parents:
diff changeset
97 movf ext_flash_address+1,W
heinrichsweikamp
parents:
diff changeset
98 rcall write_spi
heinrichsweikamp
parents:
diff changeset
99 movf ext_flash_address+0,W
heinrichsweikamp
parents:
diff changeset
100 bra write_spi ; And return....
heinrichsweikamp
parents:
diff changeset
101
heinrichsweikamp
parents:
diff changeset
102 global ext_flash_read_block_start ; Return data read in WREG
heinrichsweikamp
parents:
diff changeset
103 ext_flash_read_block_start:
heinrichsweikamp
parents:
diff changeset
104 movlw 0x03 ; Read command
heinrichsweikamp
parents:
diff changeset
105 rcall write_spi
heinrichsweikamp
parents:
diff changeset
106 rcall ext_flash_write_address ; Write 24bit address ext_flash_address:3 via SPI
heinrichsweikamp
parents:
diff changeset
107 rcall write_spi ; Dummy write to read data into WREG
heinrichsweikamp
parents:
diff changeset
108 return ; Return data read in WREG
heinrichsweikamp
parents:
diff changeset
109
heinrichsweikamp
parents:
diff changeset
110 global ext_flash_read_block ; Return data read in WREG
heinrichsweikamp
parents:
diff changeset
111 ext_flash_read_block:
heinrichsweikamp
parents:
diff changeset
112 rcall incf_ext_flash_address_p1 ; Increase address +1
heinrichsweikamp
parents:
diff changeset
113 bra write_spi1 ; Dummy write to read data into WREG and return
heinrichsweikamp
parents:
diff changeset
114
heinrichsweikamp
parents:
diff changeset
115 global ext_flash_read_block_stop ; Return data read in WREG
heinrichsweikamp
parents:
diff changeset
116 ext_flash_read_block_stop:
heinrichsweikamp
parents:
diff changeset
117 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
118 return ; NO data in WREG
heinrichsweikamp
parents:
diff changeset
119
heinrichsweikamp
parents:
diff changeset
120 global write_byte_ext_flash_plus_header
heinrichsweikamp
parents:
diff changeset
121 write_byte_ext_flash_plus_header: ; Write from WREG and increase address after write
heinrichsweikamp
parents:
diff changeset
122 movwf temp1 ; store data
heinrichsweikamp
parents:
diff changeset
123 ; test if write is done at first byte of 4kB block
heinrichsweikamp
parents:
diff changeset
124 ; if yes -> delete 4kB block first
heinrichsweikamp
parents:
diff changeset
125 tstfsz ext_flash_address+0 ; at 0x00?
heinrichsweikamp
parents:
diff changeset
126 bra write_byte_ext_flash_plus_h1 ; No, normal Write
heinrichsweikamp
parents:
diff changeset
127
heinrichsweikamp
parents:
diff changeset
128 movf ext_flash_address+1,W
heinrichsweikamp
parents:
diff changeset
129 andlw 0x0F ; Mask lower nibble
heinrichsweikamp
parents:
diff changeset
130 tstfsz WREG ; at 0x.0?
heinrichsweikamp
parents:
diff changeset
131 bra write_byte_ext_flash_plus_h1; No, normal Write
heinrichsweikamp
parents:
diff changeset
132
heinrichsweikamp
parents:
diff changeset
133 ; At beginning of 4kB block -> rease first!
heinrichsweikamp
parents:
diff changeset
134 rcall ext_flash_erase4kB ; Erases 4kB sector @ext_flash_address:3
heinrichsweikamp
parents:
diff changeset
135 write_byte_ext_flash_plus_h1:
heinrichsweikamp
parents:
diff changeset
136 movf temp1,W
heinrichsweikamp
parents:
diff changeset
137 rcall ext_flash_byte_write ; Write the byte
heinrichsweikamp
parents:
diff changeset
138 bra incf_ext_flash_address_p1 ; +1 and return
heinrichsweikamp
parents:
diff changeset
139
279
62c7af4795b0 bugfix wrong profile length in header
heinrichsweikamp
parents: 278
diff changeset
140 global write_byte_ext_flash_plus_nocnt ; No increase of ext_flash_dive_counter:3
62c7af4795b0 bugfix wrong profile length in header
heinrichsweikamp
parents: 278
diff changeset
141 write_byte_ext_flash_plus_nocnt:
62c7af4795b0 bugfix wrong profile length in header
heinrichsweikamp
parents: 278
diff changeset
142 movwf temp1 ; store data
62c7af4795b0 bugfix wrong profile length in header
heinrichsweikamp
parents: 278
diff changeset
143 bra write_byte_ext_flash_plus2
62c7af4795b0 bugfix wrong profile length in header
heinrichsweikamp
parents: 278
diff changeset
144
278
dfac47ac2e1d BUGFIX: There was a 1:4096 chance that a portion of a dive was not stored correctly resulting in download issues
heinrichsweikamp
parents: 275
diff changeset
145 global write_byte_ext_flash_plus_nodel ; Does NOT delete 4kB Page when required
279
62c7af4795b0 bugfix wrong profile length in header
heinrichsweikamp
parents: 278
diff changeset
146 write_byte_ext_flash_plus_nodel: ; Write from WREG and increase address after write with banking at 0x200000
62c7af4795b0 bugfix wrong profile length in header
heinrichsweikamp
parents: 278
diff changeset
147 movwf temp1 ; store data
278
dfac47ac2e1d BUGFIX: There was a 1:4096 chance that a portion of a dive was not stored correctly resulting in download issues
heinrichsweikamp
parents: 275
diff changeset
148 bra write_byte_ext_flash_plus1 ; Ignore possible begin of 4kB page, there have been written 0xFF already
6
13cda523891f bugfix: dive length in normal header
heinrichsweikamp
parents: 0
diff changeset
149
0
heinrichsweikamp
parents:
diff changeset
150 global write_byte_ext_flash_plus ; Write from WREG and increase address after write with banking at 0x200000
heinrichsweikamp
parents:
diff changeset
151 write_byte_ext_flash_plus:
heinrichsweikamp
parents:
diff changeset
152 movwf temp1 ; store data
heinrichsweikamp
parents:
diff changeset
153
heinrichsweikamp
parents:
diff changeset
154 ; First, increase dive length counter
heinrichsweikamp
parents:
diff changeset
155 incf ext_flash_dive_counter+0,F
heinrichsweikamp
parents:
diff changeset
156 movlw .0
heinrichsweikamp
parents:
diff changeset
157 addwfc ext_flash_dive_counter+1,F
heinrichsweikamp
parents:
diff changeset
158 addwfc ext_flash_dive_counter+2,F ; 24bit++
heinrichsweikamp
parents:
diff changeset
159
6
13cda523891f bugfix: dive length in normal header
heinrichsweikamp
parents: 0
diff changeset
160 write_byte_ext_flash_plus2:
0
heinrichsweikamp
parents:
diff changeset
161 ; Now test if write is done at first byte of 4kB block
heinrichsweikamp
parents:
diff changeset
162 ; if yes -> delete 4kB block first
heinrichsweikamp
parents:
diff changeset
163 tstfsz ext_flash_address+0 ; at 0x00?
heinrichsweikamp
parents:
diff changeset
164 bra write_byte_ext_flash_plus1 ; No, normal Write
heinrichsweikamp
parents:
diff changeset
165
heinrichsweikamp
parents:
diff changeset
166 movf ext_flash_address+1,W
heinrichsweikamp
parents:
diff changeset
167 andlw 0x0F ; Mask lower nibble
heinrichsweikamp
parents:
diff changeset
168 tstfsz WREG ; at 0x.0?
heinrichsweikamp
parents:
diff changeset
169 bra write_byte_ext_flash_plus1 ; No, normal Write
heinrichsweikamp
parents:
diff changeset
170
heinrichsweikamp
parents:
diff changeset
171 ; At beginning of 4kB block -> erase first!
heinrichsweikamp
parents:
diff changeset
172 rcall ext_flash_erase4kB ; Erases 4kB sector @ext_flash_address:3
heinrichsweikamp
parents:
diff changeset
173 write_byte_ext_flash_plus1:
heinrichsweikamp
parents:
diff changeset
174 movf temp1,W
heinrichsweikamp
parents:
diff changeset
175 rcall ext_flash_byte_write ; Write the byte
heinrichsweikamp
parents:
diff changeset
176 bra incf_ext_flash_address0_p1_0x20 ; +1 and roll over at 0x200000 to 0x000000 and return
heinrichsweikamp
parents:
diff changeset
177
heinrichsweikamp
parents:
diff changeset
178 global ext_flash_byte_write ; Write from WREG
heinrichsweikamp
parents:
diff changeset
179 ext_flash_byte_write:
heinrichsweikamp
parents:
diff changeset
180 movwf temp1 ; store data byte
heinrichsweikamp
parents:
diff changeset
181 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
182 movlw 0x06 ; WREN command
heinrichsweikamp
parents:
diff changeset
183 rcall write_spi
heinrichsweikamp
parents:
diff changeset
184 bsf flash_ncs ; CS=1
421
3895adc3477f fix Page-Program timing
heinrichsweikamp
parents: 420
diff changeset
185 movlw 0x02 ; Write (PP, Page-Program) command
0
heinrichsweikamp
parents:
diff changeset
186 rcall write_spi
420
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
187 rcall ext_flash_write_address ; Write 24bit address ext_flash_address:3 via SPI
0
heinrichsweikamp
parents:
diff changeset
188 movf temp1,W ; load data byte
heinrichsweikamp
parents:
diff changeset
189 rcall write_spi ; write one byte of data!
heinrichsweikamp
parents:
diff changeset
190 bsf flash_ncs ; CS=1
421
3895adc3477f fix Page-Program timing
heinrichsweikamp
parents: 420
diff changeset
191 bra ext_flash_wait_write ; And return...
3895adc3477f fix Page-Program timing
heinrichsweikamp
parents: 420
diff changeset
192 ;
3895adc3477f fix Page-Program timing
heinrichsweikamp
parents: 420
diff changeset
193 ;
3895adc3477f fix Page-Program timing
heinrichsweikamp
parents: 420
diff changeset
194 ; return
0
heinrichsweikamp
parents:
diff changeset
195
heinrichsweikamp
parents:
diff changeset
196 global ext_flash_disable_protection ; Disable write protection
heinrichsweikamp
parents:
diff changeset
197 ext_flash_disable_protection:
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
198 ; unlock old memory
0
heinrichsweikamp
parents:
diff changeset
199 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
200 movlw 0x50 ; EWSR command
heinrichsweikamp
parents:
diff changeset
201 rcall write_spi
heinrichsweikamp
parents:
diff changeset
202 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
203
heinrichsweikamp
parents:
diff changeset
204 movlw 0x01 ; WRSR command
heinrichsweikamp
parents:
diff changeset
205 rcall write_spi
heinrichsweikamp
parents:
diff changeset
206 movlw b'00000000' ; New status
heinrichsweikamp
parents:
diff changeset
207 rcall write_spi
heinrichsweikamp
parents:
diff changeset
208 bsf flash_ncs ; CS=1
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
209
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
210 ; unlock new memory
416
4389fe9673b2 NEW: Support for new logbook memory chip (minor hardware change)
heinrichsweikamp
parents: 414
diff changeset
211 ; bsf flash_ncs ; CS=1
420
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
212 ; movlw 0x06 ; WREN command
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
213 ; rcall write_spi
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
214 ; bsf flash_ncs ; CS=1
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
215 ; movlw 0x98 ; ULBPR command
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
216 ; rcall write_spi
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
217 ; bsf flash_ncs ; CS=1
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
218
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
219 ;bsf flash_ncs ; CS=1
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
220 movlw 0x06 ; WREN command
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
221 rcall write_spi
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
222 bsf flash_ncs ; CS=1
420
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
223 movlw 0x42 ; WBPR command
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
224 rcall write_spi
420
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
225 movlw .18
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
226 movwf temp1
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
227 ext_flash_disable_protection2:
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
228 movlw 0x00
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
229 rcall write_spi
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
230 decfsz temp1,F ; 18 bytes with 0x00
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
231 bra ext_flash_disable_protection2
789230298511 fix handling for new flash memory chip
heinrichsweikamp
parents: 416
diff changeset
232 bsf flash_ncs ; CS=1
0
heinrichsweikamp
parents:
diff changeset
233 return
heinrichsweikamp
parents:
diff changeset
234
heinrichsweikamp
parents:
diff changeset
235 global ext_flash_enable_protection
heinrichsweikamp
parents:
diff changeset
236 ext_flash_enable_protection:
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
237 ; lock old memory
0
heinrichsweikamp
parents:
diff changeset
238 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
239 movlw 0x50 ; EWSR command
heinrichsweikamp
parents:
diff changeset
240 rcall write_spi
heinrichsweikamp
parents:
diff changeset
241 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
242
heinrichsweikamp
parents:
diff changeset
243 movlw 0x01 ; WRSR command
heinrichsweikamp
parents:
diff changeset
244 rcall write_spi
heinrichsweikamp
parents:
diff changeset
245 movlw b'00011100' ; New status (Write protect on)
heinrichsweikamp
parents:
diff changeset
246 rcall write_spi
416
4389fe9673b2 NEW: Support for new logbook memory chip (minor hardware change)
heinrichsweikamp
parents: 414
diff changeset
247 ; bsf flash_ncs ; CS=1
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
248
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
249 ; lock new memory
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
250 bsf flash_ncs ; CS=1
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
251 movlw 0x06 ; WREN command
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
252 rcall write_spi
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
253 bsf flash_ncs ; CS=1
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
254 movlw 0x42 ; WBPR command
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
255 rcall write_spi
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
256 movlw .18
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
257 movwf temp1
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
258 ext_flash_enable_protection2:
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
259 movlw 0xFF
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
260 rcall write_spi
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
261 decfsz temp1,F ; 18 bytes with 0xFF
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
262 bra ext_flash_enable_protection2
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
263 bsf flash_ncs ; CS=1
0
heinrichsweikamp
parents:
diff changeset
264 return
heinrichsweikamp
parents:
diff changeset
265
heinrichsweikamp
parents:
diff changeset
266
heinrichsweikamp
parents:
diff changeset
267 global ext_flash_erase4kB ; Erases 4kB sector
heinrichsweikamp
parents:
diff changeset
268 ext_flash_erase4kB:
heinrichsweikamp
parents:
diff changeset
269 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
270 movlw 0x06 ; WREN command
heinrichsweikamp
parents:
diff changeset
271 rcall write_spi
heinrichsweikamp
parents:
diff changeset
272 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
273 movlw 0x20 ; Sector erase command
heinrichsweikamp
parents:
diff changeset
274 rcall write_spi
heinrichsweikamp
parents:
diff changeset
275 rcall ext_flash_write_address ; Write 24bit address ext_flash_address:3 via SPI
heinrichsweikamp
parents:
diff changeset
276 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
277 ; bra ext_flash_wait_write ; Wait for write... and return
heinrichsweikamp
parents:
diff changeset
278 ext_flash_wait_write:
421
3895adc3477f fix Page-Program timing
heinrichsweikamp
parents: 420
diff changeset
279 WAITMS d'1' ; TBE/TSE=25ms...
0
heinrichsweikamp
parents:
diff changeset
280 movlw 0x05 ; RDSR command
heinrichsweikamp
parents:
diff changeset
281 rcall write_spi ; Read status
heinrichsweikamp
parents:
diff changeset
282 rcall write_spi ; Read status into WREG
heinrichsweikamp
parents:
diff changeset
283 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
284 btfsc SSP2BUF,0 ; Write operation in process?
heinrichsweikamp
parents:
diff changeset
285 bra ext_flash_wait_write ; Yes, wait more..
heinrichsweikamp
parents:
diff changeset
286 return
heinrichsweikamp
parents:
diff changeset
287
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
288 global ext_flash_erase_logbook ; erases logbook memory (000000h -> 2FFFFFh -> 3MByte -> 3145728 Bytes)
0
heinrichsweikamp
parents:
diff changeset
289 ext_flash_erase_logbook:
heinrichsweikamp
parents:
diff changeset
290 bsf flash_ncs ; CS=1
heinrichsweikamp
parents:
diff changeset
291 clrf ext_flash_address+0
heinrichsweikamp
parents:
diff changeset
292 clrf ext_flash_address+1
heinrichsweikamp
parents:
diff changeset
293 clrf ext_flash_address+2
heinrichsweikamp
parents:
diff changeset
294
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
295 setf temp1 ; 256*12kB=3145728 Bytes
0
heinrichsweikamp
parents:
diff changeset
296 ext_flash_erase_logbook_loop:
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
297 rcall ext_flash_erase4kB ; 4kB
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
298 rcall ext_flash_add_4kB ; Increase ext_flash_address:3 by 4kB
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
299 rcall ext_flash_erase4kB ; 4kB
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
300 rcall ext_flash_add_4kB ; Increase ext_flash_address:3 by 4kB
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
301 rcall ext_flash_erase4kB ; 4kB
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
302 rcall ext_flash_add_4kB ; Increase ext_flash_address:3 by 4kB
0
heinrichsweikamp
parents:
diff changeset
303 decfsz temp1,F
heinrichsweikamp
parents:
diff changeset
304 bra ext_flash_erase_logbook_loop
heinrichsweikamp
parents:
diff changeset
305 return
heinrichsweikamp
parents:
diff changeset
306
414
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
307 ext_flash_add_4kB:
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
308 movlw 0x10
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
309 addwf ext_flash_address+1,F
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
310 movlw d'0'
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
311 addwfc ext_flash_address+2,F
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
312 return
35bdfd89323c support for new flash memory
heinrichsweikamp
parents: 281
diff changeset
313
0
heinrichsweikamp
parents:
diff changeset
314
heinrichsweikamp
parents:
diff changeset
315 write_spi: ; With data in WREG...
heinrichsweikamp
parents:
diff changeset
316 bcf flash_ncs ; CS
heinrichsweikamp
parents:
diff changeset
317 global write_spi1
heinrichsweikamp
parents:
diff changeset
318 write_spi1: ; With data in WREG...
heinrichsweikamp
parents:
diff changeset
319 bcf SSP2STAT,WCOL ; Clear flag
heinrichsweikamp
parents:
diff changeset
320 movwf SSP2BUF ; Write to buffer
heinrichsweikamp
parents:
diff changeset
321 btfsc SSP2STAT,WCOL ; Was buffer full?
heinrichsweikamp
parents:
diff changeset
322 bra write_spi1 ; Yes, try again
heinrichsweikamp
parents:
diff changeset
323
heinrichsweikamp
parents:
diff changeset
324 write_spi2: ; Wait for write command
heinrichsweikamp
parents:
diff changeset
325 btfss SSP2STAT, BF ; Buffer full?
heinrichsweikamp
parents:
diff changeset
326 bra write_spi2 ; No, wait.
heinrichsweikamp
parents:
diff changeset
327 movf SSP2BUF,W
heinrichsweikamp
parents:
diff changeset
328 return ; Returns RX data in WREG and SSP2BUF
heinrichsweikamp
parents:
diff changeset
329
281
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
330 global fix_180_dives
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
331 fix_180_dives: ; fix dives made with the 1.80
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
332 clrf divesecs ; Here: # of dive (0-255) in TOC
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
333 fix_180_dives2:
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
334 rcall fix_load_dive_into_buffer ; Load header #divesecs into buffer:256
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
335 rcall fix_check_buffer ; Check the buffered dive
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
336 tstfsz WREG ; Dive needs fix?
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
337 rcall fix_buffered_dive ; Yes, fix and save it
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
338 decfsz divesecs,F ; All done?
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
339 bra fix_180_dives2 ; No, continue
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
340 return ; All done.
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
341
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
342 fix_buffered_dive: ; Yes, fix and save it
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
343 rcall ext_flash_disable_protection ; Disable write protection for external flash
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
344 banksel buffer
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
345 ; Set to 1.81
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
346 movlw .81
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
347 movwf buffer+.49
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
348 ; Fix wrong profile length
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
349 movlw .3
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
350 subwf buffer+.9,F
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
351 movlw d'0'
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
352 subwfb buffer+.10,F
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
353 subwfb buffer+.11,F
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
354 banksel common
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
355 ; save result into external flash again
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
356 rcall fix_set_to_toc_start
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
357 clrf lo
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
358 lfsr FSR0,buffer+0
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
359 fix_buffered_dive2:
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
360 movf POSTINC0,W
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
361 rcall write_byte_ext_flash_plus_header; Write from WREG and increase address after write
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
362 decfsz lo,F ; All done?
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
363 bra fix_buffered_dive2 ; No, continue
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
364 return
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
365
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
366 fix_check_buffer: ; Check the buffered dive
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
367 movff buffer+.48,temp1
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
368 movlw .1
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
369 cpfseq temp1 ; buffer+.48 = .1 ?
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
370 retlw .0 ; No, abort
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
371 movff buffer+.49,temp1
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
372 movlw .80
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
373 cpfseq temp1 ; buffer+.49 = .80 ?
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
374 retlw .0 ; No, abort
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
375 retlw .1 ; Yes, fix this dive
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
376
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
377 fix_load_dive_into_buffer: ; Load header #divesecs into buffer:256
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
378 rcall fix_set_to_toc_start
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
379 clrf lo
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
380 lfsr FSR0,buffer+0
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
381 fix_load_dive_into_buffer2:
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
382 rcall ext_flash_byte_read_plus ; increase address after read
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
383 movff temp1,POSTINC0 ; copy into buffer
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
384 decfsz lo,F ; All done?
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
385 bra fix_load_dive_into_buffer2 ; No, continue
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
386
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
387 fix_set_to_toc_start:
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
388 clrf ext_flash_address+0
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
389 clrf ext_flash_address+1
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
390 movlw 0x20
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
391 movwf ext_flash_address+2
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
392 movlw .16
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
393 mulwf divesecs; divesecs*16 = offset to 0x2000 (up:hi)
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
394 movf PRODL,W
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
395 addwf ext_flash_address+1,F
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
396 movf PRODH,W
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
397 addwfc ext_flash_address+2,F
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
398 ; pointer at the first 0xFA of header
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
399 return
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
400
eb758a5b44eb BUGFIX: Fix download issue for dives made with 1.80 firmware
heinrichsweikamp
parents: 279
diff changeset
401
0
heinrichsweikamp
parents:
diff changeset
402 END