diff options
author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2010-04-09 20:24:57 +0000 |
---|---|---|
committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2010-04-09 20:24:57 +0000 |
commit | c193baadaf4ba825374104b150eceaed203800b0 (patch) | |
tree | 6933fe6b62789da022c05b5400f36cd2d7b80a57 /c/src/lib/libbsp/shared | |
parent | removed over-paranoid warning switches (diff) | |
download | rtems-c193baadaf4ba825374104b150eceaed203800b0.tar.bz2 |
unify irq data types and code, merge s3c2400/s3c2410 support
Diffstat (limited to 'c/src/lib/libbsp/shared')
-rw-r--r-- | c/src/lib/libbsp/shared/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/shared/umon/umonrtemsglue.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index a559e0ad17..4541127727 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,7 @@ +2010-04-09 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> + + * umon/umonrtemsglue.c: change type to avoid warning + 2010-03-25 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> * src/irq-generic.c: fix warning diff --git a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c index 82392405de..3d4e245b4c 100644 --- a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c +++ b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c @@ -20,7 +20,7 @@ static int rtems_umon_connected = 0; void rtems_umon_connect(void) { - void *moncomptr; + int(*moncomptr)(int,void *,void *,void *); if ( rtems_umon_connected ) return; @@ -29,7 +29,7 @@ void rtems_umon_connect(void) moncomptr = rtems_bsp_get_umon_monptr(); monConnect( - (int(*)())(*(unsigned long *)moncomptr), /* monitor base */ + moncomptr, /* monitor base */ (void *)0, /* lock */ (void *)0 /* unlock */ ); |