[rtems commit] framebuffer: Add and use FRAMEBUFFER_DEVICE_0_NAME

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    311ba73f3a357b75f23607613e95230d375d51a8
Changeset: http://git.rtems.org/rtems/commit/?id=311ba73f3a357b75f23607613e95230d375d51a8

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Sun Jun 23 17:50:55 2013 +0200

framebuffer: Add and use FRAMEBUFFER_DEVICE_0_NAME

---

 c/src/lib/libbsp/arm/gumstix/fb/fb.c               |    2 +-
 c/src/lib/libbsp/arm/nds/fb/fb.c                   |    4 ++--
 c/src/lib/libbsp/i386/pc386/console/fb_cirrus.c    |    5 +++--
 c/src/lib/libbsp/i386/pc386/console/fb_vga.c       |    5 +++--
 .../shared/milkymist_framebuffer/framebuffer.c     |    5 ++---
 cpukit/libcsupport/include/rtems/framebuffer.h     |   10 ++++++++++
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/c/src/lib/libbsp/arm/gumstix/fb/fb.c b/c/src/lib/libbsp/arm/gumstix/fb/fb.c
index 5dc3b4e..f5c7029 100644
--- a/c/src/lib/libbsp/arm/gumstix/fb/fb.c
+++ b/c/src/lib/libbsp/arm/gumstix/fb/fb.c
@@ -99,7 +99,7 @@ frame_buffer_initialize(rtems_device_major_number major,
   /*
    * Register the device
    */
-  status = rtems_io_register_name ("/dev/fb0", major, 0);
+  status = rtems_io_register_name (FRAMEBUFFER_DEVICE_0_NAME, major, 0);
   if (status != RTEMS_SUCCESSFUL)
     {
       printk("Error registering FBSKYEYE device!\n");
diff --git a/c/src/lib/libbsp/arm/nds/fb/fb.c b/c/src/lib/libbsp/arm/nds/fb/fb.c
index 26989bb..1cde601 100644
--- a/c/src/lib/libbsp/arm/nds/fb/fb.c
+++ b/c/src/lib/libbsp/arm/nds/fb/fb.c
@@ -72,12 +72,12 @@ frame_buffer_initialize (rtems_device_major_number major,
   printk ("[+] framebuffer started\n");
 
   /* register the devices */
-  status = rtems_io_register_name ("/dev/fb0", major, 0);
+  status = rtems_io_register_name (FRAMEBUFFER_DEVICE_0_NAME, major, 0);
   if (status != RTEMS_SUCCESSFUL) {
     printk ("[!] error registering framebuffer\n");
     rtems_fatal_error_occurred (status);
   }
-  status = rtems_io_register_name ("/dev/fb1", major, 1);
+  status = rtems_io_register_name (FRAMEBUFFER_DEVICE_NAME "1", major, 1);
   if (status != RTEMS_SUCCESSFUL) {
     printk ("[!] error registering framebuffer\n");
     rtems_fatal_error_occurred (status);
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_cirrus.c b/c/src/lib/libbsp/i386/pc386/console/fb_cirrus.c
index 40ea570..1164636 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_cirrus.c
+++ b/c/src/lib/libbsp/i386/pc386/console/fb_cirrus.c
@@ -325,9 +325,10 @@ frame_buffer_initialize(
       /*
        * Register the device
        */
-      status = rtems_io_register_name ("/dev/fb0", major, 0);
+      status = rtems_io_register_name (FRAMEBUFFER_DEVICE_0_NAME, major, 0);
       if (status != RTEMS_SUCCESSFUL) {
-          printk("Error registering /dev/fb0 FB_CIRRUS framebuffer device!\n");
+          printk("Error registering " FRAMEBUFFER_DEVICE_0_NAME
+                 " FB_CIRRUS framebuffer device!\n");
           rtems_fatal_error_occurred( status );
       }
 
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c b/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
index 11f359c..444f44d 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
+++ b/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
@@ -80,9 +80,10 @@ rtems_device_driver frame_buffer_initialize(
   /*
    * Register the device
    */
-  status = rtems_io_register_name ("/dev/fb0", major, 0);
+  status = rtems_io_register_name (FRAMEBUFFER_DEVICE_0_NAME, major, 0);
   if (status != RTEMS_SUCCESSFUL) {
-    printk("Error registering /dev/fb0 FBVGA framebuffer device!\n");
+    printk("Error registering " FRAMEBUFFER_DEVICE_0_NAME
+           " FBVGA framebuffer device!\n");
     rtems_fatal_error_occurred( status );
   }
 
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_framebuffer/framebuffer.c b/c/src/lib/libbsp/lm32/shared/milkymist_framebuffer/framebuffer.c
index f7b9e5e..709c42b 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_framebuffer/framebuffer.c
+++ b/c/src/lib/libbsp/lm32/shared/milkymist_framebuffer/framebuffer.c
@@ -21,8 +21,7 @@
 #include "../include/system_conf.h"
 #include <rtems/libio.h>
 #include <rtems/fb.h>
-
-#define FRAMEBUFFER_DEVICE_NAME "/dev/fb"
+#include <rtems/framebuffer.h>
 
 static unsigned short int framebufferA[1024*768]
   __attribute__((aligned(32)));
@@ -149,7 +148,7 @@ rtems_device_driver frame_buffer_initialize(
   fb_fix.smem_start = (volatile char *)frontbuffer;
   MM_WRITE(MM_VGA_BASEADDRESS, (unsigned int)frontbuffer);
 
-  status = rtems_io_register_name(FRAMEBUFFER_DEVICE_NAME, major, 0);
+  status = rtems_io_register_name(FRAMEBUFFER_DEVICE_0_NAME, major, 0);
   if (status != RTEMS_SUCCESSFUL) {
     printk("Error registering frame buffer device!\n");
     rtems_fatal_error_occurred( status );
diff --git a/cpukit/libcsupport/include/rtems/framebuffer.h b/cpukit/libcsupport/include/rtems/framebuffer.h
index a0548d3..d1474e0 100644
--- a/cpukit/libcsupport/include/rtems/framebuffer.h
+++ b/cpukit/libcsupport/include/rtems/framebuffer.h
@@ -18,6 +18,8 @@
 #ifndef __RTEMS_FRAMEBUFFER_h__
 #define __RTEMS_FRAMEBUFFER_h__
 
+#include <rtems/io.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -29,6 +31,14 @@ extern "C" {
 #define FRAMEBUFFER_DEVICE_NAME "/dev/fb"
 
 /**
+ * @brief Standard device file path of first frame buffer device.
+ *
+ * This device is the default frame buffer device for the Microwindows Screen
+ * Driver.
+ */
+#define FRAMEBUFFER_DEVICE_0_NAME "/dev/fb0"
+
+/**
  *  This macro defines the standard device driver table entry for
  *  a frame buffer device driver.
  */