Changeset 153cc76a in mainline for uspace/drv/nic/e1k/e1k.h

Timestamp:

2011-12-23T16:42:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7e1b130

Parents:

4291215 (diff), 2f0dd2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes.

File:

• uspace/drv/nic/e1k/e1k.h (modified) (4 diffs)

uspace/drv/nic/e1k/e1k.h

@@ -49 +49 @@
 
 /** Receive descriptior */
-typedef struct e1000_rx_descriptor {
+typedef struct {
         /** Buffer Address - physical */
         uint64_t phys_addr;
@@ -57 +57 @@
         uint16_t checksum;
         /** Status field */
-         uint8_t status;
+        uint8_t status;
         /** Errors field */
         uint8_t errors;
@@ -65 +65 @@
 
 /** Legacy transmit descriptior */
-typedef struct e1000_tx_descriptor {
+typedef struct {
         /** Buffer Address - physical */
         uint64_t phys_addr;
@@ -75 +75 @@
         uint8_t command;
         /** Status field, upper bits are reserved */
-         uint8_t status;
+        uint8_t status;
         /** Checksum Start Field */
         uint8_t checksum_start_field;