Fix multiword register reads in a proper way

2 files changed, 11 insertions, 7 deletions

diff --git a/default.c b/default.c
index f072579..15ae076 100644
--- a/default.c
+++ b/default.c
@@ -15,7 +15,7 @@ int pcilib_default_read(pcilib_t *ctx, pcilib_register_bank_description_t *bank,
     pcilib_register_value_t val = 0;
     int access = bank->access / 8;
 
-    ptr =  pcilib_resolve_register_address(ctx, bank->bar, bank->read_addr + addr * access);
+    ptr =  pcilib_resolve_register_address(ctx, bank->bar, bank->read_addr + addr);
     default_datacpy(&val, ptr, access, bank);
     
 //    *value = val&BIT_MASK(bits);
@@ -31,7 +31,7 @@ int pcilib_default_write(pcilib_t *ctx, pcilib_register_bank_description_t *bank
     char *ptr;
     int access = bank->access / 8;
 
-    ptr =  pcilib_resolve_register_address(ctx, bank->bar, bank->write_addr + addr * access);
+    ptr =  pcilib_resolve_register_address(ctx, bank->bar, bank->write_addr + addr);
     default_datacpy(ptr, &value, access, bank);
 
     return 0;
diff --git a/register.c b/register.c
index 968e618..661c9b0 100644
--- a/register.c
+++ b/register.c
@@ -141,6 +141,8 @@ static int pcilib_read_register_space_internal(pcilib_t *ctx, pcilib_register_ba
     
     pcilib_model_description_t *model_info = pcilib_get_model_description(ctx);
     pcilib_register_bank_description_t *b = model_info->banks + bank;
+    
+    int access = b->access / 8;
 
     assert(bits < 8 * sizeof(pcilib_register_value_t));
     
@@ -162,13 +164,13 @@ static int pcilib_read_register_space_internal(pcilib_t *ctx, pcilib_register_ba
     //bits %= b->access; 
     
     for (i = 0; i < n; i++) {
-	err = pcilib_protocol[b->protocol].read(ctx, b, addr + i, buf + i);
+	err = pcilib_protocol[b->protocol].read(ctx, b, addr + i * access, buf + i);
 	if (err) break;
     }
     
     if ((bits > 0)&&(!err)) {
 	pcilib_register_value_t val = 0;
-	err = pcilib_protocol[b->protocol].read(ctx, b, addr + n, &val);
+	err = pcilib_protocol[b->protocol].read(ctx, b, addr + n * access, &val);
 
 	val = (val >> offset)&BIT_MASK(bits);
 	memcpy(buf + n, &val, sizeof(pcilib_register_value_t));
@@ -250,6 +252,8 @@ static int pcilib_write_register_space_internal(pcilib_t *ctx, pcilib_register_b
     pcilib_model_description_t *model_info = pcilib_get_model_description(ctx);
     pcilib_register_bank_description_t *b = model_info->banks + bank;
 
+    int access = b->access / 8;
+
     assert(bits < 8 * sizeof(pcilib_register_value_t));
 
     if (((addr + n) > b->size)||(((addr + n) == b->size)&&(bits))) {
@@ -270,7 +274,7 @@ static int pcilib_write_register_space_internal(pcilib_t *ctx, pcilib_register_b
     //bits %= b->access; 
     
     for (i = 0; i < n; i++) {
-	err = pcilib_protocol[b->protocol].write(ctx, b, addr + i, buf[i]);
+	err = pcilib_protocol[b->protocol].write(ctx, b, addr + i * access, buf[i]);
 	if (err) break;
     }
     
@@ -281,13 +285,13 @@ static int pcilib_write_register_space_internal(pcilib_t *ctx, pcilib_register_b
 	if (~mask&rwmask) {
 	    pcilib_register_value_t rval;
 	    
-	    err = pcilib_protocol[b->protocol].read(ctx, b, addr + n, &rval); 
+	    err = pcilib_protocol[b->protocol].read(ctx, b, addr + n * access, &rval); 
 	    if (err) return err;
 	    
 	    val |= (rval & rwmask & ~mask);
 	}
 	
-	err = pcilib_protocol[b->protocol].write(ctx, b, addr + n, val);
+	err = pcilib_protocol[b->protocol].write(ctx, b, addr + n * access, val);
     }
     
     return err;