Changeset 70922c2 in mainline for uspace/drv/nic/rtl8139/defs.h

Timestamp:

2012-02-01T00:09: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:

ffcc5776

Parents:

cb3dbb63 (diff), 3d4750f (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/rtl8139/defs.h (modified) (6 diffs)

uspace/drv/nic/rtl8139/defs.h

@@ -29 +29 @@
 /** @file rtl8139_defs.h
  *
- *  Registers, bit positions and masks definition of the RTL8139 network family 
- *  cards
- */
-
-#ifndef RTL8139_DEFS_H_INCLUDED_
-#define RTL8139_DEFS_H_INCLUDED_
+ * Registers, bit positions and masks definition
+ * of the RTL8139 network family cards
+ */
+
+#ifndef RTL8139_DEFS_H_
+#define RTL8139_DEFS_H_
+
 #include <sys/types.h>
 #include <libarch/ddi.h>
 
-
-/** The size of RTL8139 registers address space */
-#define RTL8139_IO_SIZE 256
-
-/** The maximal transmitted frame length in bytes allowed according to RTL8139
- *  documentation (see SIZE part of TSD documentation)
- */
-#define RTL8139_FRAME_MAX_LENGTH 1792
-
+/** Size of RTL8139 registers address space */
+#define RTL8139_IO_SIZE  256
+
+/** Maximal transmitted frame length
+ *
+ * Maximal transmitted frame length in bytes
+ * allowed according to the RTL8139 documentation
+ * (see SIZE part of TSD documentation).
+ *
+ */
+#define RTL8139_FRAME_MAX_LENGTH  1792
 
 /** HW version
  *
- *  as can be detected from HWVERID part of TCR
- *  (Transmit Configuration Register)
- */
-enum rtl8139_version_id {
+ * As can be detected from HWVERID part of TCR
+ * (Transmit Configuration Register).
+ *
+ */
+typedef enum {
         RTL8139 = 0,          /**< RTL8139 */
         RTL8139A,             /**< RTL8139A */
@@ -66 +70 @@
         RTL8101,              /**< RTL8101 */
         RTL8139_VER_COUNT     /**< Count of known RTL versions, the last value */
-};
-
-extern const char* model_names[RTL8139_VER_COUNT];
+} rtl8139_version_id_t;
 
 /** Registers of RTL8139 family card offsets from the memory address base */
@@ -75 +77 @@
         MAC0  = IDR0,    /**< Alias for IDR0 */
 
-        // 0x6 - 0x7 reserved
+        // 0x06 - 0x07 reserved
 
         MAR0    = 0x08,  /**< Multicast mask registers 8 1b registers sequence */
@@ -213 +215 @@
         pio_write_8(io_base + CR9346, RTL8139_REGS_LOCKED);
 }
+
 /** Allow to change Config0-4 and BMCR register  */
 static inline void rtl8139_regs_unlock(void *io_base)
@@ -417 +420 @@
 
 /** Maximal runt frame size + 1 */
-#define RTL8139_RUNT_MAX_SIZE 64
+#define RTL8139_RUNT_MAX_SIZE  64
 
 /** Bits in frame header */
@@ -470 +473 @@
 
 /** Mapping of HW version -> version ID */
-struct rtl8139_hwver_map { 
-        uint32_t hwverid;                /**< HW version value in the register */
-        enum rtl8139_version_id ver_id;  /**< appropriate version id */
+struct rtl8139_hwver_map {
+        uint32_t hwverid;             /**< HW version value in the register */
+        rtl8139_version_id_t ver_id;  /**< appropriate version id */
 };
 
 /** Mapping of HW version -> version ID */
 extern const struct rtl8139_hwver_map rtl8139_versions[RTL8139_VER_COUNT + 1];
+extern const char* model_names[RTL8139_VER_COUNT];
 
 /** Size in the frame header while copying from RxFIFO to Rx buffer */
-#define RTL8139_EARLY_SIZE UINT16_C(0xfff0)
+#define RTL8139_EARLY_SIZE  UINT16_C(0xfff0)
+
 /** The only supported pause frame time value */
-#define RTL8139_PAUSE_VAL UINT16_C(0xFFFF)
+#define RTL8139_PAUSE_VAL  UINT16_C(0xFFFF)
 
 /** Size of the frame header in front of the received frame */
-#define RTL_FRAME_HEADER_SIZE 4
+#define RTL_FRAME_HEADER_SIZE  4
 
 /** 8k buffer */