From 7038564346f660ce043d7942398f3e8a3a2db7ad Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 6 Apr 2007 11:58:03 +0000 Subject: Trivial (cosmetic) cleanup * Only open /dev/mem once and do it early. * Drop extern for function prototypes. * Minimize ts5300 impact in probe_flash() This cleanup will making ICH7 SPI support quite some easier. Corresponding to flashrom svn r100 and coreboot v2 svn r2585. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer --- flash.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'flash.h') diff --git a/flash.h b/flash.h index 9f743dd..b22227d 100644 --- a/flash.h +++ b/flash.h @@ -45,7 +45,6 @@ struct flashchip { int (*write) (struct flashchip *flash, uint8_t *buf); int (*read) (struct flashchip *flash, uint8_t *buf); - int fd_mem; volatile uint8_t *virt_addr_2; }; @@ -126,17 +125,17 @@ extern struct flashchip flashchips[]; /* function prototypes from udelay.h */ -extern void myusec_delay(int time); -extern void myusec_calibrate_delay(); +void myusec_delay(int time); +void myusec_calibrate_delay(); /* pci handling for board/chipset_enable */ -extern struct pci_access *pacc; /* For board and chipset_enable */ -extern struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device); -extern struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, - uint16_t card_vendor, uint16_t card_device); +struct pci_access *pacc; /* For board and chipset_enable */ +struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device); +struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, + uint16_t card_vendor, uint16_t card_device); -extern int board_flash_enable(char *vendor, char *part); /* board_enable.c */ -extern int chipset_flash_enable(void); /* chipset_enable.c */ +int board_flash_enable(char *vendor, char *part); /* board_enable.c */ +int chipset_flash_enable(void); /* chipset_enable.c */ /* physical memory mapping device */ @@ -146,4 +145,6 @@ extern int chipset_flash_enable(void); /* chipset_enable.c */ # define MEM_DEV "/dev/mem" #endif +extern int fd_mem; + #endif /* !__FLASH_H__ */ -- cgit v1.1