Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33945
Change subject: util/inteltool: Make internal functions static ......................................................................
util/inteltool: Make internal functions static
None of these functions are used outside of the files they are defined in, so they can all be static.
Change-Id: Ie00fef5a5ba2779e0ff45640cff5cc9f1d096dc1 Signed-off-by: Jacob Garber jgarber1@ualberta.ca --- M util/inteltool/cpu.c M util/inteltool/inteltool.c M util/inteltool/spi.c 3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/33945/1
diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c index 04870fc..d2c8ede 100644 --- a/util/inteltool/cpu.c +++ b/util/inteltool/cpu.c @@ -78,7 +78,7 @@ #ifndef __DARWIN__ int msr_readerror = 0;
-msr_t rdmsr(int addr) +static msr_t rdmsr(int addr) { uint32_t buf[2]; msr_t msr = { 0xffffffff, 0xffffffff }; @@ -132,7 +132,7 @@ return 0; }
-msr_t rdmsr_from_cpu(int cpu, unsigned long addr) +static msr_t rdmsr_from_cpu(int cpu, unsigned long addr) { int fd; msr_t msr = { 0xffffffff, 0xffffffff }; @@ -155,12 +155,12 @@ return msr; }
-int get_number_of_cpus(void) +static int get_number_of_cpus(void) { return sysconf(_SC_NPROCESSORS_ONLN); }
-int is_sgx_supported(int cpunum) +static int is_sgx_supported(int cpunum) { cpuid_result_t cpuid_regs; msr_t msr; @@ -172,14 +172,14 @@ return ((cpuid_regs.ebx & SGX_SUPPORTED) && (msr.lo & PRMRR_SUPPORTED)); }
-int is_sgx_enabled(int cpunum) +static int is_sgx_enabled(int cpunum) { msr_t data; data = rdmsr_from_cpu(cpunum, IA32_FEATURE_CONTROL); return (data.lo & SGX_GLOBAL_ENABLED); }
-int is_sgx_locked(int cpunum) +static int is_sgx_locked(int cpunum) { msr_t data; data = rdmsr_from_cpu(cpunum, IA32_FEATURE_CONTROL); diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 7e02510..76b1abe 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -443,7 +443,7 @@ } #endif
-void print_version(void) +static void print_version(void) { printf("inteltool v%s -- ", INTELTOOL_VERSION); printf("Copyright (C) 2008 coresystems GmbH\n\n"); @@ -457,7 +457,7 @@ "GNU General Public License for more details.\n\n"); }
-void print_usage(const char *name) +static void print_usage(const char *name) { printf("usage: %s [-vh?gGrpmedPMaAsfSRx]\n", name); printf("\n" diff --git a/util/inteltool/spi.c b/util/inteltool/spi.c index da5533d..22ba3d4 100644 --- a/util/inteltool/spi.c +++ b/util/inteltool/spi.c @@ -79,7 +79,7 @@ { 0x68, 4, "PBR2 Protected BIOS Range 2" }, };
-int print_bioscntl(struct pci_dev *sb) +static int print_bioscntl(struct pci_dev *sb) { int i, size = 0; unsigned char bios_cntl = 0xff; @@ -207,7 +207,7 @@ return 0; }
-int print_spibar(struct pci_dev *sb) { +static int print_spibar(struct pci_dev *sb) { int i, size = 0, rcba_size = 0x4000; volatile uint8_t *rcba; uint32_t rcba_phys;
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33945 )
Change subject: util/inteltool: Make internal functions static ......................................................................
Patch Set 1: Code-Review+2
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33945 )
Change subject: util/inteltool: Make internal functions static ......................................................................
util/inteltool: Make internal functions static
None of these functions are used outside of the files they are defined in, so they can all be static.
Change-Id: Ie00fef5a5ba2779e0ff45640cff5cc9f1d096dc1 Signed-off-by: Jacob Garber jgarber1@ualberta.ca Reviewed-on: https://review.coreboot.org/c/coreboot/+/33945 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr --- M util/inteltool/cpu.c M util/inteltool/inteltool.c M util/inteltool/spi.c 3 files changed, 10 insertions(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved
diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c index ef2df3c..ff69b8c 100644 --- a/util/inteltool/cpu.c +++ b/util/inteltool/cpu.c @@ -78,7 +78,7 @@ #ifndef __DARWIN__ int msr_readerror = 0;
-msr_t rdmsr(int addr) +static msr_t rdmsr(int addr) { uint32_t buf[2]; msr_t msr = { 0xffffffff, 0xffffffff }; @@ -132,7 +132,7 @@ return 0; }
-msr_t rdmsr_from_cpu(int cpu, unsigned long addr) +static msr_t rdmsr_from_cpu(int cpu, unsigned long addr) { int fd; msr_t msr = { 0xffffffff, 0xffffffff }; @@ -155,12 +155,12 @@ return msr; }
-int get_number_of_cpus(void) +static int get_number_of_cpus(void) { return sysconf(_SC_NPROCESSORS_ONLN); }
-int is_sgx_supported(int cpunum) +static int is_sgx_supported(int cpunum) { cpuid_result_t cpuid_regs; msr_t msr; @@ -172,14 +172,14 @@ return ((cpuid_regs.ebx & SGX_SUPPORTED) && (msr.lo & PRMRR_SUPPORTED)); }
-int is_sgx_enabled(int cpunum) +static int is_sgx_enabled(int cpunum) { msr_t data; data = rdmsr_from_cpu(cpunum, IA32_FEATURE_CONTROL); return (data.lo & SGX_GLOBAL_ENABLED); }
-int is_sgx_locked(int cpunum) +static int is_sgx_locked(int cpunum) { msr_t data; data = rdmsr_from_cpu(cpunum, IA32_FEATURE_CONTROL); diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 7e02510..76b1abe 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -443,7 +443,7 @@ } #endif
-void print_version(void) +static void print_version(void) { printf("inteltool v%s -- ", INTELTOOL_VERSION); printf("Copyright (C) 2008 coresystems GmbH\n\n"); @@ -457,7 +457,7 @@ "GNU General Public License for more details.\n\n"); }
-void print_usage(const char *name) +static void print_usage(const char *name) { printf("usage: %s [-vh?gGrpmedPMaAsfSRx]\n", name); printf("\n" diff --git a/util/inteltool/spi.c b/util/inteltool/spi.c index da5533d..22ba3d4 100644 --- a/util/inteltool/spi.c +++ b/util/inteltool/spi.c @@ -79,7 +79,7 @@ { 0x68, 4, "PBR2 Protected BIOS Range 2" }, };
-int print_bioscntl(struct pci_dev *sb) +static int print_bioscntl(struct pci_dev *sb) { int i, size = 0; unsigned char bios_cntl = 0xff; @@ -207,7 +207,7 @@ return 0; }
-int print_spibar(struct pci_dev *sb) { +static int print_spibar(struct pci_dev *sb) { int i, size = 0, rcba_size = 0x4000; volatile uint8_t *rcba; uint32_t rcba_phys;