openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

tree: Make internal variables static

Browse Source 
All these variables are only used in the files they are defined in, so
they can be made static.

(Backported as it untangles aliased global objects.)

Change-Id: I1e55138adef540e9d3a2237aa5b289cb338c0608
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33747
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/62612
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Jacob Garber 2019-06-24 16:05:28 -06:00 committed by Nico Huber
parent 9d7d8006e2
commit 8c3de01548
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dediprog.c
View File

@ -43,7 +43,7 @@
#define REQTYPE_OTHER_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_OTHER) /* 0xC3 */ #define REQTYPE_OTHER_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_OTHER) /* 0xC3 */
#define REQTYPE_EP_OUT (LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0x42 */ #define REQTYPE_EP_OUT (LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0x42 */
#define REQTYPE_EP_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0xC2 */ #define REQTYPE_EP_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0xC2 */
struct libusb_context *usb_ctx; static struct libusb_context *usb_ctx;
static libusb_device_handle *dediprog_handle; static libusb_device_handle *dediprog_handle;
static int dediprog_in_endpoint; static int dediprog_in_endpoint;
static int dediprog_out_endpoint; static int dediprog_out_endpoint;
@ -159,7 +159,7 @@ const struct dev_entry devs_dediprog[] = {
}; };
static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0);
enum dediprog_devtype dediprog_devicetype = DEV_UNKNOWN; static enum dediprog_devtype dediprog_devicetype = DEV_UNKNOWN;
#if defined(LIBUSB_MAJOR) && defined(LIBUSB_MINOR) && defined(LIBUSB_MICRO) && \ #if defined(LIBUSB_MAJOR) && defined(LIBUSB_MINOR) && defined(LIBUSB_MICRO) && \
LIBUSB_MAJOR <= 1 && LIBUSB_MINOR == 0 && LIBUSB_MICRO < 9 LIBUSB_MAJOR <= 1 && LIBUSB_MINOR == 0 && LIBUSB_MICRO < 9

2
developerbox_spi.c
View File

@ -60,7 +60,7 @@ const struct dev_entry devs_developerbox_spi[] = {
{0}, {0},
}; };
struct libusb_context *usb_ctx; static struct libusb_context *usb_ctx;
static libusb_device_handle *cp210x_handle; static libusb_device_handle *cp210x_handle;
static int cp210x_gpio_get(void) static int cp210x_gpio_get(void)

10
dummyflasher.c
View File

