Author: stepan Date: Fri Apr 9 15:35:03 2010 New Revision: 5394 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5394
Log: zero warnings days. Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/src/northbridge/amd/amdfam10/northbridge.h trunk/src/northbridge/amd/amdht/h3ncmn.c trunk/src/northbridge/amd/amdmct/mct/mctdqs_d.c trunk/src/northbridge/amd/amdmct/mct/mctsrc1p.c trunk/src/southbridge/amd/amd8111/amd8111_early_ctrl.c trunk/src/southbridge/amd/sb700/sb700_reset.c
Modified: trunk/src/northbridge/amd/amdfam10/northbridge.h ============================================================================== --- trunk/src/northbridge/amd/amdfam10/northbridge.h Fri Apr 9 15:33:59 2010 (r5393) +++ trunk/src/northbridge/amd/amdfam10/northbridge.h Fri Apr 9 15:35:03 2010 (r5394) @@ -20,6 +20,6 @@ #ifndef NORTHBRIDGE_AMD_AMDFAM10_H #define NORTHBRIDGE_AMD_AMDFAM10_H
-extern u32 amdfam10_scan_root_bus(device_t root, u32 max); +u32 amdfam10_scan_root_bus(device_t root, u32 max);
#endif /* NORTHBRIDGE_AMD_AMDFAM10_H */
Modified: trunk/src/northbridge/amd/amdht/h3ncmn.c ============================================================================== --- trunk/src/northbridge/amd/amdht/h3ncmn.c Fri Apr 9 15:33:59 2010 (r5393) +++ trunk/src/northbridge/amd/amdht/h3ncmn.c Fri Apr 9 15:35:03 2010 (r5394) @@ -166,7 +166,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * writeRoutingTable(u8 node, u8 target, u8 Link, cNorthBridge *nb) * * Description: @@ -188,7 +188,7 @@ * --------------------------------------------------------------------------------------- */
-void writeRoutingTable(u8 node, u8 target, u8 link, cNorthBridge *nb) +static void writeRoutingTable(u8 node, u8 target, u8 link, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY u32 temp = (nb->selfRouteResponseMask | nb->selfRouteRequestMask) << (link + 1); @@ -206,7 +206,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * writeNodeID(u8 node, u8 nodeID, cNorthBridge *nb) * * Description: @@ -220,7 +220,7 @@ * --------------------------------------------------------------------------------------- */
-void writeNodeID(u8 node, u8 nodeID, cNorthBridge *nb) +static void writeNodeID(u8 node, u8 nodeID, cNorthBridge *nb) { u32 temp = nodeID; ASSERT((node < nb->maxNodes) && (nodeID < nb->maxNodes)); @@ -234,7 +234,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * readDefLnk(u8 node, cNorthBridge *nb) * * Description: @@ -252,7 +252,7 @@ * --------------------------------------------------------------------------------------- */
-u8 readDefLnk(u8 node, cNorthBridge *nb) +static u8 readDefLnk(u8 node, cNorthBridge *nb) { u32 deflink = 0; SBDFO licr; @@ -273,7 +273,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * enableRoutingTables(u8 node, cNorthBridge *nb) * * Description: @@ -286,7 +286,7 @@ * --------------------------------------------------------------------------------------- */
-void enableRoutingTables(u8 node, cNorthBridge *nb) +static void enableRoutingTables(u8 node, cNorthBridge *nb) { u32 temp = 0; ASSERT((node < nb->maxNodes)); @@ -301,7 +301,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static BOOL * verifyLinkIsCoherent(u8 node, u8 Link, cNorthBridge *nbk) * * Description: @@ -322,7 +322,7 @@ * --------------------------------------------------------------------------------------- */
-BOOL verifyLinkIsCoherent(u8 node, u8 link, cNorthBridge *nb) +static BOOL verifyLinkIsCoherent(u8 node, u8 link, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY
@@ -345,7 +345,7 @@
/**---------------------------------------------------------------------------------------- * - * bool + * static bool * readTrueLinkFailStatus(u8 node, u8 link, sMainData *pDat, cNorthBridge *nb) * * Description: @@ -371,7 +371,7 @@ * * --------------------------------------------------------------------------------------- */ -BOOL readTrueLinkFailStatus(u8 node, u8 link, sMainData *pDat, cNorthBridge *nb) +static BOOL readTrueLinkFailStatus(u8 node, u8 link, sMainData *pDat, cNorthBridge *nb) { u32 before, after, unconnected, crc; SBDFO linkBase; @@ -436,7 +436,7 @@
/**---------------------------------------------------------------------------------------- * - * u8 + * static u8 * readToken(u8 node, cNorthBridge *nb) * * Description: @@ -452,7 +452,7 @@ * * --------------------------------------------------------------------------------------- */ -u8 readToken(u8 node, cNorthBridge *nb) +static u8 readToken(u8 node, cNorthBridge *nb) { u32 temp;
@@ -472,7 +472,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * writeToken(u8 node, u8 Value, cNorthBridge *nb) * * Description: @@ -488,7 +488,7 @@ * * --------------------------------------------------------------------------------------- */ -void writeToken(u8 node, u8 value, cNorthBridge *nb) +static void writeToken(u8 node, u8 value, cNorthBridge *nb) { u32 temp = value; ASSERT((node < nb->maxNodes)); @@ -504,7 +504,7 @@
/**---------------------------------------------------------------------------------------- * - * u8 + * static u8 * fam0FGetNumCoresOnNode(u8 node, cNorthBridge *nb) * * Description: @@ -517,7 +517,7 @@ * * --------------------------------------------------------------------------------------- */ -u8 fam0FGetNumCoresOnNode(u8 node, cNorthBridge *nb) +static u8 fam0FGetNumCoresOnNode(u8 node, cNorthBridge *nb) { u32 temp;
@@ -536,7 +536,7 @@
/**---------------------------------------------------------------------------------------- * - * u8 + * static u8 * fam10GetNumCoresOnNode(u8 node, cNorthBridge *nb) * * Description: @@ -549,7 +549,7 @@ * * --------------------------------------------------------------------------------------- */ -u8 fam10GetNumCoresOnNode(u8 node, cNorthBridge *nb) +static u8 fam10GetNumCoresOnNode(u8 node, cNorthBridge *nb) { u32 temp, leveling, cores; u8 i; @@ -583,7 +583,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * setTotalNodesAndCores(u8 node, u8 totalNodes, u8 totalCores, cNorthBridge *nb) * * Description: @@ -597,7 +597,7 @@ * * --------------------------------------------------------------------------------------- */ -void setTotalNodesAndCores(u8 node, u8 totalNodes, u8 totalCores, cNorthBridge *nb) +static void setTotalNodesAndCores(u8 node, u8 totalNodes, u8 totalCores, cNorthBridge *nb) { SBDFO nodeIDReg; u32 temp; @@ -621,7 +621,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * limitNodes(u8 node, cNorthBridge *nb) * * Description: @@ -633,7 +633,7 @@ * * --------------------------------------------------------------------------------------- */ -void limitNodes(u8 node, cNorthBridge *nb) +static void limitNodes(u8 node, cNorthBridge *nb) { u32 temp = 1; ASSERT((node < nb->maxNodes)); @@ -647,7 +647,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * writeFullRoutingTable(u8 node, u8 target, u8 reqLink, u8 rspLink, u32 BClinks, cNorthBridge *nb) * * Description: @@ -664,7 +664,7 @@ * * --------------------------------------------------------------------------------------- */ -void writeFullRoutingTable(u8 node, u8 target, u8 reqLink, u8 rspLink, u32 bClinks, cNorthBridge *nb) +static void writeFullRoutingTable(u8 node, u8 target, u8 reqLink, u8 rspLink, u32 bClinks, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY u32 value = 0; @@ -732,7 +732,7 @@
/**---------------------------------------------------------------------------------------- * - * BOOL + * static BOOL * isCompatible(u8 currentNode, cNorthBridge *nb) * * Description: @@ -747,14 +747,14 @@ * * --------------------------------------------------------------------------------------- */ -BOOL isCompatible(u8 node, cNorthBridge *nb) +static BOOL isCompatible(u8 node, cNorthBridge *nb) { return (makeKey(node) == nb->compatibleKey); }
/**---------------------------------------------------------------------------------------- * - * BOOL + * static BOOL * fam0fIsCapable(u8 node, sMainData *pDat, cNorthBridge *nb) * * Description: @@ -770,7 +770,7 @@ * * --------------------------------------------------------------------------------------- */ -BOOL fam0fIsCapable(u8 node, sMainData *pDat, cNorthBridge *nb) +static BOOL fam0fIsCapable(u8 node, sMainData *pDat, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY u32 temp; @@ -808,7 +808,7 @@
/**---------------------------------------------------------------------------------------- * - * BOOL + * static BOOL * fam10IsCapable(u8 node, sMainData *pDat, cNorthBridge *nb) * * Description: @@ -824,7 +824,7 @@ * * --------------------------------------------------------------------------------------- */ -BOOL fam10IsCapable(u8 node, sMainData *pDat, cNorthBridge *nb) +static BOOL fam10IsCapable(u8 node, sMainData *pDat, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY u32 temp; @@ -861,7 +861,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * fam0fStopLink(u8 currentNode, u8 currentLink, cNorthBridge *nb) * * Description: @@ -874,7 +874,7 @@ * * --------------------------------------------------------------------------------------- */ -void fam0fStopLink(u8 node, u8 link, cNorthBridge *nb) +static void fam0fStopLink(u8 node, u8 link, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY u32 temp; @@ -892,7 +892,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * commonVoid() * * Description: @@ -903,13 +903,13 @@ * * --------------------------------------------------------------------------------------- */ -void commonVoid() +static void commonVoid(void) { }
/**---------------------------------------------------------------------------------------- * - * BOOL + * static BOOL * commonReturnFalse() * * Description: @@ -919,7 +919,7 @@ * @param[out] BOOL result = false * --------------------------------------------------------------------------------------- */ -BOOL commonReturnFalse() +static BOOL commonReturnFalse(void) { return 0; } @@ -931,7 +931,7 @@
/**---------------------------------------------------------------------------------------- * - * u8 + * static u8 * readSbLink(cNorthBridge *nb) * * Description: @@ -943,7 +943,7 @@ * * --------------------------------------------------------------------------------------- */ -u8 readSbLink(cNorthBridge *nb) +static u8 readSbLink(cNorthBridge *nb) { u32 temp; AmdPCIReadBits(MAKE_SBDFO(makePCISegmentFromNode(0), @@ -957,7 +957,7 @@
/**---------------------------------------------------------------------------------------- * - * BOOL + * static BOOL * verifyLinkIsNonCoherent(u8 node, u8 link, cNorthBridge *nb) * * Description: @@ -977,7 +977,7 @@ * * --------------------------------------------------------------------------------------- */ -BOOL verifyLinkIsNonCoherent(u8 node, u8 link, cNorthBridge *nb) +static BOOL verifyLinkIsNonCoherent(u8 node, u8 link, cNorthBridge *nb) { u32 linkType; SBDFO linkBase; @@ -995,7 +995,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * ht3SetCFGAddrMap(u8 cfgMapIndex, u8 secBus, u8 subBus, u8 targetNode, u8 targetLink, sMainData *pDat, cNorthBridge *nb) * * Description: @@ -1012,7 +1012,7 @@ * * --------------------------------------------------------------------------------------- */ -void ht3SetCFGAddrMap(u8 cfgMapIndex, u8 secBus, u8 subBus, u8 targetNode, u8 targetLink, sMainData *pDat, cNorthBridge *nb) +static void ht3SetCFGAddrMap(u8 cfgMapIndex, u8 secBus, u8 subBus, u8 targetNode, u8 targetLink, sMainData *pDat, cNorthBridge *nb) { u8 curNode; SBDFO linkBase; @@ -1094,7 +1094,7 @@
/**---------------------------------------------------------------------------------------- * - * u8 + * static u8 * convertBitsToWidth(u8 value, cNorthBridge *nb) * * Description: @@ -1107,7 +1107,7 @@ * * --------------------------------------------------------------------------------------- */ -u8 convertBitsToWidth(u8 value, cNorthBridge *nb) +static u8 convertBitsToWidth(u8 value, cNorthBridge *nb) { switch(value) { case 1: return 16; @@ -1121,7 +1121,7 @@
/**---------------------------------------------------------------------------------------- * - * u8 + * static u8 * convertWidthToBits(u8 value, cNorthBridge *nb) * * Description: @@ -1134,7 +1134,7 @@ * * --------------------------------------------------------------------------------------- */ -u8 convertWidthToBits(u8 value, cNorthBridge *nb) +static u8 convertWidthToBits(u8 value, cNorthBridge *nb) { switch (value) { case 16: return 1; @@ -1148,7 +1148,7 @@
/**---------------------------------------------------------------------------------------- * - * u16 + * static u16 * ht1NorthBridgeFreqMask(u8 NodeID, cNorthBridge *nb) * * Description: @@ -1162,7 +1162,7 @@ * * --------------------------------------------------------------------------------------- */ -u16 ht1NorthBridgeFreqMask(u8 node, cNorthBridge *nb) +static u16 ht1NorthBridgeFreqMask(u8 node, cNorthBridge *nb) { /* only up to HT1 speeds */ return (HT_FREQUENCY_LIMIT_HT1_ONLY); @@ -1170,7 +1170,7 @@
/**---------------------------------------------------------------------------------------- * - * u16 + * static u16 * fam10NorthBridgeFreqMask(u8 NodeID, cNorthBridge *nb) * * Description: @@ -1184,7 +1184,7 @@ * * --------------------------------------------------------------------------------------- */ -u16 fam10NorthBridgeFreqMask(u8 node, cNorthBridge *nb) +static u16 fam10NorthBridgeFreqMask(u8 node, cNorthBridge *nb) { u8 nbCOF; u16 supported; @@ -1225,7 +1225,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * gatherLinkData(sMainData *pDat, cNorthBridge *nb) * * Description: @@ -1238,7 +1238,7 @@ * * --------------------------------------------------------------------------------------- */ -void gatherLinkData(sMainData *pDat, cNorthBridge *nb) +static void gatherLinkData(sMainData *pDat, cNorthBridge *nb) { u8 i; SBDFO linkBase; @@ -1301,7 +1301,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * setLinkData(sMainData *pDat, cNorthBridge *nb) * * Description: @@ -1314,7 +1314,7 @@ * * --------------------------------------------------------------------------------------- */ -void setLinkData(sMainData *pDat, cNorthBridge *nb) +static void setLinkData(sMainData *pDat, cNorthBridge *nb) { u8 i; SBDFO linkBase; @@ -1614,7 +1614,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * ht3WriteTrafficDistribution(u32 links01, u32 links10, cNorthBridge *nb) * * Description: @@ -1627,7 +1627,7 @@ * * --------------------------------------------------------------------------------------- */ -void ht3WriteTrafficDistribution(u32 links01, u32 links10, cNorthBridge *nb) +static void ht3WriteTrafficDistribution(u32 links01, u32 links10, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY u32 temp; @@ -1670,7 +1670,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * ht1WriteTrafficDistribution(u32 links01, u32 links10, cNorthBridge *nb) * * Description: @@ -1685,7 +1685,7 @@ * * --------------------------------------------------------------------------------------- */ -void ht1WriteTrafficDistribution(u32 links01, u32 links10, cNorthBridge *nb) +static void ht1WriteTrafficDistribution(u32 links01, u32 links10, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY u32 route01, route10; @@ -1779,7 +1779,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * fam0fBufferOptimizations(u8 node, sMainData *pDat, cNorthBridge *nb) * * Description: @@ -1793,7 +1793,7 @@ * * --------------------------------------------------------------------------------------- */ -void fam0fBufferOptimizations(u8 node, sMainData *pDat, cNorthBridge *nb) +static void fam0fBufferOptimizations(u8 node, sMainData *pDat, cNorthBridge *nb) { #ifndef HT_BUILD_NC_ONLY u8 i; @@ -1976,7 +1976,7 @@
/**---------------------------------------------------------------------------------------- * - * void + * static void * fam10BufferOptimizations(u8 node, sMainData *pDat, cNorthBridge *nb) * * Description: @@ -1990,7 +1990,7 @@ * * --------------------------------------------------------------------------------------- */ -void fam10BufferOptimizations(u8 node, sMainData *pDat, cNorthBridge *nb) +static void fam10BufferOptimizations(u8 node, sMainData *pDat, cNorthBridge *nb) { u32 temp; SBDFO currentPtr;
Modified: trunk/src/northbridge/amd/amdmct/mct/mctdqs_d.c ============================================================================== --- trunk/src/northbridge/amd/amdmct/mct/mctdqs_d.c Fri Apr 9 15:33:59 2010 (r5393) +++ trunk/src/northbridge/amd/amdmct/mct/mctdqs_d.c Fri Apr 9 15:35:03 2010 (r5394) @@ -1183,7 +1183,7 @@ }
-void mct_Write1LTestPattern_D(struct MCTStatStruc *pMCTstat, +static void mct_Write1LTestPattern_D(struct MCTStatStruc *pMCTstat, struct DCTStatStruc *pDCTstat, u32 TestAddr, u8 pattern) {
Modified: trunk/src/northbridge/amd/amdmct/mct/mctsrc1p.c ============================================================================== --- trunk/src/northbridge/amd/amdmct/mct/mctsrc1p.c Fri Apr 9 15:33:59 2010 (r5393) +++ trunk/src/northbridge/amd/amdmct/mct/mctsrc1p.c Fri Apr 9 15:35:03 2010 (r5394) @@ -44,7 +44,7 @@ return 0; }
-u8 mct_Average_RcvrEnDly_1Pass(struct DCTStatStruc *pDCTstat, u8 Channel, u8 Receiver, +static u8 mct_Average_RcvrEnDly_1Pass(struct DCTStatStruc *pDCTstat, u8 Channel, u8 Receiver, u8 Pass) { u8 i, MaxValue; @@ -72,7 +72,7 @@
-u8 mct_AdjustFinalDQSRcvValue_1Pass(u8 val_1p, u8 val_2p) +static u8 mct_AdjustFinalDQSRcvValue_1Pass(u8 val_1p, u8 val_2p) { return (val_1p & 0xff) + ((val_2p & 0xff)<<8); }
Modified: trunk/src/southbridge/amd/amd8111/amd8111_early_ctrl.c ============================================================================== --- trunk/src/southbridge/amd/amd8111/amd8111_early_ctrl.c Fri Apr 9 15:33:59 2010 (r5393) +++ trunk/src/southbridge/amd/amd8111/amd8111_early_ctrl.c Fri Apr 9 15:35:03 2010 (r5394) @@ -1,3 +1,5 @@ +#include <reset.h> + /* by yhlu 2005.10 */ static unsigned get_sbdn(unsigned bus) {
Modified: trunk/src/southbridge/amd/sb700/sb700_reset.c ============================================================================== --- trunk/src/southbridge/amd/sb700/sb700_reset.c Fri Apr 9 15:33:59 2010 (r5393) +++ trunk/src/southbridge/amd/sb700/sb700_reset.c Fri Apr 9 15:35:03 2010 (r5394) @@ -17,38 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+#include <reset.h> #include <arch/io.h> - -#define PCI_DEV(BUS, DEV, FN) ( \ - (((BUS) & 0xFFF) << 20) | \ - (((DEV) & 0x1F) << 15) | \ - (((FN) & 0x7) << 12)) - -typedef u32 device_t; - -static void pci_write_config8(device_t dev, unsigned where, unsigned char value) -{ - unsigned addr; - addr = (dev>>4) | where; - outl(0x80000000 | (addr & ~3), 0xCF8); - outb(value, 0xCFC + (addr & 3)); -} - -static void pci_write_config32(device_t dev, unsigned where, unsigned value) -{ - unsigned addr; - addr = (dev>>4) | where; - outl(0x80000000 | (addr & ~3), 0xCF8); - outl(value, 0xCFC); -} - -static unsigned pci_read_config32(device_t dev, unsigned where) -{ - unsigned addr; - addr = (dev>>4) | where; - outl(0x80000000 | (addr & ~3), 0xCF8); - return inl(0xCFC); -} +#include <arch/romcc_io.h>
#include "../../../northbridge/amd/amdk8/reset_test.c"