summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pcilib/property.c6
-rw-r--r--pcilib/register.c40
-rw-r--r--protocols/property.c36
3 files changed, 37 insertions, 45 deletions
diff --git a/pcilib/property.c b/pcilib/property.c
index a39594c..7239601 100644
--- a/pcilib/property.c
+++ b/pcilib/property.c
@@ -34,9 +34,9 @@ int pcilib_add_registers_from_properties(pcilib_t *ctx, size_t n, pcilib_view_co
return err;
}
}
-
- access = ctx->banks[bank].access;
-
+
+ access = ctx->banks[bank].access / 8;
+
for (i = 0; i < n; i++) {
if ((v[i]->flags&PCILIB_VIEW_FLAG_REGISTER) == 0) continue;
diff --git a/pcilib/register.c b/pcilib/register.c
index 1f1cf9e..a11bdac 100644
--- a/pcilib/register.c
+++ b/pcilib/register.c
@@ -185,26 +185,6 @@ static int pcilib_read_register_space_internal(pcilib_t *ctx, pcilib_register_ba
return PCILIB_ERROR_OUTOFRANGE;
}
- if (b->protocol == PCILIB_REGISTER_PROTOCOL_PROPERTY) {
- for (i = 0; i < (bits?(n+1):n); i++) {
- if ((ctx->views[i]->flags&PCILIB_VIEW_FLAG_REGISTER) == 0) {
- pcilib_error("Accessing invalid register %u (associated view does not provide register functionality)", addr + i);
- return PCILIB_ERROR_INVALID_REQUEST;
- }
-
- if ((ctx->views[i]->mode&PCILIB_ACCESS_R) == 0) {
- pcilib_error("Read access is not allowed to register %u", addr + i);
- return PCILIB_ERROR_NOTPERMITED;
- }
- }
- }
-
- //err = pcilib_init_register_banks(ctx);
- //if (err) return err;
-
- //n += bits / b->access;
- //bits %= b->access;
-
for (i = 0; i < n; i++) {
err = bapi->read(ctx, bctx, addr + i * access, buf + i);
if (err) break;
@@ -315,26 +295,6 @@ static int pcilib_write_register_space_internal(pcilib_t *ctx, pcilib_register_b
return PCILIB_ERROR_OUTOFRANGE;
}
- if (b->protocol == PCILIB_REGISTER_PROTOCOL_PROPERTY) {
- for (i = 0; i < (bits?(n+1):n); i++) {
- if ((ctx->views[i]->flags&PCILIB_VIEW_FLAG_REGISTER) == 0) {
- pcilib_error("Accessing invalid register %u (associated view does not provide register functionality)", addr + i);
- return PCILIB_ERROR_INVALID_REQUEST;
- }
-
- if ((ctx->views[i]->mode&PCILIB_ACCESS_W) == 0) {
- pcilib_error("Write access is not allowed to register %u", addr + i);
- return PCILIB_ERROR_NOTPERMITED;
- }
- }
- }
-
- //err = pcilib_init_register_banks(ctx);
- //if (err) return err;
-
- //n += bits / b->access;
- //bits %= b->access;
-
for (i = 0; i < n; i++) {
err = bapi->write(ctx, bctx, addr + i * access, buf[i]);
if (err) break;
diff --git a/protocols/property.c b/protocols/property.c
index 978f22e..e8fec6e 100644
--- a/protocols/property.c
+++ b/protocols/property.c
@@ -17,8 +17,23 @@ int pcilib_property_registers_read(pcilib_t *ctx, pcilib_register_bank_context_t
pcilib_view_t view = addr / access;
pcilib_value_t val = {0};
- if ((view == PCILIB_VIEW_INVALID)||(view >= ctx->num_views)||(addr % access))
+ if (addr % access) {
+ pcilib_error("Can't perform unaligned access to property register (the address is 0x%lx and alligment requirement is %u)", addr, access);
return PCILIB_ERROR_INVALID_ARGUMENT;
+ }
+
+ if ((view == PCILIB_VIEW_INVALID)||(view >= ctx->num_views))
+ return PCILIB_ERROR_INVALID_ARGUMENT;
+
+ if ((ctx->views[view]->flags&PCILIB_VIEW_FLAG_REGISTER) == 0) {
+ pcilib_error("Accessing invalid register %u (associated view %u does not provide register functionality)", addr, view);
+ return PCILIB_ERROR_INVALID_REQUEST;
+ }
+
+ if ((ctx->views[view]->mode&PCILIB_ACCESS_R) == 0) {
+ pcilib_error("Read access is not allowed to register %u (view %u)", addr, view);
+ return PCILIB_ERROR_NOTPERMITED;
+ }
err = pcilib_get_property(ctx, ctx->views[view]->name, &val);
if (err) return err;
@@ -38,9 +53,26 @@ int pcilib_property_registers_write(pcilib_t *ctx, pcilib_register_bank_context_
pcilib_view_t view = addr / access;
pcilib_value_t val = {0};
- if ((view == PCILIB_VIEW_INVALID)||(view >= ctx->num_views)||(addr % access))
+ if (addr % access) {
+ pcilib_error("Can't perform unaligned access to property register (the address is 0x%lx and alligment requirement is %u)", addr, access);
+ return PCILIB_ERROR_INVALID_ARGUMENT;
+ }
+
+ if ((view == PCILIB_VIEW_INVALID)||(view >= ctx->num_views))
return PCILIB_ERROR_INVALID_ARGUMENT;
+
+ if ((ctx->views[view]->flags&PCILIB_VIEW_FLAG_REGISTER) == 0) {
+ pcilib_error("Accessing invalid register %u (associated view %u does not provide register functionality)", addr, view);
+ return PCILIB_ERROR_INVALID_REQUEST;
+ }
+
+ if ((ctx->views[view]->mode&PCILIB_ACCESS_W) == 0) {
+ pcilib_error("Write access is not allowed to register %u (view %u)", addr, view);
+ return PCILIB_ERROR_NOTPERMITED;
+ }
+
+
err = pcilib_set_value_from_register_value(ctx, &val, regval);
if (err) return err;