@ -55,10 +55,10 @@ static unsigned int emu_jedec_be_52_size = 0;
static unsigned int emu_jedec_be_d8_size = 0; static unsigned int emu_jedec_be_d8_size = 0;
static unsigned int emu_jedec_ce_60_size = 0; static unsigned int emu_jedec_ce_60_size = 0;
static unsigned int emu_jedec_ce_c7_size = 0; static unsigned int emu_jedec_ce_c7_size = 0;
unsigned char spi_blacklist[256]; static unsigned char spi_blacklist[256];
unsigned char spi_ignorelist[256]; static unsigned char spi_ignorelist[256];
int spi_blacklist_size = 0; static int spi_blacklist_size = 0;
int spi_ignorelist_size = 0; static int spi_ignorelist_size = 0;
static uint8_t emu_status = 0; static uint8_t emu_status = 0;
/* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */ /* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */
@ -128,7 +128,7 @@ static const struct par_master par_master_dummy = {
.chip_writen = dummy_chip_writen, .chip_writen = dummy_chip_writen,
}; };
enum chipbustype dummy_buses_supported = BUS_NONE; static enum chipbustype dummy_buses_supported = BUS_NONE;
static int dummy_shutdown(void *data) static int dummy_shutdown(void *data)
{ {

2
gfxnvidia.c
View File

@ -28,7 +28,7 @@
#define GFXNVIDIA_MEMMAP_MASK ((1 << 17) - 1) #define GFXNVIDIA_MEMMAP_MASK ((1 << 17) - 1)
#define GFXNVIDIA_MEMMAP_SIZE (16 * 1024 * 1024) #define GFXNVIDIA_MEMMAP_SIZE (16 * 1024 * 1024)
uint8_t *nvidia_bar; static uint8_t *nvidia_bar;
const struct dev_entry gfx_nvidia[] = { const struct dev_entry gfx_nvidia[] = {
{0x10de, 0x0010, NT, "NVIDIA", "Mutara V08 [NV2]" }, {0x10de, 0x0010, NT, "NVIDIA", "Mutara V08 [NV2]" },

4
it85spi.c
View File

@ -74,9 +74,9 @@
#endif /* LPC_IO */ #endif /* LPC_IO */
#ifdef LPC_IO #ifdef LPC_IO
unsigned int shm_io_base; static unsigned int shm_io_base;
#endif #endif
unsigned char *ce_high, *ce_low; static unsigned char *ce_high, *ce_low;
static int it85xx_scratch_rom_reenter = 0; static int it85xx_scratch_rom_reenter = 0;
/* This function will poll the keyboard status register until either /* This function will poll the keyboard status register until either

2
layout.c
View File

@ -23,7 +23,7 @@
#include "programmer.h" #include "programmer.h"
#include "layout.h" #include "layout.h"
struct romentry entries[MAX_ROMLAYOUT]; static struct romentry entries[MAX_ROMLAYOUT];
static struct flashrom_layout layout = { entries, 0 }; static struct flashrom_layout layout = { entries, 0 };
/* include_args holds the arguments specified at the command line with -i. They must be processed at some point /* include_args holds the arguments specified at the command line with -i. They must be processed at some point

2
mcp6x_spi.c
View File

@ -36,7 +36,7 @@
#define MCP6X_SPI_REQUEST 0 #define MCP6X_SPI_REQUEST 0
#define MCP6X_SPI_GRANT 8 #define MCP6X_SPI_GRANT 8
void *mcp6x_spibar = NULL; static void *mcp6x_spibar = NULL;
/* Cached value of last GPIO state. */ /* Cached value of last GPIO state. */
static uint8_t mcp_gpiostate; static uint8_t mcp_gpiostate;

4
nicintel.c
View File

@ -20,8 +20,8 @@
#include "programmer.h" #include "programmer.h"
#include "hwaccess.h" #include "hwaccess.h"
uint8_t *nicintel_bar; static uint8_t *nicintel_bar;
uint8_t *nicintel_control_bar; static uint8_t *nicintel_control_bar;
const struct dev_entry nics_intel[] = { const struct dev_entry nics_intel[] = {
{PCI_VENDOR_ID_INTEL, 0x1209, NT, "Intel", "8255xER/82551IT Fast Ethernet Controller"}, {PCI_VENDOR_ID_INTEL, 0x1209, NT, "Intel", "8255xER/82551IT Fast Ethernet Controller"},

2
nicintel_spi.c
View File

@ -75,7 +75,7 @@
#define BIT(x) (1<<(x)) #define BIT(x) (1<<(x))
uint8_t *nicintel_spibar; static uint8_t *nicintel_spibar;
const struct dev_entry nics_intel_spi[] = { const struct dev_entry nics_intel_spi[] = {
{PCI_VENDOR_ID_INTEL, 0x105e, OK, "Intel", "82571EB Gigabit Ethernet Controller"}, {PCI_VENDOR_ID_INTEL, 0x105e, OK, "Intel", "82571EB Gigabit Ethernet Controller"},

4
satamv.c
View File

@ -22,8 +22,8 @@
#include "programmer.h" #include "programmer.h"
#include "hwaccess.h" #include "hwaccess.h"
uint8_t *mv_bar; static uint8_t *mv_bar;
uint16_t mv_iobar; static uint16_t mv_iobar;
const struct dev_entry satas_mv[] = { const struct dev_entry satas_mv[] = {
/* 88SX6041 and 88SX6042 are the same according to the datasheet. */ /* 88SX6041 and 88SX6042 are the same according to the datasheet. */