This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
I386 HAL: Fixed some compiler warnings
- From: Nick Garnett <nickg at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: 23 Jul 2003 18:56:32 +0100
- Subject: I386 HAL: Fixed some compiler warnings
Index: arch/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/i386/arch/current/ChangeLog,v
retrieving revision 1.38
diff -u -5 -r1.38 ChangeLog
--- arch/current/ChangeLog 10 Apr 2003 18:07:53 -0000 1.38
+++ arch/current/ChangeLog 23 Jul 2003 17:55:05 -0000
@@ -1,5 +1,9 @@
+2003-07-23 Nick Garnett <nickg@balti.calivar.com>
+
+ * include/hal_intr.h: Tidied up some compiler warnings.
+
2003-04-10 Nick Garnett <nickg@balti.calivar.com>
* src/i386.ld:
Added libsupc++.a to GROUP() directive for GCC versions later than
3.0.
Index: arch/current/include/hal_intr.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/i386/arch/current/include/hal_intr.h,v
retrieving revision 1.9
diff -u -5 -r1.9 hal_intr.h
--- arch/current/include/hal_intr.h 23 May 2002 23:03:04 -0000 1.9
+++ arch/current/include/hal_intr.h 23 Jul 2003 17:55:05 -0000
@@ -207,58 +207,59 @@
#define HAL_INTERRUPT_IN_USE( _vector_, _state_) \
CYG_MACRO_START \
cyg_uint32 _index_; \
HAL_TRANSLATE_VECTOR ((_vector_), _index_); \
\
- if (hal_interrupt_handlers[_index_] \
- ==(CYG_ADDRESS)HAL_DEFAULT_ISR) \
+ if (hal_interrupt_handlers[_index_] \
+ ==(CYG_ADDRESS)HAL_DEFAULT_ISR) \
(_state_) = 0; \
else \
(_state_) = 1; \
CYG_MACRO_END
#ifndef HAL_INTERRUPT_ATTACH
externC void __default_interrupt_vsr(void);
-#define HAL_INTERRUPT_ATTACH( _vector_, _isr_, _data_, _object_ ) \
- CYG_MACRO_START \
- cyg_uint32 _index_; \
- HAL_TRANSLATE_VECTOR((_vector_), _index_); \
- \
- HAL_VSR_SET( _vector_, &__default_interrupt_vsr , NULL); \
- if( hal_interrupt_handlers[_index_] == (CYG_ADDRESS)HAL_DEFAULT_ISR ) \
- { \
- hal_interrupt_handlers[_index_] = (CYG_ADDRESS)(_isr_); \
- hal_interrupt_data[_index_] = (CYG_ADDRWORD)(_data_); \
- hal_interrupt_objects[_index_] = (CYG_ADDRESS)(_object_); \
- } \
+#define HAL_INTERRUPT_ATTACH( _vector_, _isr_, _data_, _object_ ) \
+ CYG_MACRO_START \
+ cyg_uint32 _index_; \
+ HAL_TRANSLATE_VECTOR((_vector_), _index_); \
+ \
+ HAL_VSR_SET( _vector_, &__default_interrupt_vsr , NULL); \
+ if( hal_interrupt_handlers[_index_] == (CYG_ADDRESS)HAL_DEFAULT_ISR ) \
+ { \
+ hal_interrupt_handlers[_index_] = (CYG_ADDRESS)(_isr_); \
+ hal_interrupt_data[_index_] = (CYG_ADDRWORD)(_data_); \
+ hal_interrupt_objects[_index_] = (CYG_ADDRESS)(_object_); \
+ } \
CYG_MACRO_END
#endif /* HAL_INTERRUPT_ATTACH */
#define HAL_INTERRUPT_DETACH( _vector_, _isr_ ) \
CYG_MACRO_START \
cyg_uint32 _index_; \
HAL_TRANSLATE_VECTOR((_vector_), _index_); \
\
- if (hal_interrupt_handlers[_index_] \
+ if (hal_interrupt_handlers[_index_] \
== (CYG_ADDRESS)(_isr_)) \
{ \
- hal_interrupt_handlers[_index_] = \
- (CYG_ADDRESS)HAL_DEFAULT_ISR; \
- hal_interrupt_data[_index_] = 0; \
- hal_interrupt_objects[_index_] = 0; \
+ hal_interrupt_handlers[_index_] = \
+ (CYG_ADDRESS)HAL_DEFAULT_ISR; \
+ hal_interrupt_data[_index_] = 0; \
+ hal_interrupt_objects[_index_] = 0; \
} \
CYG_MACRO_END
#define HAL_VSR_GET( _vector_, _pvsr_ ) \
*((CYG_ADDRESS *)(_pvsr_)) = hal_vsr_table[(_vector_)];
-#define HAL_VSR_SET( _vector_, _vsr_, _poldvsr_ ) \
- CYG_MACRO_START \
- if( (_poldvsr_) != NULL ) \
- *(CYG_ADDRESS *)(_poldvsr_) = hal_vsr_table[(_vector_)]; \
- hal_vsr_table[(_vector_)] = (CYG_ADDRESS)(_vsr_); \
+#define HAL_VSR_SET( _vector_, _vsr_, _poldvsr_ ) \
+ CYG_MACRO_START \
+ CYG_ADDRESS *__poldvsr = (CYG_ADDRESS *)(_poldvsr_); \
+ if( __poldvsr != NULL ) \
+ *__poldvsr = hal_vsr_table[(_vector_)]; \
+ hal_vsr_table[(_vector_)] = (CYG_ADDRESS)(_vsr_); \
CYG_MACRO_END
// This is an ugly name, but what it means is: grab the VSR back to eCos
// internal handling, or if you like, the default handler. But if
// cooperating with GDB and CygMon, the default behaviour is to pass most
Index: pc/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/i386/pc/current/ChangeLog,v
retrieving revision 1.20
diff -u -5 -r1.20 ChangeLog
--- pc/current/ChangeLog 10 Apr 2003 18:07:54 -0000 1.20
+++ pc/current/ChangeLog 23 Jul 2003 17:55:07 -0000
@@ -1,5 +1,9 @@
+2003-07-23 Nick Garnett <nickg@balti.calivar.com>
+
+ * include/plf_intr.h: Added extern definition for hal_pc_reset().
+
2003-04-10 Nick Garnett <nickg@balti.calivar.com>
* include/pkgconf/mlt_i386_pc_rom.ldi: Brought list of sections up
to date with other files.
Index: pc/current/include/plf_intr.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/i386/pc/current/include/plf_intr.h,v
retrieving revision 1.6
diff -u -5 -r1.6 plf_intr.h
--- pc/current/include/plf_intr.h 23 May 2002 23:03:12 -0000 1.6
+++ pc/current/include/plf_intr.h 23 Jul 2003 17:55:07 -0000
@@ -71,10 +71,12 @@
#include <cyg/hal/pcmb_intr.h>
//----------------------------------------------------------------------------
// Reset.
+__externC void hal_pc_reset(void);
+
#define HAL_PLATFORM_RESET() hal_pc_reset()
#define HAL_PLATFORM_RESET_ENTRY &hal_pc_reset
//---------------------------------------------------------------------------
Index: pcmb/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/i386/pcmb/current/ChangeLog,v
retrieving revision 1.16
diff -u -5 -r1.16 ChangeLog
--- pcmb/current/ChangeLog 14 Aug 2002 13:19:10 -0000 1.16
+++ pcmb/current/ChangeLog 23 Jul 2003 17:55:08 -0000
@@ -1,5 +1,11 @@
+2003-07-23 Nick Garnett <nickg@balti.calivar.com>
+
+ * include/pcmb_serial.h: Fixed bogus test on
+ CYGSEM_HAL_I386_PCMB_SCREEN_SUPPORT defined to test
+ CYGINT_HAL_I386_PCMB_SCREEN_SUPPORT > 0 instead.
+
2002-08-14 Gary Thomas <gthomas@ecoscentric.com>
2002-08-14 Drew Moseley <drew.moseley@intel.com>
* cdl/hal_i386_pcmb.cdl:
* include/pcmb_io.h: Increase PCI space to include all possible
Index: pcmb/current/include/pcmb_serial.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/i386/pcmb/current/include/pcmb_serial.h,v
retrieving revision 1.4
diff -u -5 -r1.4 pcmb_serial.h
--- pcmb/current/include/pcmb_serial.h 23 May 2002 23:03:16 -0000 1.4
+++ pcmb/current/include/pcmb_serial.h 23 Jul 2003 17:55:08 -0000
@@ -83,11 +83,11 @@
//=============================================================================
__externC void cyg_hal_plf_serial_init(void);
-#ifdef CYGSEM_HAL_I386_PCMB_SCREEN_SUPPORT
+#if CYGINT_HAL_I386_PCMB_SCREEN_SUPPORT > 0
__externC void cyg_hal_plf_screen_init(void);
#endif
--
Nick Garnett eCos Kernel Architect
http://www.ecoscentric.com The eCos and RedBoot experts