PERFORCE change 106719 for review
Attilio Rao
attilio at FreeBSD.org
Tue Sep 26 06:16:44 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=106719
Change 106719 by attilio at attilio_laptop on 2006/09/26 13:15:47
Style-ize it
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#7 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#7 (text+ko) ====
@@ -38,84 +38,79 @@
/*
- * Vendor specific commands
- * ASIX conveniently doesn't document the 'set NODEID' command in their
- * datasheet (thanks a lot guys).
- * To make handling these commands easier, I added some extra data
- * which is decided by the axe_cmd() routine. Commands are encoded
- * in 16 bites, with the format: LDCC. L and D are both nibbles in
- * the high byte. L represents the data length (0 to 15) and D
- * represents the direction (0 for vendor read, 1 for vendor write).
- * CC is the command byte, as specified in the manual.
+ * Vendor specific commands. ASIX conveniently doesn't document the 'set
+ * NODEID' command in their datasheet (thanks a lot guys).
+ * To make handling these commands easier, I added some extra data which is
+ * decided by the axe_cmd() routine. Commands are encoded in 16 bytes, with
+ * the format: LDCC. L and D are both nibbles in the high byte. L represents
+ * the data length (0 to 15) and D represents the direction (0 for vendor read,
+ * 1 for vendor write). CC is the command byte, as specified in the manual.
*/
-#define AXE_CMD_IS_WRITE(x) (((x) & 0x0F00) >> 8)
-#define AXE_CMD_LEN(x) (((x) & 0xF000) >> 12)
-#define AXE_CMD_CMD(x) ((x) & 0x00FF)
+#define AXE_CMD_IS_WRITE(x) (((x) & 0x0F00) >> 8)
+#define AXE_CMD_LEN(x) (((x) & 0xF000) >> 12)
+#define AXE_CMD_CMD(x) ((x) & 0x00FF)
-#define AXE_CMD_READ_RXTX_SRAM 0x2002
-#define AXE_CMD_WRITE_RX_SRAM 0x0103
-#define AXE_CMD_WRITE_TX_SRAM 0x0104
-#define AXE_CMD_MII_OPMODE_SW 0x0106
-#define AXE_CMD_MII_READ_REG 0x2007
-#define AXE_CMD_MII_WRITE_REG 0x2108
-#define AXE_CMD_MII_READ_OPMODE 0x1009
-#define AXE_CMD_MII_OPMODE_HW 0x010A
+#define AXE_CMD_READ_RXTX_SRAM 0x2002
+#define AXE_CMD_WRITE_RX_SRAM 0x0103
+#define AXE_CMD_WRITE_TX_SRAM 0x0104
+#define AXE_CMD_MII_OPMODE_SW 0x0106
+#define AXE_CMD_MII_READ_REG 0x2007
+#define AXE_CMD_MII_WRITE_REG 0x2108
+#define AXE_CMD_MII_READ_OPMODE 0x1009
+#define AXE_CMD_MII_OPMODE_HW 0x010A
#define AXE_CMD_SROM_READ 0x200B
-#define AXE_CMD_SROM_WRITE 0x010C
-#define AXE_CMD_SROM_WR_ENABLE 0x010D
-#define AXE_CMD_SROM_WR_DISABLE 0x010E
-#define AXE_CMD_RXCTL_READ 0x200F
-#define AXE_CMD_RXCTL_WRITE 0x0110
-#define AXE_CMD_READ_IPG012 0x3011
-#define AXE_CMD_WRITE_IPG0 0x0112
-#define AXE_CMD_WRITE_IPG1 0x0113
-#define AXE_CMD_WRITE_IPG2 0x0114
-#define AXE_CMD_READ_MCAST 0x8015
-#define AXE_CMD_WRITE_MCAST 0x8116
-#define AXE_CMD_READ_NODEID 0x6017
-#define AXE_CMD_WRITE_NODEID 0x6118
-#define AXE_CMD_READ_PHYID 0x2019
-#define AXE_CMD_READ_MEDIA 0x101A
-#define AXE_CMD_WRITE_MEDIA 0x011B
-#define AXE_CMD_READ_MONITOR_MODE 0x101C
-#define AXE_CMD_WRITE_MONITOR_MODE 0x011D
-#define AXE_CMD_READ_GPIO 0x101E
-#define AXE_CMD_WRITE_GPIO 0x011F
+#define AXE_CMD_SROM_WRITE 0x010C
+#define AXE_CMD_SROM_WR_ENABLE 0x010D
+#define AXE_CMD_SROM_WR_DISABLE 0x010E
+#define AXE_CMD_RXCTL_READ 0x200F
+#define AXE_CMD_RXCTL_WRITE 0x0110
+#define AXE_CMD_READ_IPG012 0x3011
+#define AXE_CMD_WRITE_IPG0 0x0112
+#define AXE_CMD_WRITE_IPG1 0x0113
+#define AXE_CMD_WRITE_IPG2 0x0114
+#define AXE_CMD_READ_MCAST 0x8015
+#define AXE_CMD_WRITE_MCAST 0x8116
+#define AXE_CMD_READ_NODEID 0x6017
+#define AXE_CMD_WRITE_NODEID 0x6118
+#define AXE_CMD_READ_PHYID 0x2019
+#define AXE_CMD_READ_MEDIA 0x101A
+#define AXE_CMD_WRITE_MEDIA 0x011B
+#define AXE_CMD_READ_MONITOR_MODE 0x101C
+#define AXE_CMD_WRITE_MONITOR_MODE 0x011D
+#define AXE_CMD_READ_GPIO 0x101E
+#define AXE_CMD_WRITE_GPIO 0x011F
-#define AXE_RXCMD_PROMISC 0x0001
-#define AXE_RXCMD_ALLMULTI 0x0002
-#define AXE_RXCMD_UNICAST 0x0004
-#define AXE_RXCMD_BROADCAST 0x0008
-#define AXE_RXCMD_MULTICAST 0x0010
-#define AXE_RXCMD_ENABLE 0x0080
+#define AXE_RXCMD_PROMISC 0x0001
+#define AXE_RXCMD_ALLMULTI 0x0002
+#define AXE_RXCMD_UNICAST 0x0004
+#define AXE_RXCMD_BROADCAST 0x0008
+#define AXE_RXCMD_MULTICAST 0x0010
+#define AXE_RXCMD_ENABLE 0x0080
-#define AXE_NOPHY 0xE0
+#define AXE_NOPHY 0xE0
-#define AXE_TIMEOUT 1000
-#define AXE_MIN_FRAMELEN 60
-#define AXE_RX_FRAMES 1
-#define AXE_TX_FRAMES 1
+#define AXE_TIMEOUT 1000
+#define AXE_MIN_FRAMELEN 60
+#define AXE_RX_FRAMES 1
+#define AXE_TX_FRAMES 1
-#define AXE_CTL_READ 0x01
-#define AXE_CTL_WRITE 0x02
+#define AXE_CTL_READ 0x01
+#define AXE_CTL_WRITE 0x02
-#define AXE_CONFIG_NO 1
-#define AXE_IFACE_IDX 0
+#define AXE_CONFIG_NO 1
+#define AXE_IFACE_IDX 0
-/*
- * The interrupt endpoint is currently unused
- * by the ASIX part.
- */
-#define AXE_ENDPT_MAX 6
+/* The interrupt endpoint is currently unused by the ASIX part. */
+#define AXE_ENDPT_MAX 6
struct axe_type {
- u_int16_t axe_vid;
- u_int16_t axe_did;
+ uint16_t axe_vid;
+ uint16_t axe_did;
};
-#define GET_MII(sc) ((sc)->sc_miibus ? \
- device_get_softc((sc)->sc_miibus) : NULL)
+#define GET_MII(sc) ((sc)->sc_miibus ? \
+ device_get_softc((sc)->sc_miibus) : NULL)
struct axe_softc {
struct usbd_config_td sc_config_td;
@@ -123,32 +118,32 @@
struct __callout sc_watchdog;
struct mtx sc_mtx;
- struct ifnet * sc_ifp;
- struct usbd_device * sc_udev;
- struct usbd_xfer * sc_xfer[AXE_ENDPT_MAX];
+ struct ifnet *sc_ifp;
+ struct usbd_device *sc_udev;
+ struct usbd_xfer *sc_xfer[AXE_ENDPT_MAX];
device_t sc_miibus;
device_t sc_dev;
- u_int32_t sc_unit;
- u_int32_t sc_media_active;
- u_int32_t sc_media_status;
+ uint32_t sc_unit;
+ uint32_t sc_media_active;
+ uint32_t sc_media_status;
- u_int16_t sc_flags;
-#define AXE_FLAG_WAIT_LINK 0x0001
-#define AXE_FLAG_INTR_STALL 0x0002
-#define AXE_FLAG_READ_STALL 0x0004
-#define AXE_FLAG_WRITE_STALL 0x0008
-#define AXE_FLAG_LL_READY 0x0010
-#define AXE_FLAG_HL_READY 0x0020
+ uint16_t sc_flags;
+#define AXE_FLAG_WAIT_LINK 0x0001
+#define AXE_FLAG_INTR_STALL 0x0002
+#define AXE_FLAG_READ_STALL 0x0004
+#define AXE_FLAG_WRITE_STALL 0x0008
+#define AXE_FLAG_LL_READY 0x0010
+#define AXE_FLAG_HL_READY 0x0020
- u_int8_t sc_ipgs[3];
- u_int8_t sc_phyaddrs[2];
+ uint8_t sc_ipgs[3];
+ uint8_t sc_phyaddrs[2];
- u_int8_t sc_name[16];
+ uint8_t sc_name[16];
};
struct axe_config_copy {
- u_int32_t if_flags;
- u_int8_t if_lladdr[ETHER_ADDR_LEN];
- u_int8_t if_hash[8];
+ uint32_t if_flags;
+ uint8_t if_lladdr[ETHER_ADDR_LEN];
+ uint8_t if_hash[8];
};
More information about the p4-projects
mailing list