See patch.
Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
Drop a bunch of useless header files, merge them into flash.h.
Signed-off-by: Uwe Hermann <[EMAIL PROTECTED]>
Index: pm49fl004.c
===================================================================
--- pm49fl004.c (Revision 2744)
+++ pm49fl004.c (Arbeitskopie)
@@ -24,8 +24,6 @@
#include <stdio.h>
#include "flash.h"
-#include "jedec.h"
-#include "pm49fl004.h"
extern int exclude_start_page, exclude_end_page;
Index: sst39sf020.c
===================================================================
--- sst39sf020.c (Revision 2744)
+++ sst39sf020.c (Arbeitskopie)
@@ -29,8 +29,6 @@
#include <stdio.h>
#include <stdint.h>
#include "flash.h"
-#include "jedec.h"
-#include "sst39sf020.h"
#define AUTO_PG_ERASE1 0x20
#define AUTO_PG_ERASE2 0xD0
Index: sst49lf040.h
===================================================================
--- sst49lf040.h (Revision 2744)
+++ sst49lf040.h (Arbeitskopie)
@@ -1,7 +0,0 @@
-#ifndef __SST49LF040_H__
-#define __SST49LF040_H__ 1
-
-extern int erase_49lf040(struct flashchip *flash);
-extern int write_49lf040(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__SST49LF040_H__ */
Index: flash.h
===================================================================
--- flash.h (Revision 2744)
+++ flash.h (Arbeitskopie)
@@ -27,9 +27,9 @@
#if defined(__GLIBC__)
#include <sys/io.h>
#endif
-
#include <unistd.h>
#include <stdint.h>
+#include <stdio.h>
struct flashchip {
char *name;
@@ -164,6 +164,103 @@
extern int fd_mem;
-int map_flash_registers(struct flashchip *flash); /* flashrom.c */
+/* debug.c */
+extern int verbose;
+#define printf_debug(x...) { if (verbose) printf(x); }
+/* flashrom.c */
+int map_flash_registers(struct flashchip *flash);
+
+/* layout.c */
+int show_id(uint8_t *bios, int size);
+int read_romlayout(char *name);
+int find_romentry(char *name);
+int handle_romentries(uint8_t *buffer, uint8_t *content);
+
+/* lbtable.c */
+int linuxbios_init(void);
+extern char *lb_part, *lb_vendor;
+
+/* 82802ab.c */
+extern int probe_82802ab(struct flashchip *flash);
+extern int erase_82802ab(struct flashchip *flash);
+extern int write_82802ab(struct flashchip *flash, uint8_t *buf);
+
+/* am29f040b.c */
+extern int probe_29f040b(struct flashchip *flash);
+extern int erase_29f040b(struct flashchip *flash);
+extern int write_29f040b(struct flashchip *flash, uint8_t *buf);
+
+/* jedec.c */
+extern void toggle_ready_jedec(volatile uint8_t *dst);
+extern void data_polling_jedec(volatile uint8_t *dst, uint8_t data);
+extern void unprotect_jedec(volatile uint8_t *bios);
+extern void protect_jedec(volatile uint8_t *bios);
+int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src,
+ volatile uint8_t *dst);
+extern int probe_jedec(struct flashchip *flash);
+extern int erase_chip_jedec(struct flashchip *flash);
+extern int write_jedec(struct flashchip *flash, uint8_t *buf);
+extern int erase_sector_jedec(volatile uint8_t *bios, unsigned int page);
+extern int erase_block_jedec(volatile uint8_t *bios, unsigned int page);
+extern int write_sector_jedec(volatile uint8_t *bios, uint8_t *src,
+ volatile uint8_t *dst, unsigned int page_size);
+
+/* m29f400bt.c */
+extern int probe_m29f400bt(struct flashchip *flash);
+extern int erase_m29f400bt(struct flashchip *flash);
+extern int block_erase_m29f400bt(volatile uint8_t *bios,
+ volatile uint8_t *dst);
+extern int write_m29f400bt(struct flashchip *flash, uint8_t *buf);
+extern int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf);
+extern void toggle_ready_m29f400bt(volatile uint8_t *dst);
+extern void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data);
+extern void protect_m29f400bt(volatile uint8_t *bios);
+extern void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src,
+ volatile uint8_t *dst, int page_size);
+
+/* mx29f002.c */
+extern int probe_29f002(struct flashchip *flash);
+extern int erase_29f002(struct flashchip *flash);
+extern int write_29f002(struct flashchip *flash, uint8_t *buf);
+
+/* pm49fl004.c */
+extern int probe_49fl004(struct flashchip *flash);
+extern int erase_49fl004(struct flashchip *flash);
+extern int write_49fl004(struct flashchip *flash, uint8_t *buf);
+
+/* sharplhf00l04.c */
+extern int probe_lhf00l04(struct flashchip *flash);
+extern int erase_lhf00l04(struct flashchip *flash);
+extern int write_lhf00l04(struct flashchip *flash, uint8_t *buf);
+extern void toggle_ready_lhf00l04(volatile uint8_t *dst);
+extern void data_polling_lhf00l04(volatile uint8_t *dst, uint8_t data);
+extern void protect_lhf00l04(volatile uint8_t *bios);
+
+/* sst28sf040.c */
+extern int probe_28sf040(struct flashchip *flash);
+extern int erase_28sf040(struct flashchip *flash);
+extern int write_28sf040(struct flashchip *flash, uint8_t *buf);
+
+/* sst39sf020.c */
+extern int probe_39sf020(struct flashchip *flash);
+extern int write_39sf020(struct flashchip *flash, uint8_t *buf);
+
+/* sst49lf040.c */
+extern int erase_49lf040(struct flashchip *flash);
+extern int write_49lf040(struct flashchip *flash, uint8_t *buf);
+
+/* sst49lfxxxc.c */
+extern int probe_49lfxxxc(struct flashchip *flash);
+extern int erase_49lfxxxc(struct flashchip *flash);
+extern int write_49lfxxxc(struct flashchip *flash, uint8_t *buf);
+
+/* sst_fwhub.c */
+extern int probe_sst_fwhub(struct flashchip *flash);
+extern int erase_sst_fwhub(struct flashchip *flash);
+extern int write_sst_fwhub(struct flashchip *flash, uint8_t *buf);
+
+/* w49f002u.c */
+extern int write_49f002(struct flashchip *flash, uint8_t *buf);
+
#endif /* !__FLASH_H__ */
Index: pm49fl004.h
===================================================================
--- pm49fl004.h (Revision 2744)
+++ pm49fl004.h (Arbeitskopie)
@@ -1,8 +0,0 @@
-#ifndef __PM49FL004_H__
-#define __PM49FL004_H__ 1
-
-extern int probe_49fl004(struct flashchip *flash);
-extern int erase_49fl004(struct flashchip *flash);
-extern int write_49fl004(struct flashchip *flash, uint8_t *buf);
-
-#endif
Index: lbtable.c
===================================================================
--- lbtable.c (Revision 2744)
+++ lbtable.c (Arbeitskopie)
@@ -32,7 +32,6 @@
#include <sys/mman.h>
#include "flash.h"
#include "linuxbios_tables.h"
-#include "debug.h"
char *lb_part = NULL, *lb_vendor = NULL;
Index: sst39sf020.h
===================================================================
--- sst39sf020.h (Revision 2744)
+++ sst39sf020.h (Arbeitskopie)
@@ -1,7 +0,0 @@
-#ifndef __SST39SF020_H__
-#define __SST39SF020_H__ 1
-
-extern int probe_39sf020(struct flashchip *flash);
-extern int write_39sf020(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__SST39SF020_H__ */
Index: lbtable.h
===================================================================
--- lbtable.h (Revision 2744)
+++ lbtable.h (Arbeitskopie)
@@ -1,8 +0,0 @@
-#ifndef __LBTABLE_H__
-#define __LBTABLE_H__ 1
-
-int linuxbios_init(void);
-
-extern char *lb_part, *lb_vendor;
-
-#endif
Index: jedec.c
===================================================================
--- jedec.c (Revision 2745)
+++ jedec.c (Arbeitskopie)
@@ -28,8 +28,6 @@
#include <stdio.h>
#include <stdint.h>
#include "flash.h"
-#include "jedec.h"
-#include "debug.h"
#define MAX_REFLASH_TRIES 0x10
Index: jedec.h
===================================================================
--- jedec.h (Revision 2744)
+++ jedec.h (Arbeitskopie)
@@ -1,18 +0,0 @@
-#ifndef __JEDEC_H__
-#define __JEDEC_H__ 1
-
-extern void toggle_ready_jedec(volatile uint8_t *dst);
-extern void data_polling_jedec(volatile uint8_t *dst, uint8_t data);
-extern void unprotect_jedec(volatile uint8_t *bios);
-extern void protect_jedec(volatile uint8_t *bios);
-int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src,
- volatile uint8_t *dst);
-extern int probe_jedec(struct flashchip *flash);
-extern int erase_chip_jedec(struct flashchip *flash);
-extern int write_jedec(struct flashchip *flash, uint8_t *buf);
-extern int erase_sector_jedec(volatile uint8_t *bios, unsigned int page);
-extern int erase_block_jedec(volatile uint8_t *bios, unsigned int page);
-extern int write_sector_jedec(volatile uint8_t *bios, uint8_t *src,
- volatile uint8_t *dst, unsigned int page_size);
-
-#endif /* !__JEDEC_H__ */
Index: sst49lfxxxc.c
===================================================================
--- sst49lfxxxc.c (Revision 2744)
+++ sst49lfxxxc.c (Arbeitskopie)
@@ -32,10 +32,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
-
#include "flash.h"
-#include "jedec.h"
-#include "debug.h"
#define SECTOR_ERASE 0x30
#define BLOCK_ERASE 0x20
Index: flashchips.c
===================================================================
--- flashchips.c (Revision 2744)
+++ flashchips.c (Arbeitskopie)
@@ -22,22 +22,9 @@
*/
#include "flash.h"
-#include "jedec.h"
-#include "m29f400bt.h"
-#include "82802ab.h"
#ifndef DISABLE_DOC
#include "msys_doc.h"
#endif
-#include "am29f040b.h"
-#include "sst28sf040.h"
-#include "sst49lfxxxc.h"
-#include "w49f002u.h"
-#include "sst39sf020.h"
-#include "sst49lf040.h"
-#include "pm49fl004.h"
-#include "mx29f002.h"
-#include "sharplhf00l04.h"
-#include "sst_fwhub.h"
struct flashchip flashchips[] = {
{"Am29F040B", AMD_ID, AM_29F040B, 512, 64 * 1024,
Index: sharplhf00l04.c
===================================================================
--- sharplhf00l04.c (Revision 2745)
+++ sharplhf00l04.c (Arbeitskopie)
@@ -24,10 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
-
#include "flash.h"
-#include "sharplhf00l04.h"
-#include "debug.h"
void toggle_ready_lhf00l04(volatile uint8_t *dst)
{
Index: sst49lfxxxc.h
===================================================================
--- sst49lfxxxc.h (Revision 2744)
+++ sst49lfxxxc.h (Arbeitskopie)
@@ -1,8 +0,0 @@
-#ifndef __SST49LFXXXC_H__
-#define __SST49LFXXXC_H__
-
-extern int probe_49lfxxxc(struct flashchip *flash);
-extern int erase_49lfxxxc(struct flashchip *flash);
-extern int write_49lfxxxc(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__SST49LFXXXC_H__ */
Index: debug.h
===================================================================
--- debug.h (Revision 2744)
+++ debug.h (Arbeitskopie)
@@ -1,10 +0,0 @@
-#ifndef __DEBUG_H__
-#define __DEBUG_H__ 1
-
-//#define printf_debug(x...) printf(x)
-
-extern int verbose;
-
-#define printf_debug(x...) { if(verbose) printf(x); }
-
-#endif
Index: sharplhf00l04.h
===================================================================
--- sharplhf00l04.h (Revision 2744)
+++ sharplhf00l04.h (Arbeitskopie)
@@ -1,11 +0,0 @@
-#ifndef __SHARPLHF00L04_H__
-#define __SHARPLHF00L04_H__ 1
-
-extern int probe_lhf00l04(struct flashchip *flash);
-extern int erase_lhf00l04(struct flashchip *flash);
-extern int write_lhf00l04(struct flashchip *flash, uint8_t *buf);
-extern void toggle_ready_lhf00l04(volatile uint8_t *dst);
-extern void data_polling_lhf00l04(volatile uint8_t *dst, uint8_t data);
-extern void protect_lhf00l04(volatile uint8_t *bios);
-
-#endif /* !__SHARPLHF00L04_H__ */
Index: sst28sf040.c
===================================================================
--- sst28sf040.c (Revision 2744)
+++ sst28sf040.c (Arbeitskopie)
@@ -28,8 +28,6 @@
#include <stdio.h>
#include <stdint.h>
#include "flash.h"
-#include "jedec.h"
-#include "debug.h"
#define AUTO_PG_ERASE1 0x20
#define AUTO_PG_ERASE2 0xD0
Index: w49f002u.c
===================================================================
--- w49f002u.c (Revision 2744)
+++ w49f002u.c (Arbeitskopie)
@@ -28,8 +28,6 @@
#include <stdio.h>
#include "flash.h"
-#include "jedec.h"
-#include "w49f002u.h"
int write_49f002(struct flashchip *flash, uint8_t *buf)
{
Index: am29f040b.c
===================================================================
--- am29f040b.c (Revision 2744)
+++ am29f040b.c (Arbeitskopie)
@@ -25,8 +25,6 @@
#include <stdio.h>
#include <stdint.h>
#include "flash.h"
-#include "jedec.h"
-#include "debug.h"
static __inline__ int erase_sector_29f040b(volatile uint8_t *bios,
unsigned long address)
Index: sst_fwhub.c
===================================================================
--- sst_fwhub.c (Revision 2744)
+++ sst_fwhub.c (Arbeitskopie)
@@ -21,10 +21,7 @@
*/
#include <stdio.h>
-
#include "flash.h"
-#include "jedec.h"
-#include "sst_fwhub.h"
// I need that Berkeley bit-map printer
void print_sst_fwhub_status(uint8_t status)
Index: chipset_enable.c
===================================================================
--- chipset_enable.c (Revision 2744)
+++ chipset_enable.c (Arbeitskopie)
@@ -14,9 +14,7 @@
#include <stdio.h>
#include <pci/pci.h>
#include <stdlib.h>
-
#include "flash.h"
-#include "debug.h"
static int enable_flash_ali_m1533(struct pci_dev *dev, char *name)
{
Index: sst28sf040.h
===================================================================
--- sst28sf040.h (Revision 2744)
+++ sst28sf040.h (Arbeitskopie)
@@ -1,8 +0,0 @@
-#ifndef __SST28SF040_H__
-#define __SST28SF040_H__
-
-extern int probe_28sf040(struct flashchip *flash);
-extern int erase_28sf040(struct flashchip *flash);
-extern int write_28sf040(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__SST28SF040_H__ */
Index: w49f002u.h
===================================================================
--- w49f002u.h (Revision 2744)
+++ w49f002u.h (Arbeitskopie)
@@ -1,6 +0,0 @@
-#ifndef __W49F002U_H__
-#define __W49F002U_H__ 1
-
-extern int write_49f002(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__W49F002U_H__ */
Index: am29f040b.h
===================================================================
--- am29f040b.h (Revision 2744)
+++ am29f040b.h (Arbeitskopie)
@@ -1,8 +0,0 @@
-#ifndef __AM29F040B_H__
-#define __AM29F040B_H__ 1
-
-extern int probe_29f040b(struct flashchip *flash);
-extern int erase_29f040b(struct flashchip *flash);
-extern int write_29f040b(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__AM29F040B_H__ */
Index: sst_fwhub.h
===================================================================
--- sst_fwhub.h (Revision 2744)
+++ sst_fwhub.h (Arbeitskopie)
@@ -1,8 +0,0 @@
-#ifndef __SST_FWHUB_H__
-#define __SST_FWHUB_H__ 1
-
-extern int probe_sst_fwhub(struct flashchip *flash);
-extern int erase_sst_fwhub(struct flashchip *flash);
-extern int write_sst_fwhub(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__SST_FWHUB_H__ */
Index: flashrom.c
===================================================================
--- flashrom.c (Revision 2744)
+++ flashrom.c (Arbeitskopie)
@@ -36,7 +36,6 @@
#include <stdlib.h>
#include <getopt.h>
#include <pci/pci.h>
-
/* for iopl */
#if defined (__sun) && (defined(__i386) || defined(__amd64))
#include <strings.h>
@@ -44,11 +43,7 @@
#include <sys/psw.h>
#include <asm/sunddi.h>
#endif
-
#include "flash.h"
-#include "lbtable.h"
-#include "layout.h"
-#include "debug.h"
char *chip_to_probe = NULL;
struct pci_access *pacc; /* For board and chipset_enable */
Index: layout.c
===================================================================
--- layout.c (Revision 2744)
+++ layout.c (Arbeitskopie)
@@ -2,9 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
-#include "layout.h"
-#include "lbtable.h"
-#include "debug.h"
+#include "flash.h"
char *mainboard_vendor = NULL;
char *mainboard_part = NULL;
Index: msys_doc.c
===================================================================
--- msys_doc.c (Revision 2744)
+++ msys_doc.c (Arbeitskopie)
@@ -23,7 +23,6 @@
#include <unistd.h>
#include "flash.h"
#include "msys_doc.h"
-#include "debug.h"
static int doc_wait(volatile uint8_t *bios, int timeout);
static uint8_t doc_read_chipid(volatile uint8_t *bios);
Index: layout.h
===================================================================
--- layout.h (Revision 2744)
+++ layout.h (Arbeitskopie)
@@ -1,9 +0,0 @@
-#ifndef __LAYOUT_H__
-#define __LAYOUT_H__ 1
-
-int show_id(uint8_t *bios, int size);
-int read_romlayout(char *name);
-int find_romentry(char *name);
-int handle_romentries(uint8_t *buffer, uint8_t *content);
-
-#endif /* !__LAYOUT_H__ */
Index: udelay.c
===================================================================
--- udelay.c (Revision 2744)
+++ udelay.c (Arbeitskopie)
@@ -1,6 +1,6 @@
#include <sys/time.h>
#include <stdio.h>
-#include "debug.h"
+#include "flash.h"
// count to a billion. Time it. If it's < 1 sec, count to 10B, etc.
unsigned long micro = 1;
Index: 82802ab.c
===================================================================
--- 82802ab.c (Revision 2745)
+++ 82802ab.c (Arbeitskopie)
@@ -25,10 +25,7 @@
#include <stdio.h>
#include <stdint.h>
-
#include "flash.h"
-#include "82802ab.h"
-#include "debug.h"
void toggle_ready_82802ab(volatile uint8_t *dst)
{
Index: mx29f002.c
===================================================================
--- mx29f002.c (Revision 2744)
+++ mx29f002.c (Arbeitskopie)
@@ -27,9 +27,6 @@
#include <stdio.h>
#include <stdint.h>
#include "flash.h"
-#include "jedec.h"
-#include "mx29f002.h"
-#include "debug.h"
int probe_29f002(struct flashchip *flash)
{
Index: m29f400bt.c
===================================================================
--- m29f400bt.c (Revision 2745)
+++ m29f400bt.c (Arbeitskopie)
@@ -24,8 +24,6 @@
*/
#include "flash.h"
-#include "m29f400bt.h"
-#include "debug.h"
void toggle_ready_m29f400bt(volatile uint8_t *dst)
{
Index: 82802ab.h
===================================================================
--- 82802ab.h (Revision 2744)
+++ 82802ab.h (Arbeitskopie)
@@ -1,8 +0,0 @@
-#ifndef __82802AB_H__
-#define __82802AB_H__ 1
-
-extern int probe_82802ab(struct flashchip *flash);
-extern int erase_82802ab(struct flashchip *flash);
-extern int write_82802ab(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__82802AB_H__ */
Index: mx29f002.h
===================================================================
--- mx29f002.h (Revision 2744)
+++ mx29f002.h (Arbeitskopie)
@@ -1,8 +0,0 @@
-#ifndef __MX29F002_H__
-#define __MX29F002_H__ 1
-
-extern int probe_29f002(struct flashchip *flash);
-extern int erase_29f002(struct flashchip *flash);
-extern int write_29f002(struct flashchip *flash, uint8_t *buf);
-
-#endif /* !__MX29F002_H__ */
Index: m29f400bt.h
===================================================================
--- m29f400bt.h (Revision 2744)
+++ m29f400bt.h (Arbeitskopie)
@@ -1,19 +0,0 @@
-#ifndef __M29F400BT_H__
-#define __M29F400BT_H__ 1
-
-#include <stdio.h>
-
-extern int probe_m29f400bt(struct flashchip *flash);
-extern int erase_m29f400bt(struct flashchip *flash);
-extern int block_erase_m29f400bt(volatile uint8_t *bios,
- volatile uint8_t *dst);
-extern int write_m29f400bt(struct flashchip *flash, uint8_t *buf);
-extern int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf);
-
-extern void toggle_ready_m29f400bt(volatile uint8_t *dst);
-extern void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data);
-extern void protect_m29f400bt(volatile uint8_t *bios);
-extern void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src,
- volatile uint8_t *dst, int page_size);
-
-#endif /* !__M29F400BT_H__ */
Index: sst49lf040.c
===================================================================
--- sst49lf040.c (Revision 2744)
+++ sst49lf040.c (Arbeitskopie)
@@ -26,8 +26,6 @@
*/
#include <stdio.h>
#include "flash.h"
-#include "jedec.h"
-#include "sst49lf040.h"
int erase_49lf040(struct flashchip *flash)
{
Index: board_enable.c
===================================================================
--- board_enable.c (Revision 2744)
+++ board_enable.c (Arbeitskopie)
@@ -19,9 +19,7 @@
#include <pci/pci.h>
#include <stdint.h>
#include <string.h>
-
#include "flash.h"
-#include "debug.h"
/*
* Helper functions for many Winbond superIOs of the w836xx range.
signature.asc
Description: Digital signature
-- linuxbios mailing list [email protected] http://www.linuxbios.org/mailman/listinfo/linuxbios
