diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-10 19:26:27 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-10 19:26:27 +0000 |
commit | 79d490aa58e4ee2409c6033c771d276029ee7d6f (patch) | |
tree | a6149c6527b3475d63c615a501b771f8edf364f5 /c/src | |
parent | 2009-08-10 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-79d490aa58e4ee2409c6033c771d276029ee7d6f.tar.bz2 |
2009-08-10 Roxana Leontie <roxana.leontie@gmail.com>
* fb/fb.c: function calls renamed; defined references to the extern
functions
* fb/fb.h: Removed.
* Makefile.am: Reflect removal.
* preinstall.am: Regenerated.
Diffstat (limited to 'c/src')
-rw-r--r-- | c/src/lib/libbsp/arm/nds/ChangeLog | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/nds/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/nds/fb/fb.c | 22 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/nds/fb/fb.h | 51 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/nds/preinstall.am | 4 |
5 files changed, 21 insertions, 66 deletions
diff --git a/c/src/lib/libbsp/arm/nds/ChangeLog b/c/src/lib/libbsp/arm/nds/ChangeLog index 3080454762..c9a9ff8109 100644 --- a/c/src/lib/libbsp/arm/nds/ChangeLog +++ b/c/src/lib/libbsp/arm/nds/ChangeLog @@ -1,5 +1,13 @@ 2009-08-10 Roxana Leontie <roxana.leontie@gmail.com> + * fb/fb.c: function calls renamed; defined references to the extern + functions + * fb/fb.h: Removed. + * Makefile.am: Reflect removal. + * preinstall.am: Regenerated. + +2009-08-10 Roxana Leontie <roxana.leontie@gmail.com> + * fb/fb.c: different structures defined in rtems/fb.h that were used in here so changes were needed diff --git a/c/src/lib/libbsp/arm/nds/Makefile.am b/c/src/lib/libbsp/arm/nds/Makefile.am index 5616fc8264..e4aca0221f 100644 --- a/c/src/lib/libbsp/arm/nds/Makefile.am +++ b/c/src/lib/libbsp/arm/nds/Makefile.am @@ -32,7 +32,7 @@ noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = include_ndsdir = $(includedir)/nds -include_nds_HEADERS = fb/fb.h touchscreen/touchscreen.h sound/sound.h +include_nds_HEADERS = touchscreen/touchscreen.h sound/sound.h noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ diff --git a/c/src/lib/libbsp/arm/nds/fb/fb.c b/c/src/lib/libbsp/arm/nds/fb/fb.c index 75ae62392f..5b5fcef774 100644 --- a/c/src/lib/libbsp/arm/nds/fb/fb.c +++ b/c/src/lib/libbsp/arm/nds/fb/fb.c @@ -22,7 +22,9 @@ #include <nds.h> #include <rtems/fb.h> -#include <nds/fb.h> + +extern int get_palette( struct fb_cmap * ); +extern int set_palette( struct fb_cmap * ); /* * screen information for the driver (fb0). @@ -66,7 +68,7 @@ static struct fb_fix_screeninfo fb_fix_info2 = { */ rtems_device_driver -fbds_initialize (rtems_device_major_number major, +frame_buffer_initialize (rtems_device_major_number major, rtems_device_minor_number minor, void *arg) { rtems_status_code status; @@ -92,7 +94,7 @@ fbds_initialize (rtems_device_major_number major, */ rtems_device_driver -fbds_open (rtems_device_major_number major, +frame_buffer_open (rtems_device_major_number major, rtems_device_minor_number minor, void *arg) { printk ("[#] entering graphic mode on fb%d\n", minor); @@ -113,13 +115,13 @@ fbds_open (rtems_device_major_number major, */ rtems_device_driver -fbds_close (rtems_device_major_number major, +frame_buffer_close (rtems_device_major_number major, rtems_device_minor_number minor, void *arg) { printk ("[#] leaving graphic mode on fb%d\n", minor); if (!minor) { memset ((void *)fb_fix_info.smem_start, 0, fb_fix_info.smem_len); - } + } else { memset ((void *)fb_fix_info2.smem_start, 0, fb_fix_info2.smem_len); /* back to console */ @@ -135,7 +137,7 @@ fbds_close (rtems_device_major_number major, */ rtems_device_driver -fbds_read (rtems_device_major_number major, +frame_buffer_read (rtems_device_major_number major, rtems_device_minor_number minor, void *arg) { rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *) arg; @@ -149,7 +151,7 @@ fbds_read (rtems_device_major_number major, */ rtems_device_driver -fbds_write (rtems_device_major_number major, +frame_buffer_write (rtems_device_major_number major, rtems_device_minor_number minor, void *arg) { rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *) arg; @@ -163,7 +165,7 @@ fbds_write (rtems_device_major_number major, */ rtems_device_driver -fbds_control (rtems_device_major_number major, +frame_buffer_control (rtems_device_major_number major, rtems_device_minor_number minor, void *arg) { rtems_libio_ioctl_args_t *args = arg; @@ -180,10 +182,10 @@ fbds_control (rtems_device_major_number major, args->ioctl_return = 0; break; case FBIOGETCMAP: - args->ioctl_return = get_palette( args->buffer ); + args->ioctl_return = get_palette( (struct fb_cmap *) args->buffer ); break; case FBIOPUTCMAP: - args->ioctl_return = set_palette( args->buffer ); + args->ioctl_return = set_palette( (struct fb_cmap *) args->buffer ); break; /* no break on purpose */ diff --git a/c/src/lib/libbsp/arm/nds/fb/fb.h b/c/src/lib/libbsp/arm/nds/fb/fb.h deleted file mode 100644 index 4a8dedb039..0000000000 --- a/c/src/lib/libbsp/arm/nds/fb/fb.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2008 by Matthieu Bucchianeri <mbucchia@gmail.com> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * - * http://www.rtems.com/license/LICENSE - * - * $Id$ - */ - -#ifndef _FB_H_ -#define _FB_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif - -/* fbds prototype entry points */ - rtems_device_driver fbds_initialize (rtems_device_major_number, - rtems_device_minor_number, void *); - - rtems_device_driver fbds_open (rtems_device_major_number, - rtems_device_minor_number, void *); - - rtems_device_driver fbds_control (rtems_device_major_number, - rtems_device_minor_number, void *); - - rtems_device_driver fbds_close (rtems_device_major_number, - rtems_device_minor_number, void *); - - rtems_device_driver fbds_read (rtems_device_major_number, - rtems_device_minor_number, void *); - - rtems_device_driver fbds_write (rtems_device_major_number, - rtems_device_minor_number, void *); - - rtems_device_driver fbds_control (rtems_device_major_number, - rtems_device_minor_number, void *); - -#define FB_DRIVER_TABLE_ENTRY \ - { fbds_initialize, fbds_open, fbds_close, \ - fbds_read, fbds_write, fbds_control } - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/c/src/lib/libbsp/arm/nds/preinstall.am b/c/src/lib/libbsp/arm/nds/preinstall.am index ed9191c6f0..48e2aced92 100644 --- a/c/src/lib/libbsp/arm/nds/preinstall.am +++ b/c/src/lib/libbsp/arm/nds/preinstall.am @@ -70,10 +70,6 @@ $(PROJECT_INCLUDE)/nds/$(dirstamp): @: > $(PROJECT_INCLUDE)/nds/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/nds/$(dirstamp) -$(PROJECT_INCLUDE)/nds/fb.h: fb/fb.h $(PROJECT_INCLUDE)/nds/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nds/fb.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/nds/fb.h - $(PROJECT_INCLUDE)/nds/touchscreen.h: touchscreen/touchscreen.h $(PROJECT_INCLUDE)/nds/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nds/touchscreen.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/nds/touchscreen.h |