projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/axp20...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
altera
/
altera_sgdmahw.h
diff --git
a/drivers/net/ethernet/altera/altera_sgdmahw.h
b/drivers/net/ethernet/altera/altera_sgdmahw.h
index ba3334f353836cd0441d537ba5fda8a28bea171e..85bc33b218d946f557647d1a73f9699e3189827b 100644
(file)
--- a/
drivers/net/ethernet/altera/altera_sgdmahw.h
+++ b/
drivers/net/ethernet/altera/altera_sgdmahw.h
@@
-19,16
+19,16
@@
/* SGDMA descriptor structure */
struct sgdma_descrip {
/* SGDMA descriptor structure */
struct sgdma_descrip {
- u
nsigned int
raddr; /* address of data to be read */
- u
nsigned int
pad1;
- u
nsigned int
waddr;
- u
nsigned int
pad2;
- u
nsigned int
next;
- u
nsigned int
pad3;
- u
nsigned short
bytes;
- u
nsigned char
rburst;
- u
nsigned char
wburst;
- u
nsigned short
bytes_xferred; /* 16 bits, bytes xferred */
+ u
32
raddr; /* address of data to be read */
+ u
32
pad1;
+ u
32
waddr;
+ u
32
pad2;
+ u
32
next;
+ u
32
pad3;
+ u
16
bytes;
+ u
8
rburst;
+ u
8
wburst;
+ u
16
bytes_xferred; /* 16 bits, bytes xferred */
/* bit 0: error
* bit 1: length error
/* bit 0: error
* bit 1: length error
@@
-39,7
+39,7
@@
struct sgdma_descrip {
* bit 6: reserved
* bit 7: status eop for recv case
*/
* bit 6: reserved
* bit 7: status eop for recv case
*/
- u
nsigned char
status;
+ u
8
status;
/* bit 0: eop
* bit 1: read_fixed
/* bit 0: eop
* bit 1: read_fixed
@@
-47,7
+47,7
@@
struct sgdma_descrip {
* bits 3,4,5,6: Channel (always 0)
* bit 7: hardware owned
*/
* bits 3,4,5,6: Channel (always 0)
* bit 7: hardware owned
*/
- u
nsigned char
control;
+ u
8
control;
} __packed;
} __packed;
@@
-101,6
+101,8
@@
struct sgdma_csr {
u32 pad3[3];
};
u32 pad3[3];
};
+#define sgdma_csroffs(a) (offsetof(struct sgdma_csr, a))
+#define sgdma_descroffs(a) (offsetof(struct sgdma_descrip, a))
#define SGDMA_STSREG_ERR BIT(0) /* Error */
#define SGDMA_STSREG_EOP BIT(1) /* EOP */
#define SGDMA_STSREG_ERR BIT(0) /* Error */
#define SGDMA_STSREG_EOP BIT(1) /* EOP */