annotate packages/io/flash/current/src/legacy_dev.c @ 1769:8667859d61ab

* src/flash_legacy.h: Undef HAL_FLASH_CACHES_* macros if the HAL supplied them and they're not needed. * cdl/io_flash.cdl, src/flash.c, src/flash_legacy.h, src/legacy_dev.c: add support for V2 drivers which can take care of the cache and interrupts themselves.
author jlarmour
date Wed, 27 Sep 2006 14:24:46 +0000
parents bfd6d67dba43
children 79275fdb4f20
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
1 //==========================================================================
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
2 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
3 // legacy_dev.c
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
4 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
5 // Interface to the legacy device drivers
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
6 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
7 //==========================================================================
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
8 //####ECOSGPLCOPYRIGHTBEGIN####
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
9 // -------------------------------------------
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
10 // This file is part of eCos, the Embedded Configurable Operating System.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
11 // Copyright (C) 2004 Andrew Lunn
1769
8667859d61ab * src/flash_legacy.h: Undef HAL_FLASH_CACHES_* macros if the HAL
jlarmour
parents: 1765
diff changeset
12 // Copyright (C) 2004 eCosCentric Limited
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
13 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
14 // eCos is free software; you can redistribute it and/or modify it under
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
15 // the terms of the GNU General Public License as published by the Free
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
16 // Software Foundation; either version 2 or (at your option) any later version.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
17 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
18 // eCos is distributed in the hope that it will be useful, but WITHOUT ANY
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
19 // WARRANTY; without even the implied warranty of MERCHANTABILITY or
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
20 // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
21 // for more details.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
22 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
23 // You should have received a copy of the GNU General Public License along
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
24 // with eCos; if not, write to the Free Software Foundation, Inc.,
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
25 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
26 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
27 // As a special exception, if other files instantiate templates or use macros
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
28 // or inline functions from this file, or you compile this file and link it
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
29 // with other works to produce a work based on this file, this file does not
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
30 // by itself cause the resulting work to be covered by the GNU General Public
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
31 // License. However the source code for this file must still be made available
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
32 // in accordance with section (3) of the GNU General Public License.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
33 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
34 // This exception does not invalidate any other reasons why a work based on
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
35 // this file might be covered by the GNU General Public License.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
36 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
37 // Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
38 // at http://sources.redhat.com/ecos/ecos-license/
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
39 // -------------------------------------------
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
40 //####ECOSGPLCOPYRIGHTEND####
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
41 //==========================================================================
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
42 //#####DESCRIPTIONBEGIN####
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
43 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
44 // Author(s): Andrew Lunn
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
45 // Contributors: Andrew Lunn
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
46 // Date: 2004-07-02
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
47 // Purpose:
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
48 // Description: Implement an interface to the legacy device drivers
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
49 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
50 //####DESCRIPTIONEND####
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
51 //
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
52 //==========================================================================
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
53
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
54 #include <pkgconf/system.h>
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
55 #include <pkgconf/io_flash.h>
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
56
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
57 #include <cyg/hal/hal_arch.h>
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
58 #include <cyg/hal/hal_intr.h>
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
59 #include <cyg/hal/hal_cache.h>
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
60 #include <string.h>
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
61
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
62 #include <cyg/io/flash.h>
1764
96ec7e534d98 V2 flash header files clean-up. Eliminate flash_priv.h, moving the
bartv
parents: 1763
diff changeset
63 #include <cyg/io/flash_dev.h>
1750
fac0499dabd6 Move legacy macros from a public to an internal header file, to
bartv
parents: 1749
diff changeset
64 #include "flash_legacy.h"
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
65
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
66 // When this flag is set, do not actually jump to the relocated code.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
67 // This can be used for running the function in place (RAM startup only),
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
68 // allowing calls to diag_printf() and similar.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
69 #undef RAM_FLASH_DEV_DEBUG
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
70 #if !defined(CYG_HAL_STARTUP_RAM) && defined(RAM_FLASH_DEV_DEBUG)
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
71 # warning "Can only enable the flash debugging when configured for RAM startup"
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
72 #endif
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
73
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
74 struct flash_info flash_info;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
75
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
76 // These are the functions in the HW specific driver we need to call.
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
77 typedef void code_fun(void*);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
78
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
79 externC code_fun flash_query;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
80 externC code_fun flash_erase_block;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
81 externC code_fun flash_program_buf;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
82 externC code_fun flash_read_buf;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
83 externC code_fun flash_lock_block;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
84 externC code_fun flash_unlock_block;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
85
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
86 // Initialize the device
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
87 static int
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
88 legacy_flash_init (struct cyg_flash_dev *dev)
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
89 {
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
90 int err;
1749
80232dbac7fb Flash API clean-ups
bartv
parents: 1744
diff changeset
91 static cyg_flash_block_info_t block_info[1];
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
92
1765
bfd6d67dba43 V2 flash. Miscellaneous fixes to the legacy API and legacy device
bartv
parents: 1764
diff changeset
93 flash_info.pf = dev->pf;
bfd6d67dba43 V2 flash. Miscellaneous fixes to the legacy API and legacy device
bartv
parents: 1764
diff changeset
94
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
95 err=flash_hwr_init();
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
96
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
97 if (!err) {
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
98 dev->start = (cyg_flashaddr_t)flash_info.start;
1735
e308039f4579 * src/legacy_dev.c (legacy_flash_init): The end is the size plus
asl
parents: 1730
diff changeset
99 dev->end = dev->start + flash_info.block_size * flash_info.blocks - 1;
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
100 dev->num_block_infos = 1;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
101 dev->block_info = block_info;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
102 block_info[0].block_size = flash_info.block_size;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
103 block_info[0].blocks = flash_info.blocks;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
104 }
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
105 return err;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
106 }
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
107
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
108 static size_t
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
109 legacy_flash_query (struct cyg_flash_dev *dev,
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
110 void * data,
1758
400806bc9c4f Remove unnecessary .2ram section attributes. These functions do not
bartv
parents: 1752
diff changeset
111 size_t len)
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
112 {
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
113 typedef void code_fun(void*);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
114 code_fun *_flash_query;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
115
1762
9c1d9e5039c2 Move dummy init/query/lock/unlock functions to the generic flash code,
bartv
parents: 1758
diff changeset
116 _flash_query = (code_fun*) cyg_flash_anonymizer(&flash_query);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
117
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
118 (*_flash_query)(data);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
119
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
120 return len;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
121 }
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
122
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
123 static int
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
124 legacy_flash_erase_block (struct cyg_flash_dev *dev,
1752
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
125 cyg_flashaddr_t block_base)
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
126 {
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
127 typedef int code_fun(cyg_flashaddr_t, unsigned int);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
128 code_fun *_flash_erase_block;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
129 size_t block_size = dev->block_info[0].block_size;
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
130 int stat;
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
131
1762
9c1d9e5039c2 Move dummy init/query/lock/unlock functions to the generic flash code,
bartv
parents: 1758
diff changeset
132 _flash_erase_block = (code_fun*) cyg_flash_anonymizer(&flash_erase_block);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
133
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
134 stat = (*_flash_erase_block)(block_base, block_size);
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
135 return flash_hwr_map_error(stat);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
136 }
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
137
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
138 static int
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
139 legacy_flash_program(struct cyg_flash_dev *dev,
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
140 cyg_flashaddr_t base,
1752
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
141 const void* data, size_t len)
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
142 {
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
143 typedef int code_fun(cyg_flashaddr_t, const void *, int, unsigned long, int);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
144 code_fun *_flash_program_buf;
1769
8667859d61ab * src/flash_legacy.h: Undef HAL_FLASH_CACHES_* macros if the HAL
jlarmour
parents: 1765
diff changeset
145 size_t block_mask = ~(block_size -1);
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
146 int stat;
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
147
1762
9c1d9e5039c2 Move dummy init/query/lock/unlock functions to the generic flash code,
bartv
parents: 1758
diff changeset
148 _flash_program_buf = (code_fun*) cyg_flash_anonymizer(&flash_program_buf);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
149
1765
bfd6d67dba43 V2 flash. Miscellaneous fixes to the legacy API and legacy device
bartv
parents: 1764
diff changeset
150 stat = (*_flash_program_buf)(base, data, len, block_mask, flash_info.buffer_size);
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
151 return flash_hwr_map_error(stat);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
152 }
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
153
1744
f854ed1e81db Fix reads on legacy devices
bartv
parents: 1735
diff changeset
154 #ifdef CYGSEM_IO_FLASH_READ_INDIRECT
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
155 static int
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
156 legacy_flash_read (struct cyg_flash_dev *dev,
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
157 const cyg_flashaddr_t base,
1752
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
158 void* data, size_t len)
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
159 {
1730
3f6b1c304c7a * src/flash.c: Offset into the block is not calculated correctly
asl
parents: 1729
diff changeset
160 typedef int code_fun(const cyg_flashaddr_t, void *, int, unsigned long, int);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
161 code_fun *_flash_read_buf;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
162 size_t block_size = dev->block_info[0].block_size;
1769
8667859d61ab * src/flash_legacy.h: Undef HAL_FLASH_CACHES_* macros if the HAL
jlarmour
parents: 1765
diff changeset
163 size_t block_mask = ~(block_size -1);
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
164 int stat;
1762
9c1d9e5039c2 Move dummy init/query/lock/unlock functions to the generic flash code,
bartv
parents: 1758
diff changeset
165 _flash_read_buf = (code_fun*) cyg_flash_anonymizer(&flash_read_buf);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
166
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
167 stat = (*_flash_read_buf)(base, data, len, block_mask, block_size);
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
168 return flash_hwr_map_error(stat);
1744
f854ed1e81db Fix reads on legacy devices
bartv
parents: 1735
diff changeset
169 }
f854ed1e81db Fix reads on legacy devices
bartv
parents: 1735
diff changeset
170
f854ed1e81db Fix reads on legacy devices
bartv
parents: 1735
diff changeset
171 # define LEGACY_FLASH_READ legacy_flash_read
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
172 #else
1744
f854ed1e81db Fix reads on legacy devices
bartv
parents: 1735
diff changeset
173 # define LEGACY_FLASH_READ ((int (*)(struct cyg_flash_dev*, const cyg_flashaddr_t, void*, const size_t))0)
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
174 #endif
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
175
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
176
1752
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
177 #ifdef CYGHWR_IO_FLASH_BLOCK_LOCKING
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
178 static int
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
179 legacy_flash_block_lock (struct cyg_flash_dev *dev,
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
180 const cyg_flashaddr_t block_base)
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
181 {
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
182 typedef int code_fun(cyg_flashaddr_t);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
183 code_fun *_flash_lock_block;
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
184 int stat;
1762
9c1d9e5039c2 Move dummy init/query/lock/unlock functions to the generic flash code,
bartv
parents: 1758
diff changeset
185 _flash_lock_block = (code_fun*) cyg_flash_anonymizer(&flash_lock_block);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
186
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
187 stat = (*_flash_lock_block)(block_base);
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
188 return flash_hwr_map_error(stat);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
189 }
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
190
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
191 static int
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
192 legacy_flash_block_unlock (struct cyg_flash_dev *dev,
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
193 const cyg_flashaddr_t block_base)
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
194 {
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
195 typedef int code_fun(cyg_flashaddr_t, int, int);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
196 code_fun *_flash_unlock_block;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
197 size_t block_size = dev->block_info[0].block_size;
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
198 cyg_uint32 blocks = dev->block_info[0].blocks;
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
199 int stat;
1762
9c1d9e5039c2 Move dummy init/query/lock/unlock functions to the generic flash code,
bartv
parents: 1758
diff changeset
200 _flash_unlock_block = (code_fun*) cyg_flash_anonymizer(&flash_unlock_block);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
201
1763
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
202 stat = (*_flash_unlock_block)(block_base, block_size, blocks);
42c8ea63b78d Eliminate hwr_map_error() from the V2 driver interface, it no longer
bartv
parents: 1762
diff changeset
203 return flash_hwr_map_error(stat);
1752
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
204 }
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
205 #endif
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
206
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
207 void
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
208 flash_dev_query(void* data)
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
209 {
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
210 typedef void code_fun(void*);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
211 code_fun *_flash_query;
1769
8667859d61ab * src/flash_legacy.h: Undef HAL_FLASH_CACHES_* macros if the HAL
jlarmour
parents: 1765
diff changeset
212 HAL_FLASH_CACHES_STATE(d_cache, i_cache);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
213
1762
9c1d9e5039c2 Move dummy init/query/lock/unlock functions to the generic flash code,
bartv
parents: 1758
diff changeset
214 _flash_query = (code_fun*) cyg_flash_anonymizer(&flash_query);
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
215
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
216 HAL_FLASH_CACHES_OFF(d_cache, i_cache);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
217 (*_flash_query)(data);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
218 HAL_FLASH_CACHES_ON(d_cache, i_cache);
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
219 }
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
220
1752
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
221 static const CYG_FLASH_FUNS(cyg_legacy_funs,
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
222 legacy_flash_init,
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
223 legacy_flash_query,
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
224 legacy_flash_erase_block,
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
225 legacy_flash_program,
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
226 LEGACY_FLASH_READ,
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
227 legacy_flash_block_lock,
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
228 legacy_flash_block_unlock
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
229 );
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
230
1752
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
231 CYG_FLASH_DRIVER(cyg_zzlegacy_flashdev,
1706
3845779eca10 * src/flash.c: Major rewrite to implement a new API
asl
parents:
diff changeset
232 &cyg_legacy_funs,
1752
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
233 0, // Flags
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
234 0, // Start address, filled in by init
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
235 0, // End address, filled in by init
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
236 0, // Number of block infos, filled in by init
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
237 NULL, // Block infos, again filled in by init
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
238 NULL // Driver private data, none needed
61fbcc1cb232 Clean up device driver interface
bartv
parents: 1750
diff changeset
239 );