summaryrefslogtreecommitdiff
path: root/libdrm
diff options
context:
space:
mode:
authorMaarten Maathuis <madman2003@gmail.com>2008-07-05 12:04:07 +0200
committerMaarten Maathuis <madman2003@gmail.com>2008-07-05 12:04:07 +0200
commit7cbc5f6145046f3775e3b3ca2862bfb71831ec44 (patch)
treec2a08b63bf94dfcfeb995fcb43a393a5c3fcbc10 /libdrm
parentbe31a0fa73272b9c727668096ba652ea748a9735 (diff)
modesetting-101: Make the interface variable names a little more consistent + modeprint changes.
- All things are now called _id when they are id's. - modeprint now accepts driver name as first argument.
Diffstat (limited to 'libdrm')
-rw-r--r--libdrm/xf86drmMode.c21
-rw-r--r--libdrm/xf86drmMode.h10
2 files changed, 13 insertions, 18 deletions
diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index ca21a961..c3921ee9 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -284,11 +284,6 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
{
struct drm_mode_crtc crtc;
- crtc.count_connectors = 0;
- crtc.connectors = 0;
- crtc.count_possibles = 0;
- crtc.possibles = 0;
-
crtc.x = x;
crtc.y = y;
crtc.crtc_id = crtcId;
@@ -343,8 +338,8 @@ drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id)
enc.encoder_id = encoder_id;
enc.encoder_type = 0;
- enc.crtcs = 0;
- enc.clones = 0;
+ enc.possible_crtcs = 0;
+ enc.possible_clones = 0;
if (ioctl(fd, DRM_IOCTL_MODE_GETENCODER, &enc))
return 0;
@@ -353,10 +348,10 @@ drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id)
return 0;
r->encoder_id = enc.encoder_id;
- r->crtc = enc.crtc;
+ r->crtc_id = enc.crtc_id;
r->encoder_type = enc.encoder_type;
- r->crtcs = enc.crtcs;
- r->clones = enc.clones;
+ r->possible_crtcs = enc.possible_crtcs;
+ r->possible_clones = enc.possible_clones;
return r;
}
@@ -370,7 +365,7 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
struct drm_mode_get_connector conn;
drmModeConnectorPtr r = NULL;
- conn.connector = connector_id;
+ conn.connector_id = connector_id;
conn.connector_type_id = 0;
conn.connector_type = 0;
conn.count_modes = 0;
@@ -402,8 +397,8 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
goto err_allocs;
}
- r->connector_id = conn.connector;
- r->encoder = conn.encoder;
+ r->connector_id = conn.connector_id;
+ r->encoder_id = conn.encoder_id;
r->connection = conn.connection;
r->mmWidth = conn.mm_width;
r->mmHeight = conn.mm_height;
diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 3e2f5c0e..59612a94 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -92,7 +92,7 @@ typedef struct _drmModeCrtc {
unsigned int crtc_id;
unsigned int buffer_id; /**< FB id to connect to 0 = disconnect */
- uint32_t x, y; /**< Position on the frameuffer */
+ uint32_t x, y; /**< Position on the framebuffer */
uint32_t width, height;
int mode_valid;
struct drm_mode_modeinfo mode;
@@ -104,9 +104,9 @@ typedef struct _drmModeCrtc {
typedef struct _drmModeEncoder {
unsigned int encoder_id;
unsigned int encoder_type;
- uint32_t crtc;
- uint32_t crtcs;
- uint32_t clones;
+ unsigned int crtc_id;
+ uint32_t possible_crtcs;
+ uint32_t possible_clones;
} drmModeEncoder, *drmModeEncoderPtr;
typedef enum {
@@ -126,7 +126,7 @@ typedef enum {
typedef struct _drmModeConnector {
unsigned int connector_id;
- unsigned int encoder; /**< Encoder currently connected to */
+ unsigned int encoder_id; /**< Encoder currently connected to */
unsigned int connector_type;
unsigned int connector_type_id;
drmModeConnection connection;