[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] net/rocker: move struct rocker_desc to C file
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 4/7] net/rocker: move struct rocker_desc to C file |
Date: |
Mon, 8 Jan 2018 15:02:28 -0300 |
this is the only user.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/net/rocker/rocker_hw.h | 13 -------------
hw/net/rocker/rocker_desc.c | 13 +++++++++++++
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/hw/net/rocker/rocker_hw.h b/hw/net/rocker/rocker_hw.h
index 8b4ce250d5..daaaf4080f 100644
--- a/hw/net/rocker/rocker_hw.h
+++ b/hw/net/rocker/rocker_hw.h
@@ -119,19 +119,6 @@ enum {
*/
#define ROCKER_RING_INDEX(reg) ((reg >> 5) & 0x7F)
-/*
- * Rocker DMA Descriptor
- */
-
-typedef struct rocker_desc {
- __le64 buf_addr;
- uint64_t cookie;
- __le16 buf_size;
- __le16 tlv_size;
- __le16 rsvd[5]; /* pad to 32 bytes */
- __le16 comp_err;
-} QEMU_PACKED QEMU_ALIGNED(8) RockerDesc;
-
/*
* Rocker TLV type fields
*/
diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c
index b009da4f89..2f2de837f8 100644
--- a/hw/net/rocker/rocker_desc.c
+++ b/hw/net/rocker/rocker_desc.c
@@ -23,6 +23,19 @@
#include "rocker_hw.h"
#include "rocker_desc.h"
+/*
+ * Rocker DMA Descriptor
+ */
+
+typedef struct rocker_desc {
+ __le64 buf_addr;
+ uint64_t cookie;
+ __le16 buf_size;
+ __le16 tlv_size;
+ __le16 rsvd[5]; /* pad to 32 bytes */
+ __le16 comp_err;
+} QEMU_PACKED QEMU_ALIGNED(8) RockerDesc;
+
struct desc_ring {
hwaddr base_addr;
uint32_t size;
--
2.15.1
- [Qemu-devel] [PATCH 0/7] use QEMU_PACKED and QEMU_ALIGNED macros, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [PATCH 1/7] net: struct MACAddr can use the QEMU_PACKED macro, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [PATCH 2/7] net/eth: use the QEMU_PACKED macro, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [PATCH 4/7] net/rocker: move struct rocker_desc to C file,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 5/7] net/eepro100: use QEMU_ALIGNED() macro, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [PATCH 3/7] net/rocker: use QEMU_PACKED and QEMU_ALIGNED() macros, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH 6/7] net/eepro100: reduce alignment to DWORD (32bit), Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [PATCH 7/7] i386/pc: use the QEMU_ALIGNED() macro, Philippe Mathieu-Daudé, 2018/01/08