aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuinan Sun <guinanx.sun@intel.com>2020-07-06 08:12:20 +0000
committerKevin Bowling <kbowling@FreeBSD.org>2021-09-17 21:24:23 +0000
commit9c4a0fabc8b88af0d9fd3f0d67bd080714d1ee4b (patch)
tree263debfb0fdbe9e80c72c4ce70ac29e8b6bf1b8e
parent7fb2111413c799414c86d7bfdcc72bc1c6302726 (diff)
downloadsrc-9c4a0fabc8b88af0d9fd3f0d67bd080714d1ee4b.tar.gz
src-9c4a0fabc8b88af0d9fd3f0d67bd080714d1ee4b.zip
e1000: cleanup pre-processor tags
The codes has been exposed correctly, so remove pre-processor tags. Signed-off-by: Guinan Sun <guinanx.sun@intel.com> Reviewed-by: Wei Zhao <wei.zhao1@intel.com> Approved by: imp Obtained from: DPDK (a50e998a0fd94e5db508710868a3417b1846425c) MFC after: 1 week
-rw-r--r--sys/dev/e1000/e1000_manage.c5
-rw-r--r--sys/dev/e1000/e1000_regs.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/e1000/e1000_manage.c b/sys/dev/e1000/e1000_manage.c
index 120431d58b0b..b5ad5815d5ee 100644
--- a/sys/dev/e1000/e1000_manage.c
+++ b/sys/dev/e1000/e1000_manage.c
@@ -34,6 +34,8 @@
/*$FreeBSD$*/
#include "e1000_api.h"
+#include "e1000_manage.h"
+
/**
* e1000_calculate_checksum - Calculate checksum for buffer
* @buffer: pointer to EEPROM
@@ -455,6 +457,7 @@ s32 e1000_host_interface_command(struct e1000_hw *hw, u8 *buffer, u32 length)
return E1000_SUCCESS;
}
+
/**
* e1000_load_firmware - Writes proxy FW code buffer to host interface
* and execute.
@@ -573,5 +576,3 @@ s32 e1000_load_firmware(struct e1000_hw *hw, u8 *buffer, u32 length)
return E1000_SUCCESS;
}
-
-
diff --git a/sys/dev/e1000/e1000_regs.h b/sys/dev/e1000/e1000_regs.h
index 27c456a432e8..c09856e55275 100644
--- a/sys/dev/e1000/e1000_regs.h
+++ b/sys/dev/e1000/e1000_regs.h
@@ -381,6 +381,7 @@
#define E1000_TSCTC 0x040F8 /* TCP Segmentation Context Tx - R/clr */
#define E1000_TSCTFC 0x040FC /* TCP Segmentation Context Tx Fail - R/clr */
#define E1000_IAC 0x04100 /* Interrupt Assertion Count */
+/* Interrupt Cause */
#define E1000_ICRXPTC 0x04104 /* Interrupt Cause Rx Pkt Timer Expire Count */
#define E1000_ICRXATC 0x04108 /* Interrupt Cause Rx Abs Timer Expire Count */
#define E1000_ICTXPTC 0x0410C /* Interrupt Cause Tx Pkt Timer Expire Count */
@@ -503,12 +504,14 @@
#define E1000_WUC 0x05800 /* Wakeup Control - RW */
#define E1000_WUFC 0x05808 /* Wakeup Filter Control - RW */
#define E1000_WUS 0x05810 /* Wakeup Status - RO */
+/* Management registers */
#define E1000_MANC 0x05820 /* Management Control - RW */
#define E1000_IPAV 0x05838 /* IP Address Valid - RW */
#define E1000_IP4AT 0x05840 /* IPv4 Address Table - RW Array */
#define E1000_IP6AT 0x05880 /* IPv6 Address Table - RW Array */
#define E1000_WUPL 0x05900 /* Wakeup Packet Length - RW */
#define E1000_WUPM 0x05A00 /* Wakeup Packet Memory - RO A */
+/* MSI-X Table Register Descriptions */
#define E1000_PBACL 0x05B68 /* MSIx PBA Clear - Read/Write 1's to clear */
#define E1000_FFLT 0x05F00 /* Flexible Filter Length Table - RW Array */
#define E1000_HOST_IF 0x08800 /* Host Interface */