changeset 1761:af5ce7899d45

Apply Andrew's patch to sort out some const usage
author bartv
date Sun, 28 Nov 2004 22:25:37 +0000
parents 9abe5ac74a1a
children 9c1d9e5039c2
files packages/devs/flash/intel/stratav2/current/ChangeLog packages/devs/flash/intel/stratav2/current/include/flash_strata_v2.inl
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/flash/intel/stratav2/current/ChangeLog
+++ b/packages/devs/flash/intel/stratav2/current/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-25  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* include/flash_strata_v2.inl: Correct the usage of const
+	parameters. strata_init() needs to be able to modify priv.
+	strata_program_buf() does not need to modify priv.
+
 2004-11-22  Bart Veer  <bartv@ecoscentric.com>
 
 	* include/flash_strata_v2.inl: adjust const parameters as per
--- a/packages/devs/flash/intel/stratav2/current/include/flash_strata_v2.inl
+++ b/packages/devs/flash/intel/stratav2/current/include/flash_strata_v2.inl
@@ -122,7 +122,9 @@ strata_init (struct cyg_flash_dev *dev)
 {
     struct FLASH_query data, *qp;
     int num_regions, region_size, buffer_size;
-    struct cyg_flash_strata_v2_priv *priv = dev->priv;
+    // remove const property. We need to change the block_info and num_blocks      
+    struct cyg_flash_strata_v2_priv *priv = 
+        (struct cyg_flash_strata_v2_priv *)dev->priv;
 
     dev->funs->flash_query(dev, &data, sizeof(data));
     qp = &data;
@@ -337,7 +339,7 @@ strata_program_buf (struct cyg_flash_dev
                     const void* data_addr,
                     size_t total_len)
 {
-    struct cyg_flash_strata_v2_priv *priv = dev->priv;
+    const struct cyg_flash_strata_v2_priv *priv = dev->priv;
     volatile flash_t *ROM;
     volatile flash_t *BA, *addr;
     flash_t * data = (flash_t *)data_addr;