Mark all global variables static for mptable(1).

While there, remove basetableEntryTypes, which became unused in r71209.
This commit is contained in:
Ed Schouten 2011-11-06 16:47:50 +00:00
parent 4c46bfb6dc
commit 60bd06dafc
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=227224

View File

@ -96,7 +96,7 @@ typedef struct BUSTYPENAME {
char name[ 7 ];
} busTypeName;
static busTypeName busTypeTable[] =
static const busTypeName busTypeTable[] =
{
{ CBUS, "CBUS" },
{ CBUSII, "CBUSII" },
@ -119,7 +119,7 @@ static busTypeName busTypeTable[] =
{ UNKNOWN_BUSTYPE, "---" }
};
const char* whereStrings[] = {
static const char *whereStrings[] = {
"Extended BIOS Data Area",
"BIOS top of memory",
"Default top of memory",
@ -135,16 +135,7 @@ typedef struct TABLE_ENTRY {
char name[ 32 ];
} tableEntry;
tableEntry basetableEntryTypes[] =
{
{ 0, 20, "Processor" },
{ 1, 8, "Bus" },
{ 2, 8, "I/O APIC" },
{ 3, 8, "I/O INT" },
{ 4, 8, "Local INT" }
};
tableEntry extendedtableEntryTypes[] =
static const tableEntry extendedtableEntryTypes[] =
{
{ 128, 20, "System Address Space" },
{ 129, 8, "Bus Hierarchy" },
@ -277,19 +268,19 @@ static void doDmesg( void );
static void pnstr( char* s, int c );
/* global data */
int pfd; /* physical /dev/mem fd */
static int pfd; /* physical /dev/mem fd */
int busses[ 16 ];
int apics[ 16 ];
static int busses[16];
static int apics[16];
int ncpu;
int nbus;
int napic;
int nintr;
static int ncpu;
static int nbus;
static int napic;
static int nintr;
int dmesg;
int grope;
int verbose;
static int dmesg;
static int grope;
static int verbose;
static void
usage( void )
@ -978,14 +969,14 @@ ioApicEntry( void )
}
const char* intTypes[] = {
static const char *intTypes[] = {
"INT", "NMI", "SMI", "ExtINT"
};
const char* polarityMode[] = {
static const char *polarityMode[] = {
"conforms", "active-hi", "reserved", "active-lo"
};
const char* triggerMode[] = {
static const char *triggerMode[] = {
"conforms", "edge", "reserved", "level"
};