Sat Oct 1 22:16:25 2016 UTC ()
don't use const char for these types, many drivers write to them.

ok mrg


(maya)
diff -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h
diff -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server/dist/include/displaymode.h
cvs diff -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h (expand / switch to unified diff)

--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h 2016/08/10 07:44:34 1.1.1.4
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h 2016/10/01 22:16:25 1.2
@@ -96,27 +96,27 @@ typedef int (*QueryImageAttributesFuncPt @@ -96,27 +96,27 @@ typedef int (*QueryImageAttributesFuncPt
96 unsigned short *height, 96 unsigned short *height,
97 int *pitches, int *offsets); 97 int *pitches, int *offsets);
98 98
99typedef enum { 99typedef enum {
100 XV_OFF, 100 XV_OFF,
101 XV_PENDING, 101 XV_PENDING,
102 XV_ON 102 XV_ON
103} XvStatus; 103} XvStatus;
104 104
105/*** this is what the driver needs to fill out ***/ 105/*** this is what the driver needs to fill out ***/
106 106
107typedef struct { 107typedef struct {
108 int id; 108 int id;
109 const char *name; 109 /*const*/ char *name; /* dozens of drivers write to this value */
110 unsigned short width, height; 110 unsigned short width, height;
111 XvRationalRec rate; 111 XvRationalRec rate;
112} XF86VideoEncodingRec, *XF86VideoEncodingPtr; 112} XF86VideoEncodingRec, *XF86VideoEncodingPtr;
113 113
114typedef struct { 114typedef struct {
115 char depth; 115 char depth;
116 short class; 116 short class;
117} XF86VideoFormatRec, *XF86VideoFormatPtr; 117} XF86VideoFormatRec, *XF86VideoFormatPtr;
118 118
119typedef XvAttributeRec XF86AttributeRec, *XF86AttributePtr; 119typedef XvAttributeRec XF86AttributeRec, *XF86AttributePtr;
120 120
121typedef struct { 121typedef struct {
122 unsigned int type; 122 unsigned int type;
cvs diff -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server/dist/include/displaymode.h (expand / switch to unified diff)

--- xsrc/external/mit/xorg-server/dist/include/displaymode.h 2016/08/10 07:44:32 1.1.1.1
+++ xsrc/external/mit/xorg-server/dist/include/displaymode.h 2016/10/01 22:16:25 1.2
@@ -45,27 +45,28 @@ typedef enum { @@ -45,27 +45,28 @@ typedef enum {
45 MODE_ONE_WIDTH, /* only one width is supported */ 45 MODE_ONE_WIDTH, /* only one width is supported */
46 MODE_ONE_HEIGHT, /* only one height is supported */ 46 MODE_ONE_HEIGHT, /* only one height is supported */
47 MODE_ONE_SIZE, /* only one resolution is supported */ 47 MODE_ONE_SIZE, /* only one resolution is supported */
48 MODE_NO_REDUCED, /* monitor doesn't accept reduced blanking */ 48 MODE_NO_REDUCED, /* monitor doesn't accept reduced blanking */
49 MODE_BANDWIDTH, /* mode requires too much memory bandwidth */ 49 MODE_BANDWIDTH, /* mode requires too much memory bandwidth */
50 MODE_BAD = -2, /* unspecified reason */ 50 MODE_BAD = -2, /* unspecified reason */
51 MODE_ERROR = -1 /* error condition */ 51 MODE_ERROR = -1 /* error condition */
52} ModeStatus; 52} ModeStatus;
53 53
54/* Video mode */ 54/* Video mode */
55typedef struct _DisplayModeRec { 55typedef struct _DisplayModeRec {
56 struct _DisplayModeRec *prev; 56 struct _DisplayModeRec *prev;
57 struct _DisplayModeRec *next; 57 struct _DisplayModeRec *next;
58 const char *name; /* identifier for the mode */ 58 /* dozens of drivers write to this value */
 59 /*const*/ char *name; /* identifier for the mode */
59 ModeStatus status; 60 ModeStatus status;
60 int type; 61 int type;
61 62
62 /* These are the values that the user sees/provides */ 63 /* These are the values that the user sees/provides */
63 int Clock; /* pixel clock freq (kHz) */ 64 int Clock; /* pixel clock freq (kHz) */
64 int HDisplay; /* horizontal timing */ 65 int HDisplay; /* horizontal timing */
65 int HSyncStart; 66 int HSyncStart;
66 int HSyncEnd; 67 int HSyncEnd;
67 int HTotal; 68 int HTotal;
68 int HSkew; 69 int HSkew;
69 int VDisplay; /* vertical timing */ 70 int VDisplay; /* vertical timing */
70 int VSyncStart; 71 int VSyncStart;
71 int VSyncEnd; 72 int VSyncEnd;