Changeset 79d490aa in rtems for c/src/lib


Ignore:
Timestamp:
Aug 10, 2009, 7:26:27 PM (11 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 5, master
Children:
cdfe85a7
Parents:
7c11edfd
Message:

2009-08-10 Roxana Leontie <roxana.leontie@…>

  • fb/fb.c: function calls renamed; defined references to the extern functions
  • fb/fb.h: Removed.
  • Makefile.am: Reflect removal.
  • preinstall.am: Regenerated.
Location:
c/src/lib/libbsp/arm/nds
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/nds/ChangeLog

    r7c11edfd r79d490aa  
     12009-08-10      Roxana Leontie <roxana.leontie@gmail.com>
     2
     3        * fb/fb.c: function calls renamed; defined references to the extern
     4        functions
     5        * fb/fb.h: Removed.
     6        * Makefile.am: Reflect removal.
     7        * preinstall.am: Regenerated.
     8
    192009-08-10      Roxana Leontie <roxana.leontie@gmail.com>
    210
  • c/src/lib/libbsp/arm/nds/Makefile.am

    r7c11edfd r79d490aa  
    3333
    3434include_ndsdir = $(includedir)/nds
    35 include_nds_HEADERS = fb/fb.h touchscreen/touchscreen.h sound/sound.h
     35include_nds_HEADERS = touchscreen/touchscreen.h sound/sound.h
    3636
    3737noinst_PROGRAMS += startup.rel
  • c/src/lib/libbsp/arm/nds/fb/fb.c

    r7c11edfd r79d490aa  
    2323
    2424#include <rtems/fb.h>
    25 #include <nds/fb.h>
     25
     26extern int get_palette( struct fb_cmap * );
     27extern int set_palette( struct fb_cmap * );
    2628
    2729/*
     
    6769
    6870rtems_device_driver
    69 fbds_initialize (rtems_device_major_number major,
     71frame_buffer_initialize (rtems_device_major_number major,
    7072                 rtems_device_minor_number minor, void *arg)
    7173{
     
    9395
    9496rtems_device_driver
    95 fbds_open (rtems_device_major_number major,
     97frame_buffer_open (rtems_device_major_number major,
    9698           rtems_device_minor_number minor, void *arg)
    9799{
     
    114116
    115117rtems_device_driver
    116 fbds_close (rtems_device_major_number major,
     118frame_buffer_close (rtems_device_major_number major,
    117119            rtems_device_minor_number minor, void *arg)
    118120{
     
    120122  if (!minor) {
    121123      memset ((void *)fb_fix_info.smem_start, 0, fb_fix_info.smem_len);
    122   } 
     124  }
    123125  else {
    124126      memset ((void *)fb_fix_info2.smem_start, 0, fb_fix_info2.smem_len);
     
    136138
    137139rtems_device_driver
    138 fbds_read (rtems_device_major_number major,
     140frame_buffer_read (rtems_device_major_number major,
    139141           rtems_device_minor_number minor, void *arg)
    140142{
     
    150152
    151153rtems_device_driver
    152 fbds_write (rtems_device_major_number major,
     154frame_buffer_write (rtems_device_major_number major,
    153155            rtems_device_minor_number minor, void *arg)
    154156{
     
    164166
    165167rtems_device_driver
    166 fbds_control (rtems_device_major_number major,
     168frame_buffer_control (rtems_device_major_number major,
    167169              rtems_device_minor_number minor, void *arg)
    168170{
     
    181183    break;
    182184  case FBIOGETCMAP:
    183     args->ioctl_return = get_palette( args->buffer );   
     185    args->ioctl_return = get_palette( (struct fb_cmap *) args->buffer );
    184186    break;
    185187  case FBIOPUTCMAP:
    186     args->ioctl_return = set_palette( args->buffer );     
     188    args->ioctl_return = set_palette( (struct fb_cmap *) args->buffer );
    187189    break;
    188190
  • c/src/lib/libbsp/arm/nds/preinstall.am

    r7c11edfd r79d490aa  
    7171PREINSTALL_DIRS += $(PROJECT_INCLUDE)/nds/$(dirstamp)
    7272
    73 $(PROJECT_INCLUDE)/nds/fb.h: fb/fb.h $(PROJECT_INCLUDE)/nds/$(dirstamp)
    74         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nds/fb.h
    75 PREINSTALL_FILES += $(PROJECT_INCLUDE)/nds/fb.h
    76 
    7773$(PROJECT_INCLUDE)/nds/touchscreen.h: touchscreen/touchscreen.h $(PROJECT_INCLUDE)/nds/$(dirstamp)
    7874        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nds/touchscreen.h
Note: See TracChangeset for help on using the changeset viewer.