X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Focl.c;h=813537d446e1f9d61f4990dc6a4b1236a1fb108a;hb=491636c8b8328a54bef41b68771c2965dd468e05;hp=6b297b0d366c929c8d8dfa18d8a25d797f9e72e5;hpb=cbf4760e15d217c0a83e65f13bddfcbfad7d2fec;p=fw%2Fopenocd

diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c
index 6b297b0d3..813537d44 100644
--- a/src/flash/nor/ocl.c
+++ b/src/flash/nor/ocl.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -32,16 +30,6 @@ struct ocl_priv {
 	unsigned int bufalign;
 };
 
-static int ocl_erase_check(struct flash_bank *bank)
-{
-	return ERROR_OK;
-}
-
-static int ocl_protect_check(struct flash_bank *bank)
-{
-	return ERROR_OK;
-}
-
 /* flash_bank ocl 0 0 0 0 <target#> */
 FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
 {
@@ -63,7 +51,8 @@ FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
 	return ERROR_OK;
 }
 
-static int ocl_erase(struct flash_bank *bank, int first, int last)
+static int ocl_erase(struct flash_bank *bank, unsigned int first,
+		unsigned int last)
 {
 	struct ocl_priv *ocl = bank->driver_priv;
 	int retval;
@@ -113,12 +102,7 @@ static int ocl_erase(struct flash_bank *bank, int first, int last)
 	return ERROR_OK;
 }
 
-static int ocl_protect(struct flash_bank *bank, int set, int first, int last)
-{
-	return ERROR_OK;
-}
-
-static int ocl_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int ocl_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	struct ocl_priv *ocl = bank->driver_priv;
 	int retval;
@@ -224,7 +208,6 @@ static int ocl_probe(struct flash_bank *bank)
 	int retval;
 	uint32_t dcc_buffer[1];
 	int sectsize;
-	int i;
 
 	/* purge pending data in DCC */
 	embeddedice_receive(ocl->jtag_info, dcc_buffer, 1);
@@ -293,7 +276,7 @@ static int ocl_probe(struct flash_bank *bank)
 		return ERROR_FLASH_BANK_INVALID;
 	}
 	sectsize = bank->size / bank->num_sectors;
-	for (i = 0; i < bank->num_sectors; i++) {
+	for (unsigned int i = 0; i < bank->num_sectors; i++) {
 		bank->sectors[i].offset = i * sectsize;
 		bank->sectors[i].size = sectsize;
 		bank->sectors[i].is_erased = -1;
@@ -331,15 +314,14 @@ static int ocl_auto_probe(struct flash_bank *bank)
 	return ERROR_OK;
 }
 
-struct flash_driver ocl_flash = {
+const struct flash_driver ocl_flash = {
 	.name = "ocl",
 	.flash_bank_command = ocl_flash_bank_command,
 	.erase = ocl_erase,
-	.protect = ocl_protect,
 	.write = ocl_write,
 	.read = default_flash_read,
 	.probe = ocl_probe,
-	.erase_check = ocl_erase_check,
-	.protect_check = ocl_protect_check,
+	.erase_check = default_flash_blank_check,
 	.auto_probe = ocl_auto_probe,
+	.free_driver_priv = default_flash_free_driver_priv,
 };