Do not call EC programmer shutdown functions explicitly.

programmer.h

 /*
  * This file is part of the flashrom project.
  *
  * Copyright (C) 2000 Silicon Integrated System Corporation
  * Copyright (C) 2000 Ronald G. Minnich <rminnich@gmail.com>
  * Copyright (C) 2005-2009 coresystems GmbH
  * Copyright (C) 2006-2009 Carl-Daniel Hailfinger
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ skipping 91 matching lines @@
         uint8_t (*chip_readb) (const chipaddr addr);
         uint16_t (*chip_readw) (const chipaddr addr);
         uint32_t (*chip_readl) (const chipaddr addr);
         void (*chip_readn) (uint8_t *buf, const chipaddr addr, size_t len);
         void (*delay) (int usecs);
 };
 
 extern const struct programmer_entry programmer_table[];
 
 int programmer_init(char *param);
-int programmer_shutdown(void);
+int flashrom_shutdown(void);

[Louis, 2011/04/26 10:06:06]

hm... I am not sure if renaming is a good idea since this may conflict to
upstream if one day upstream improves the shutdown mecahnism. I'd like to
suggest to keep the name. Also see my comment in programmer_shutdown()
implementation.

[dhendrix, 2011/04/27 02:08:06]

agreed -- reverted back to original naming for now.

 
 enum bitbang_spi_master_type {
         BITBANG_SPI_INVALID     = 0, /* This must always be the first entry. */
 #if CONFIG_RAYER_SPI == 1
         BITBANG_SPI_MASTER_RAYER,
 #endif
 #if CONFIG_NICINTEL_SPI == 1
         BITBANG_SPI_MASTER_NICINTEL,
 #endif
 #if CONFIG_INTERNAL == 1
@@ skipping 161 matching lines @@
                               uint16_t card_vendor, uint16_t card_device);
 #endif
 void get_io_perms(void);
 void release_io_perms(void);
 #if CONFIG_INTERNAL == 1
 extern int is_laptop;
 extern int force_boardenable;
 extern int force_boardmismatch;
 void probe_superio(void);
 int internal_init(void);
-int internal_shutdown(void);
+void internal_shutdown(void *);
 void internal_chip_writeb(uint8_t val, chipaddr addr);
 void internal_chip_writew(uint16_t val, chipaddr addr);
 void internal_chip_writel(uint32_t val, chipaddr addr);
 uint8_t internal_chip_readb(const chipaddr addr);
 uint16_t internal_chip_readw(const chipaddr addr);
 uint32_t internal_chip_readl(const chipaddr addr);
 void internal_chip_readn(uint8_t *buf, const chipaddr addr, size_t len);
 #endif
 
 /* hwaccess.c */
@@ skipping 271 matching lines @@
 int ich_spi_send_command(unsigned int writecnt, unsigned int readcnt,
                     const unsigned char *writearr, unsigned char *readarr);
 int ich_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);
 int ich_spi_write_256(struct flashchip *flash, uint8_t * buf, int start, int len);
 int ich_spi_send_multicommand(struct spi_command *cmds);
 #endif
 
 /* it85spi.c */
 struct superio probe_superio_ite85xx(void);
 int it85xx_spi_init(void);
-int it85xx_shutdown(void);
 int it85xx_probe_spi_flash(const char *name);
 int it85xx_spi_send_command(unsigned int writecnt, unsigned int readcnt,
                         const unsigned char *writearr, unsigned char *readarr);
 
 /* it87spi.c */
 void enter_conf_mode_ite(uint16_t port);
 void exit_conf_mode_ite(uint16_t port);
 struct superio probe_superio_ite(void);
 int init_superio_ite(void);
 int it87spi_init(void);
 int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt,
                         const unsigned char *writearr, unsigned char *readarr);
 int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len);
 int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len);
 
 /* mec1308.c */
 struct superio probe_superio_mec1308(void);
-int mec1308_shutdown(void);
 int mec1308_probe_spi_flash(const char *name);
 int mec1308_spi_read(struct flashchip *flash,
                      uint8_t * buf, int start, int len);
 int mec1308_spi_write_256(struct flashchip *flash,
                           uint8_t *buf, int start, int len);
 int mec1308_spi_send_command(unsigned int writecnt, unsigned int readcnt,
                              const unsigned char *writearr,
                              unsigned char *readarr);
 
 /* sb600spi.c */
@@ skipping 23 matching lines @@
 
 /* serial.c */
 #if _WIN32
 typedef HANDLE fdtype;
 #else
 typedef int fdtype;
 #endif
 
 /* wpce775x.c */
 struct superio probe_superio_wpce775x(void);
-int wpce775x_shutdown(void);
 int wpce775x_probe_spi_flash(const char *name);
 int wpce775x_spi_read(struct flashchip *flash,
                       uint8_t * buf, int start, int len);
 int wpce775x_spi_write_256(struct flashchip *flash,
                            uint8_t *buf, int start, int len);
 int wpce775x_spi_send_command(unsigned int writecnt, unsigned int readcnt,
                               const unsigned char *writearr,
                               unsigned char *readarr);
 
 void sp_flush_incoming(void);
 fdtype sp_openserport(char *dev, unsigned int baud);
 void __attribute__((noreturn)) sp_die(char *msg);
 extern fdtype sp_fd;
 int serialport_shutdown(void);
 int serialport_write(unsigned char *buf, unsigned int writecnt);
 int serialport_read(unsigned char *buf, unsigned int readcnt);
 
 
 /* tegra2_spi.c */
 #if CONFIG_INTERNAL == 1
 int tegra2_spi_init(void);
 void tegra2_spi_shutdown(void*);
 int tegra2_spi_send_command(unsigned int writecnt, unsigned int readcnt,
                       const unsigned char *writearr, unsigned char *readarr);
 int tegra2_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);
 int tegra2_spi_write(struct flashchip *flash, uint8_t *buf, int start, int len);
 #endif
 
 #endif                          /* !__PROGRAMMER_H__ */