Author: br
Date: Fri Dec 30 16:06:05 2016
New Revision: 310824
URL: https://svnweb.freebsd.org/changeset/base/310824
Log:
o Fix unlocking.
o Fix types for ds_addr/ds_len.
Sponsored by: DARPA, AFRL
Modified:
head/sys/dev/xdma/xdma.c
head/sys/dev/xdma/xdma.h
Modified: head/sys/dev/xdma/xdma.c
==============================================================================
--- head/sys/dev/xdma/xdma.c Fri Dec 30 14:54:54 2016 (r310823)
+++ head/sys/dev/xdma/xdma.c Fri Dec 30 16:06:05 2016 (r310824)
@@ -412,7 +412,7 @@ xdma_prep_memcpy(xdma_channel_t *xchan,
if (ret != 0) {
device_printf(xdma->dev,
"%s: Can't prepare memcpy transfer.\n", __func__);
- XDMA_UNLOCK();
+ XCHAN_UNLOCK(xchan);
return (-1);
}
@@ -460,7 +460,8 @@ xdma_prep_cyclic(xdma_channel_t *xchan,
if (ret != 0) {
device_printf(xdma->dev,
"%s: Can't prepare cyclic transfer.\n", __func__);
- XDMA_UNLOCK();
+ XCHAN_UNLOCK(xchan);
+
return (-1);
}
Modified: head/sys/dev/xdma/xdma.h
==============================================================================
--- head/sys/dev/xdma/xdma.h Fri Dec 30 14:54:54 2016 (r310823)
+++ head/sys/dev/xdma/xdma.h Fri Dec 30 16:06:05 2016 (r310824)
@@ -77,8 +77,8 @@ struct xdma_channel_config {
typedef struct xdma_channel_config xdma_config_t;
struct xdma_descriptor {
- uintptr_t ds_addr;
- uint32_t ds_len;
+ bus_addr_t ds_addr;
+ bus_size_t ds_len;
};
typedef struct xdma_descriptor xdma_descriptor_t;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
