build errors:
hermes.h: In function `hermes_set_irqmask':
hermes.h:337: parse error before "do"
hermes.h:337: parse error before ';' token
hermes.h: In function `hermes_write_words':
In mips, outw_p() is a #define do...while(0) which, in the
case of ?:, results in a statement being used where an
expression is required.
Here are my proposed (identical) patches for 2.4 and 2.6.
--- linux-2.4.23-pre2/drivers/net/wireless/hermes.h Mon Aug 25 05:44:42 2003
+++ linux-2.4.23-pre2.hermes/drivers/net/wireless/hermes.h Wed Sep 3 11:05:05 2003
@@ -302,12 +302,14 @@
#define hermes_read_reg(hw, off) ((hw)->io_space ? \
inw((hw)->iobase + ( (off) << (hw)->reg_spacing )) : \
readw((hw)->iobase + ( (off) << (hw)->reg_spacing )))
-#define hermes_write_reg(hw, off, val) ((hw)->io_space ? \
- outw_p((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )) : \
- writew((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )))
-
-#define hermes_read_regn(hw, name) (hermes_read_reg((hw), HERMES_##name))
-#define hermes_write_regn(hw, name, val) (hermes_write_reg((hw), HERMES_##name, (val)))
+#define hermes_write_reg(hw, off, val) do { \
+ if ( (hw)->io_space ) \
+ outw_p((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )); \
+ else \
+ writew((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )); \
+ } while (0)
+#define hermes_read_regn(hw, name) hermes_read_reg((hw), HERMES_##name)
+#define hermes_write_regn(hw, name, val) hermes_write_reg((hw), HERMES_##name, (val))
/* Function prototypes */
void hermes_struct_init(hermes_t *hw, ulong address, int io_space, int reg_spacing);
--- linux-2.6.00-test4/drivers/net/wireless/hermes.h Fri Aug 22 17:51:39 2003
+++ linux-2.6.00-test4.hermes/drivers/net/wireless/hermes.h Wed Sep 3 11:05:09 2003
@@ -302,12 +302,14 @@
#define hermes_read_reg(hw, off) ((hw)->io_space ? \
inw((hw)->iobase + ( (off) << (hw)->reg_spacing )) : \
readw((hw)->iobase + ( (off) << (hw)->reg_spacing )))
-#define hermes_write_reg(hw, off, val) ((hw)->io_space ? \
- outw_p((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )) : \
- writew((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )))
-
-#define hermes_read_regn(hw, name) (hermes_read_reg((hw), HERMES_##name))
-#define hermes_write_regn(hw, name, val) (hermes_write_reg((hw), HERMES_##name, (val)))
+#define hermes_write_reg(hw, off, val) do { \
+ if ( (hw)->io_space ) \
+ outw_p((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )); \
+ else \
+ writew((val), (hw)->iobase + ( (off) << (hw)->reg_spacing )); \
+ } while (0)
+#define hermes_read_regn(hw, name) hermes_read_reg((hw), HERMES_##name)
+#define hermes_write_regn(hw, name, val) hermes_write_reg((hw), HERMES_##name, (val))
/* Function prototypes */
void hermes_struct_init(hermes_t *hw, ulong address, int io_space, int reg_spacing);