From 10272c5a559a0a577eabdc0287905caec3dfd81a Mon Sep 17 00:00:00 2001
From: hinni <hinni@81a1dc3b-b13d-400b-aceb-764788c761c2>
Date: Mon, 5 Jul 2004 15:04:19 +0000
Subject: [PATCH] Removed unnecessary includes of config.h
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@426 81a1dc3b-b13d-400b-aceb-764788c761c2
---
ChangeLog | 4 ++++
avr.c | 1 -
avr910.h | 2 +-
avrpart.h | 3 +++
butterfly.h | 2 --
config.h | 2 --
main.c | 5 ++---
par.h | 2 --
pgm.h | 3 +++
ppi.h | 2 --
serial.h | 2 --
stk500.h | 2 --
12 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7c4895cc..a4b6e437 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-05 Jan-Hinnerk Reichert <hinni@despammed.com>
+ * *.c, *.h: Removed unnecessary includes of
+ config.h
+
2004-07-04 Jan-Hinnerk Reichert <hinni@despammed.com>
* avr.h: Removed some unused prototypes
diff --git a/avr.c b/avr.c
index 87238814..5960b290 100644
--- a/avr.c
+++ b/avr.c
@@ -30,7 +30,6 @@
#include "avr.h"
-#include "config.h"
#include "lists.h"
#include "pindefs.h"
#include "ppi.h"
diff --git a/avr910.h b/avr910.h
index 9ae392e1..e46c4dd3 100644
--- a/avr910.h
+++ b/avr910.h
@@ -22,7 +22,7 @@
#ifndef __avr910_h__
#define __avr910_h__
-#include "config.h"
+#include "avrpart.h"
void avr910_initpgm (PROGRAMMER * pgm);
diff --git a/avrpart.h b/avrpart.h
index db640588..e0892a3c 100644
--- a/avrpart.h
+++ b/avrpart.h
@@ -26,6 +26,9 @@
#include "lists.h"
+
+extern LISTID part_list;
+
/*
* AVR serial programming instructions
*/
diff --git a/butterfly.h b/butterfly.h
index ae7f6f42..9a77e5b3 100644
--- a/butterfly.h
+++ b/butterfly.h
@@ -22,8 +22,6 @@
#ifndef __butterfly_h__
#define __butterfly_h__
-#include "config.h"
-
void butterfly_initpgm (PROGRAMMER * pgm);
#endif /* __butterfly_h__ */
diff --git a/config.h b/config.h
index 627a3c2c..39f21760 100644
--- a/config.h
+++ b/config.h
@@ -47,8 +47,6 @@ extern FILE * yyin;
extern PROGRAMMER * current_prog;
extern AVRPART * current_part;
extern AVRMEM * current_mem;
-extern LISTID programmers;
-extern LISTID part_list;
extern int lineno;
extern char * infile;
extern LISTID string_list;
diff --git a/main.c b/main.c
index a0d435f3..5ab23cc7 100644
--- a/main.c
+++ b/main.c
@@ -50,7 +50,6 @@
#include "lists.h"
#include "par.h"
#include "pindefs.h"
-#include "ppi.h"
#include "term.h"
@@ -134,7 +133,7 @@ int getexitspecs(char *s, int *set, int *clr)
else if (strcmp(cp, "noreset") == 0) {
*set |= par_getpinmask(pgm->pinno[PIN_AVR_RESET]);
}
- else if (strcmp(cp, "vcc") == 0) {
+ else if (strcmp(cp, "vcc") == 0) {
if (pgm->pinno[PPI_AVR_VCC])
*set |= pgm->pinno[PPI_AVR_VCC];
}
@@ -507,7 +506,7 @@ UPDATE * new_update(int op, char * memtype, int filefmt, char * filename)
-int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
+int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
int verify)
{
struct avrpart * v;
diff --git a/par.h b/par.h
index dece58a1..54946337 100644
--- a/par.h
+++ b/par.h
@@ -22,8 +22,6 @@
#ifndef __par_h__
#define __par_h__
-#include "config.h"
-
void par_initpgm (PROGRAMMER * pgm);
int par_getpinmask(int pin);
diff --git a/pgm.h b/pgm.h
index 2654b304..bb066c7c 100644
--- a/pgm.h
+++ b/pgm.h
@@ -35,6 +35,9 @@
#define PGM_DESCLEN 80
#define PGM_PORTLEN PATH_MAX
#define PGM_TYPELEN 32
+
+extern LISTID programmers;
+
typedef struct programmer_t {
LISTID id;
char desc[PGM_DESCLEN];
diff --git a/ppi.h b/ppi.h
index 7f817f9e..69f1f378 100644
--- a/ppi.h
+++ b/ppi.h
@@ -22,8 +22,6 @@
#ifndef __ppi_h__
#define __ppi_h__
-#include "config.h"
-
/*
* PPI registers
*/
diff --git a/serial.h b/serial.h
index c84c45df..0846e4cd 100644
--- a/serial.h
+++ b/serial.h
@@ -30,8 +30,6 @@
#ifndef __serial_h__
#define __serial_h__
-#include "config.h"
-
extern int serial_open(char * port, long baud);
extern void serial_close(int fd);
diff --git a/stk500.h b/stk500.h
index 222fe666..1f4fe2eb 100644
--- a/stk500.h
+++ b/stk500.h
@@ -22,8 +22,6 @@
#ifndef __stk500_h__
#define __stk500_h__
-#include "config.h"
-
void stk500_initpgm (PROGRAMMER * pgm);
#endif