diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2011-11-14 15:43:35 +0000 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2011-11-18 13:29:22 +0000 |
| commit | e1500a9c9d0189bc277c79a2ddb35ecb79d1a20e (patch) | |
| tree | 459518189982495db7bca4f6f9337c990adc3206 | |
| parent | 280e1b334abc051d80e71ace8cec8cca0d663842 (diff) | |
build: fix gcc 4.6.2 warnings
see trac #47
Change-Id: I48a3e963354dfc82209477672c2508c96fb737d6
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/198
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
| -rw-r--r-- | src/jtag/drivers/amt_jtagaccel.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c index a433e81e..424019e1 100644 --- a/src/jtag/drivers/amt_jtagaccel.c +++ b/src/jtag/drivers/amt_jtagaccel.c @@ -68,34 +68,26 @@ static const int addr_mode = IEEE1284_MODE_EPP | IEEE1284_ADDR; #define AMT_AW(val) \ do { \ - int __retval; \ - \ - __retval = ioctl(device_handle, PPSETMODE, &addr_mode); \ - __retval = write(device_handle, &val, 1); \ + ioctl(device_handle, PPSETMODE, &addr_mode); \ + write(device_handle, &val, 1); \ } while (0) #define AMT_AR(val) \ do { \ - int __retval; \ - \ - __retval = ioctl(device_handle, PPSETMODE, &addr_mode); \ - __retval = read(device_handle, &val, 1); \ + ioctl(device_handle, PPSETMODE, &addr_mode); \ + read(device_handle, &val, 1); \ } while (0) static const int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA; #define AMT_DW(val) \ do { \ - int __retval; \ - \ - __retval = ioctl(device_handle, PPSETMODE, &data_mode); \ - __retval = write(device_handle, &val, 1); \ + ioctl(device_handle, PPSETMODE, &data_mode); \ + write(device_handle, &val, 1); \ } while (0) #define AMT_DR(val) \ do { \ - int __retval; \ - \ - __retval = ioctl(device_handle, PPSETMODE, &data_mode); \ - __retval = read(device_handle, &val, 1); \ + ioctl(device_handle, PPSETMODE, &data_mode); \ + read(device_handle, &val, 1); \ } while (0) #else |