Build 'videocore' rather than 'fbdev'.

Currently, this is functionally identical.

4 files changed, 17 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index 6010c70..6dbc141 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,10 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xf86-video-fbdev],
+AC_INIT([xf86-video-videocore],
         [0.4.2],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-        [xf86-video-fbdev])
+        [xf86-video-videocore])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
@@ -84,7 +84,7 @@ fi
 
 AC_SUBST([moduledir])
 
-DRIVER_NAME=fbdev
+DRIVER_NAME=videocore
 AC_SUBST([DRIVER_NAME])
 
 AC_CONFIG_FILES([
diff --git a/man/fbdev.man b/man/videocore.man
index bda0ed6..bda0ed6 100644
--- a/man/fbdev.man
+++ b/man/videocore.man
diff --git a/src/Makefile.am b/src/Makefile.am
index 1203177..825997c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,9 +24,9 @@
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 AM_CFLAGS = @XORG_CFLAGS@
-fbdev_drv_la_LTLIBRARIES = fbdev_drv.la
-fbdev_drv_la_LDFLAGS = -module -avoid-version
-fbdev_drv_ladir = @moduledir@/drivers
+videocore_drv_la_LTLIBRARIES = videocore_drv.la
+videocore_drv_la_LDFLAGS = -module -avoid-version
+videocore_drv_ladir = @moduledir@/drivers
 
-fbdev_drv_la_SOURCES = \
-         fbdev.c
+videocore_drv_la_SOURCES = \
+         videocore.c
diff --git a/src/fbdev.c b/src/videocore.c
index 794adfb..a3db21f 100644
--- a/src/fbdev.c
+++ b/src/videocore.c
@@ -80,8 +80,8 @@ enum { FBDEV_ROTATE_NONE=0, FBDEV_ROTATE_CW=270, FBDEV_ROTATE_UD=180, FBDEV_ROTA
 static int pix24bpp = 0;
 
 #define FBDEV_VERSION		4000
-#define FBDEV_NAME		"FBDEV"
-#define FBDEV_DRIVER_NAME	"fbdev"
+#define FBDEV_NAME		"VIDEOCORE"
+#define FBDEV_DRIVER_NAME	"videocore"
 
 #ifdef XSERVER_LIBPCIACCESS
 static const struct pci_id_match fbdev_device_match[] = {
@@ -94,7 +94,7 @@ static const struct pci_id_match fbdev_device_match[] = {
 };
 #endif
 
-_X_EXPORT DriverRec FBDEV = {
+_X_EXPORT DriverRec VIDEOCORE = {
 	FBDEV_VERSION,
 	FBDEV_DRIVER_NAME,
 #if 0
@@ -139,11 +139,11 @@ static const OptionInfoRec FBDevOptions[] = {
 
 #ifdef XFree86LOADER
 
-MODULESETUPPROTO(FBDevSetup);
+MODULESETUPPROTO(VideoCoreSetup);
 
-static XF86ModuleVersionInfo FBDevVersRec =
+static XF86ModuleVersionInfo VideoCoreVersRec =
 {
-	"fbdev",
+	"videocore",
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
@@ -155,16 +155,16 @@ static XF86ModuleVersionInfo FBDevVersRec =
 	{0,0,0,0}
 };
 
-_X_EXPORT XF86ModuleData fbdevModuleData = { &FBDevVersRec, FBDevSetup, NULL };
+_X_EXPORT XF86ModuleData videocoreModuleData = { &VideoCoreVersRec, VideoCoreSetup, NULL };
 
 pointer
-FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+VideoCoreSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
 	static Bool setupDone = FALSE;
 
 	if (!setupDone) {
 		setupDone = TRUE;
-		xf86AddDriver(&FBDEV, module, HaveDriverFuncs);
+		xf86AddDriver(&VIDEOCORE, module, HaveDriverFuncs);
 		return (pointer)1;
 	} else {
 		if (errmaj) *errmaj = LDR_ONCEONLY;