diff options
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm_mode.h | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/shared-core/drm_mode.h b/shared-core/drm_mode.h index 01e6c7e7..e6daa7ca 100644 --- a/shared-core/drm_mode.h +++ b/shared-core/drm_mode.h @@ -81,14 +81,14 @@ #define DRM_MODE_DITHERING_ON 1 struct drm_mode_modeinfo { - unsigned int clock; - unsigned short hdisplay, hsync_start, hsync_end, htotal, hskew; - unsigned short vdisplay, vsync_start, vsync_end, vtotal, vscan; + uint32_t clock; + uint16_t hdisplay, hsync_start, hsync_end, htotal, hskew; + uint16_t vdisplay, vsync_start, vsync_end, vtotal, vscan; - unsigned int vrefresh; /* vertical refresh * 1000 */ + uint32_t vrefresh; /* vertical refresh * 1000 */ - unsigned int flags; - unsigned int type; + uint32_t flags; + uint32_t type; char name[DRM_DISPLAY_MODE_LEN]; }; @@ -97,25 +97,25 @@ struct drm_mode_card_res { uint64_t crtc_id_ptr; uint64_t connector_id_ptr; uint64_t encoder_id_ptr; - int count_fbs; - int count_crtcs; - int count_connectors; - int count_encoders; - int min_width, max_width; - int min_height, max_height; + uint32_t count_fbs; + uint32_t count_crtcs; + uint32_t count_connectors; + uint32_t count_encoders; + uint32_t min_width, max_width; + uint32_t min_height, max_height; }; struct drm_mode_crtc { uint64_t set_connectors_ptr; - int count_connectors; + uint32_t count_connectors; unsigned int crtc_id; /**< Id */ unsigned int fb_id; /**< Id of framebuffer */ - int x, y; /**< Position on the frameuffer */ + uint32_t x, y; /**< Position on the frameuffer */ uint32_t gamma_size; - int mode_valid; + uint32_t mode_valid; struct drm_mode_modeinfo mode; }; @@ -126,12 +126,11 @@ struct drm_mode_crtc { #define DRM_MODE_ENCODER_TVDAC 4 struct drm_mode_get_encoder { - - unsigned int encoder_type; unsigned int encoder_id; - unsigned int crtc_id; /**< Id of crtc */ + uint32_t encoder_type; + uint32_t possible_crtcs; uint32_t possible_clones; }; @@ -167,18 +166,18 @@ struct drm_mode_get_connector { uint64_t props_ptr; uint64_t prop_values_ptr; - int count_modes; - int count_props; - int count_encoders; + uint32_t count_modes; + uint32_t count_props; + uint32_t count_encoders; unsigned int encoder_id; /**< Current Encoder */ unsigned int connector_id; /**< Id */ unsigned int connector_type; unsigned int connector_type_id; - unsigned int connection; - unsigned int mm_width, mm_height; /**< HxW in millimeters */ - unsigned int subpixel; + uint32_t connection; + uint32_t mm_width, mm_height; /**< HxW in millimeters */ + uint32_t subpixel; }; #define DRM_MODE_PROP_PENDING (1<<0) @@ -197,11 +196,11 @@ struct drm_mode_get_property { uint64_t enum_blob_ptr; /* enum and blob id ptrs */ unsigned int prop_id; - unsigned int flags; + uint32_t flags; unsigned char name[DRM_PROP_NAME_LEN]; - int count_values; - int count_enum_blobs; + uint32_t count_values; + uint32_t count_enum_blobs; }; struct drm_mode_connector_set_property { @@ -218,11 +217,12 @@ struct drm_mode_get_blob { struct drm_mode_fb_cmd { unsigned int buffer_id; - unsigned int width, height; - unsigned int pitch; - unsigned int bpp; - unsigned int handle; - unsigned int depth; + uint32_t width, height; + uint32_t pitch; + uint32_t bpp; + uint32_t depth; + + uint64_t handle; }; struct drm_mode_mode_cmd { @@ -248,13 +248,14 @@ struct drm_mode_mode_cmd { * y */ struct drm_mode_cursor { - unsigned int flags; - unsigned int crtc; - int x; - int y; + uint32_t flags; + unsigned int crtc_id; + int32_t x; + int32_t y; uint32_t width; uint32_t height; - unsigned int handle; + /* driver specific handle */ + uint64_t handle; }; /* @@ -265,8 +266,7 @@ struct drm_mode_hotplug { }; struct drm_mode_crtc_lut { - - uint32_t crtc_id; + unsigned int crtc_id; uint32_t gamma_size; /* pointers to arrays */ |