[PATCH v4 3/3] xfree86: remove board and vendor identifier strings from the configuration path

[Tiago Vignatti]

Mark them as obsolete and log a warning on the console, so config files can
still live with it.

ABI break.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
changes since v3:
- Mark this options as obsolete and warking the output instead break old
  config files.
- Removed man page entry (it had only for Vendor).

 hw/xfree86/common/xf86Config.c       |    2 --
 hw/xfree86/common/xf86str.h          |    2 --
 hw/xfree86/doc/man/xorg.conf.man.pre |    3 ---
 hw/xfree86/parser/Device.c           |   15 ++-------------
 hw/xfree86/parser/xf86Parser.h       |    2 --
 5 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 28786ba..129d8a5 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2189,8 +2189,6 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
 		conf_device->dev_identifier);
 
     devicep->identifier = conf_device->dev_identifier;
-    devicep->vendor = conf_device->dev_vendor;
-    devicep->board = conf_device->dev_board;
     devicep->chipset = conf_device->dev_chipset;
     devicep->ramdac = conf_device->dev_ramdac;
     devicep->driver = conf_device->dev_driver;
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index c9b261d..f082977 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -375,8 +375,6 @@ typedef enum {
 
 typedef struct {
    char *			identifier;
-   char *			vendor;
-   char *			board;
    char *			chipset;
    char *			ramdac;
    char *			driver;
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 6b3636f..3443e9b 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1455,9 +1455,6 @@ The entries that may be used in
 .B Monitor
 sections are described below.
 .TP 7
-.BI "VendorName  \*q" vendor \*q
-This optional entry specifies the monitor's manufacturer.
-.TP 7
 .BI "ModelName  \*q" model \*q
 This optional entry specifies the monitor's model.
 .TP 7
diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c
index d71abc6..2675686 100644
--- a/hw/xfree86/parser/Device.c
+++ b/hw/xfree86/parser/Device.c
@@ -123,14 +123,9 @@ xf86parseDeviceSection (void)
 			has_ident = TRUE;
 			break;
 		case VENDOR:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Vendor");
-			ptr->dev_vendor = val.str;
-			break;
 		case BOARD:
-			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
-				Error (QUOTE_MSG, "Board");
-			ptr->dev_board = val.str;
+			xf86parseError (OBSOLETE_MSG, xf86tokenString());
+			xf86getSubToken (&(ptr->dev_comment));
 			break;
 		case CHIPSET:
 			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
@@ -279,10 +274,6 @@ xf86printDeviceSection (FILE * cf, XF86ConfDevicePtr ptr)
 			fprintf (cf, "\tIdentifier  \"%s\"\n", ptr->dev_identifier);
 		if (ptr->dev_driver)
 			fprintf (cf, "\tDriver      \"%s\"\n", ptr->dev_driver);
-		if (ptr->dev_vendor)
-			fprintf (cf, "\tVendorName  \"%s\"\n", ptr->dev_vendor);
-		if (ptr->dev_board)
-			fprintf (cf, "\tBoardName   \"%s\"\n", ptr->dev_board);
 		if (ptr->dev_chipset)
 			fprintf (cf, "\tChipSet     \"%s\"\n", ptr->dev_chipset);
 		if (ptr->dev_card)
@@ -341,8 +332,6 @@ xf86freeDeviceList (XF86ConfDevicePtr ptr)
 	while (ptr)
 	{
 		TestFree (ptr->dev_identifier);
-		TestFree (ptr->dev_vendor);
-		TestFree (ptr->dev_board);
 		TestFree (ptr->dev_chipset);
 		TestFree (ptr->dev_card);
 		TestFree (ptr->dev_driver);
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index 337ad07..039ba1a 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -227,8 +227,6 @@ typedef struct
 {
 	GenericListRec list;
 	char *dev_identifier;
-	char *dev_vendor;
-	char *dev_board;
 	char *dev_chipset;
 	char *dev_busid;
 	char *dev_card;
-- 
1.7.1.226.g770c5