[coreboot-gerrit] New patch to review for coreboot: b2fbf63 southbridge/intel/i82801dx: Remove a trailing whitespace

HAOUAS Elyes (ehaouas@noos.fr) gerrit at coreboot.org
Tue Jul 22 19:50:44 CEST 2014


HAOUAS Elyes (ehaouas at noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6340

-gerrit

commit b2fbf63e12a621976625230877286573a91e01e1
Author: Elyes HAOUAS <ehaouas at noos.fr>
Date:   Tue Jul 22 19:51:08 2014 +0200

    southbridge/intel/i82801dx: Remove a trailing whitespace
    
    Change-Id: Id0aedcbd72c31d96c0dd72acf1943a42b7a84c88
    Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
 src/southbridge/intel/i82801dx/ac97.c       |  32 ++++-----
 src/southbridge/intel/i82801dx/i82801dx.h   | 104 ++++++++++++++--------------
 src/southbridge/intel/i82801dx/smi.c        |  10 +--
 src/southbridge/intel/i82801dx/smihandler.c |  10 +--
 4 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/southbridge/intel/i82801dx/ac97.c b/src/southbridge/intel/i82801dx/ac97.c
index a9ec266..c7fb183 100644
--- a/src/southbridge/intel/i82801dx/ac97.c
+++ b/src/southbridge/intel/i82801dx/ac97.c
@@ -27,28 +27,28 @@
 #include "i82801dx.h"
 
 #define NAMBAR		0x10
-#define   MASTER_VOL	0x02
-#define   PAGING	0x24
-#define   EXT_AUDIO	0x28
-#define   FUNC_SEL	0x66
-#define   INFO_IO	0x68
-#define   CONNECTOR	0x6a
-#define   VENDOR_ID1	0x7c
-#define   VENDOR_ID2	0x7e
-#define   SEC_VENDOR_ID1 0xfc
-#define   SEC_VENDOR_ID2 0xfe
+#define MASTER_VOL	0x02
+#define PAGING	0x24
+#define EXT_AUDIO	0x28
+#define FUNC_SEL	0x66
+#define INFO_IO	0x68
+#define CONNECTOR	0x6a
+#define VENDOR_ID1	0x7c
+#define VENDOR_ID2	0x7e
+#define SEC_VENDOR_ID1 0xfc
+#define SEC_VENDOR_ID2 0xfe
 
 #define NABMBAR		0x14
-#define   GLOB_CNT	0x2c
-#define   GLOB_STA	0x30
-#define   CAS		0x34
+#define GLOB_CNT	0x2c
+#define GLOB_STA	0x30
+#define CAS		0x34
 
 #define MMBAR		0x10
-#define   EXT_MODEM_ID1	0x3c
-#define   EXT_MODEM_ID2	0xbc
+#define EXT_MODEM_ID1	0x3c
+#define EXT_MODEM_ID2	0xbc
 
 #define MBAR		0x14
-#define   SEC_CODEC	0x40
+#define SEC_CODEC	0x40
 
 
 /* FIXME. This table is probably mainboard specific */
diff --git a/src/southbridge/intel/i82801dx/i82801dx.h b/src/southbridge/intel/i82801dx/i82801dx.h
index c7d7e77..844104d 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.h
+++ b/src/southbridge/intel/i82801dx/i82801dx.h
@@ -79,14 +79,14 @@ int smbus_read_byte(unsigned device, unsigned address);
 
 #define PCICMD          0x04
 #define PMBASE          0x40
-#define   PMBASE_ADDR	0x0400
-#define   DEFAULT_PMBASE PMBASE_ADDR
+#define PMBASE_ADDR	0x0400
+#define DEFAULT_PMBASE PMBASE_ADDR
 #define ACPI_CNTL       0x44
-#define   ACPI_EN	(1 << 4)
+#define ACPI_EN	(1 << 4)
 #define BIOS_CNTL       0x4E
 #define GPIO_BASE       0x58
 #define GPIO_CNTL       0x5C
-#define   GPIOBASE_ADDR 0x0500
+#define GPIOBASE_ADDR 0x0500
 #define PIRQA_ROUT	0x60
 #define PIRQB_ROUT	0x61
 #define PIRQC_ROUT	0x62
@@ -136,26 +136,26 @@ int smbus_read_byte(unsigned device, unsigned address);
 #define SMBUS_TIMEOUT (100*1000)
 
 #define PM1_STS		0x00
-#define   WAK_STS	(1 << 15)
-#define   PCIEXPWAK_STS	(1 << 14)
-#define   PRBTNOR_STS	(1 << 11)
-#define   RTC_STS	(1 << 10)
-#define   PWRBTN_STS	(1 << 8)
-#define   GBL_STS	(1 << 5)
-#define   BM_STS	(1 << 4)
-#define   TMROF_STS	(1 << 0)
+#define WAK_STS	(1 << 15)
+#define PCIEXPWAK_STS	(1 << 14)
+#define PRBTNOR_STS	(1 << 11)
+#define RTC_STS	(1 << 10)
+#define PWRBTN_STS	(1 << 8)
+#define GBL_STS	(1 << 5)
+#define BM_STS	(1 << 4)
+#define TMROF_STS	(1 << 0)
 #define PM1_EN		0x02
-#define   PCIEXPWAK_DIS	(1 << 14)
-#define   RTC_EN	(1 << 10)
-#define   PWRBTN_EN	(1 << 8)
-#define   GBL_EN	(1 << 5)
-#define   TMROF_EN	(1 << 0)
+#define PCIEXPWAK_DIS	(1 << 14)
+#define RTC_EN	(1 << 10)
+#define PWRBTN_EN	(1 << 8)
+#define GBL_EN	(1 << 5)
+#define TMROF_EN	(1 << 0)
 #define PM1_CNT		0x04
-#define   SLP_EN	(1 << 13)
-#define   SLP_TYP	(7 << 10)
-#define   GBL_RLS	(1 << 2)
-#define   BM_RLD	(1 << 1)
-#define   SCI_EN	(1 << 0)
+#define SLP_EN	(1 << 13)
+#define SLP_TYP	(7 << 10)
+#define GBL_RLS	(1 << 2)
+#define BM_RLD	(1 << 1)
+#define SCI_EN	(1 << 0)
 #define PM1_TMR		0x08
 #define PROC_CNT	0x10
 #define LV2		0x14
@@ -163,38 +163,38 @@ int smbus_read_byte(unsigned device, unsigned address);
 #define LV4		0x16
 #define PM2_CNT		0x20 // mobile only
 #define GPE0_STS	0x28
-#define   PME_B0_STS	(1 << 13)
-#define   USB3_STS	(1 << 12)
-#define   PME_STS	(1 << 11)
-#define   BATLOW_STS	(1 << 10)
-#define   GST_STS	(1 << 9)
-#define   RI_STS	(1 << 8)
-#define   SMB_WAK_STS	(1 << 7)
-#define   TCOSCI_STS	(1 << 6)
-#define   AC97_STS	(1 << 5)
-#define   USB2_STS	(1 << 4)
-#define   USB1_STS	(1 << 3)
-#define   SWGPE_STS	(1 << 2)
-#define   HOT_PLUG_STS	(1 << 1)
-#define   THRM_STS	(1 << 0)
+#define PME_B0_STS	(1 << 13)
+#define USB3_STS	(1 << 12)
+#define PME_STS	(1 << 11)
+#define BATLOW_STS	(1 << 10)
+#define GST_STS	(1 << 9)
+#define RI_STS	(1 << 8)
+#define SMB_WAK_STS	(1 << 7)
+#define TCOSCI_STS	(1 << 6)
+#define AC97_STS	(1 << 5)
+#define USB2_STS	(1 << 4)
+#define USB1_STS	(1 << 3)
+#define SWGPE_STS	(1 << 2)
+#define HOT_PLUG_STS	(1 << 1)
+#define THRM_STS	(1 << 0)
 #define GPE0_EN		0x2c
-#define   PME_B0_EN	(1 << 13)
-#define   PME_EN	(1 << 11)
+#define PME_B0_EN	(1 << 13)
+#define PME_EN	(1 << 11)
 #define SMI_EN		0x30
-#define   EL_SMI_EN	 (1 << 25) // Intel Quick Resume Technology
-#define   INTEL_USB2_EN	 (1 << 18) // Intel-Specific USB2 SMI logic
-#define   LEGACY_USB2_EN (1 << 17) // Legacy USB2 SMI logic
-#define   PERIODIC_EN	 (1 << 14) // SMI on PERIODIC_STS in SMI_STS
-#define   TCO_EN	 (1 << 13) // Enable TCO Logic (BIOSWE et al)
-#define   MCSMI_EN	 (1 << 11) // Trap microcontroller range access
-#define   BIOS_RLS	 (1 <<  7) // asserts SCI on bit set
-#define   SWSMI_TMR_EN	 (1 <<  6) // start software smi timer on bit set
-#define   APMC_EN	 (1 <<  5) // Writes to APM_CNT cause SMI#
-#define   SLP_SMI_EN	 (1 <<  4) // Write to SLP_EN in PM1_CNT asserts SMI#
-#define   LEGACY_USB_EN  (1 <<  3) // Legacy USB circuit SMI logic
-#define   BIOS_EN	 (1 <<  2) // Assert SMI# on setting GBL_RLS bit
-#define   EOS		 (1 <<  1) // End of SMI (deassert SMI#)
-#define   GBL_SMI_EN	 (1 <<  0) // SMI# generation at all?
+#define EL_SMI_EN	 (1 << 25) // Intel Quick Resume Technology
+#define INTEL_USB2_EN	 (1 << 18) // Intel-Specific USB2 SMI logic
+#define LEGACY_USB2_EN (1 << 17) // Legacy USB2 SMI logic
+#define PERIODIC_EN	 (1 << 14) // SMI on PERIODIC_STS in SMI_STS
+#define TCO_EN	 (1 << 13) // Enable TCO Logic (BIOSWE et al)
+#define MCSMI_EN	 (1 << 11) // Trap microcontroller range access
+#define BIOS_RLS	 (1 <<  7) // asserts SCI on bit set
+#define SWSMI_TMR_EN	 (1 <<  6) // start software smi timer on bit set
+#define APMC_EN	 (1 <<  5) // Writes to APM_CNT cause SMI#
+#define SLP_SMI_EN	 (1 <<  4) // Write to SLP_EN in PM1_CNT asserts SMI#
+#define LEGACY_USB_EN  (1 <<  3) // Legacy USB circuit SMI logic
+#define BIOS_EN	 (1 <<  2) // Assert SMI# on setting GBL_RLS bit
+#define EOS		 (1 <<  1) // End of SMI (deassert SMI#)
+#define GBL_SMI_EN	 (1 <<  0) // SMI# generation at all?
 #define SMI_STS		0x34
 #define ALT_GP_SMI_EN	0x38
 #define ALT_GP_SMI_STS	0x3a
diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c
index d2e3e25..72a0eac 100644
--- a/src/southbridge/intel/i82801dx/smi.c
+++ b/src/southbridge/intel/i82801dx/smi.c
@@ -35,11 +35,11 @@ extern unsigned char _binary_smm_size;
 
 /* I945 */
 #define SMRAM		0x90
-#define   D_OPEN	(1 << 6)
-#define   D_CLS		(1 << 5)
-#define   D_LCK		(1 << 4)
-#define   G_SMRAME	(1 << 3)
-#define   C_BASE_SEG	((0 << 2) | (1 << 1) | (0 << 0))
+#define D_OPEN	(1 << 6)
+#define D_CLS		(1 << 5)
+#define D_LCK		(1 << 4)
+#define G_SMRAME	(1 << 3)
+#define C_BASE_SEG	((0 << 2) | (1 << 1) | (0 << 0))
 
 /* While we read PMBASE dynamically in case it changed, let's
  * initialize it with a sane value
diff --git a/src/southbridge/intel/i82801dx/smihandler.c b/src/southbridge/intel/i82801dx/smihandler.c
index 9b0c235..ac05816 100644
--- a/src/southbridge/intel/i82801dx/smihandler.c
+++ b/src/southbridge/intel/i82801dx/smihandler.c
@@ -31,11 +31,11 @@
 
 /* I830M */
 #define SMRAM		0x90
-#define   D_OPEN	(1 << 6)
-#define   D_CLS		(1 << 5)
-#define   D_LCK		(1 << 4)
-#define   G_SMRANE	(1 << 3)
-#define   C_BASE_SEG	((0 << 2) | (1 << 1) | (0 << 0))
+#define D_OPEN	(1 << 6)
+#define D_CLS		(1 << 5)
+#define D_LCK		(1 << 4)
+#define G_SMRANE	(1 << 3)
+#define C_BASE_SEG	((0 << 2) | (1 << 1) | (0 << 0))
 
 #include "nvs.h"
 



More information about the coreboot-gerrit mailing list