From e10928ada9cda4236e4b0ba6108dac1b3c8f7977 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Wed, 11 May 2005 20:48:05 +0000 Subject: [PATCH] Rename the BAUD_xxx baud rate defines to PAR_BAUD_xxx to avoid a name clash with the Win32 API names for baud rates. Reported by: Eric git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@462 81a1dc3b-b13d-400b-aceb-764788c761c2 --- avrdude/jtagmkII.c | 16 ++++++++-------- avrdude/jtagmkII_private.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/avrdude/jtagmkII.c b/avrdude/jtagmkII.c index 79386234..41934e03 100644 --- a/avrdude/jtagmkII.c +++ b/avrdude/jtagmkII.c @@ -932,14 +932,14 @@ static unsigned char jtagmkII_get_baud(long baud) long baud; unsigned char val; } baudtab[] = { - { 2400L, BAUD_2400 }, - { 4800L, BAUD_4800 }, - { 9600L, BAUD_9600 }, - { 19200L, BAUD_19200 }, - { 38400L, BAUD_38400 }, - { 57600L, BAUD_57600 }, - { 115200L, BAUD_115200 }, - { 14400L, BAUD_14400 }, + { 2400L, PAR_BAUD_2400 }, + { 4800L, PAR_BAUD_4800 }, + { 9600L, PAR_BAUD_9600 }, + { 19200L, PAR_BAUD_19200 }, + { 38400L, PAR_BAUD_38400 }, + { 57600L, PAR_BAUD_57600 }, + { 115200L, PAR_BAUD_115200 }, + { 14400L, PAR_BAUD_14400 }, }; int i; diff --git a/avrdude/jtagmkII_private.h b/avrdude/jtagmkII_private.h index 03f80ff9..804d1caa 100644 --- a/avrdude/jtagmkII_private.h +++ b/avrdude/jtagmkII_private.h @@ -177,14 +177,14 @@ # define EMULATOR_MODE_SPI 0x03 #define PAR_IREG 0x04 #define PAR_BAUD_RATE 0x05 -# define BAUD_2400 0x01 -# define BAUD_4800 0x02 -# define BAUD_9600 0x03 -# define BAUD_19200 0x04 /* default */ -# define BAUD_38400 0x05 -# define BAUD_57600 0x06 -# define BAUD_115200 0x07 -# define BAUD_14400 0x08 +# define PAR_BAUD_2400 0x01 +# define PAR_BAUD_4800 0x02 +# define PAR_BAUD_9600 0x03 +# define PAR_BAUD_19200 0x04 /* default */ +# define PAR_BAUD_38400 0x05 +# define PAR_BAUD_57600 0x06 +# define PAR_BAUD_115200 0x07 +# define PAR_BAUD_14400 0x08 #define PAR_OCD_VTARGET 0x06 #define PAR_OCD_JTAG_CLK 0x07 #define PAR_OCD_BREAK_CAUSE 0x08