diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2007-07-02 19:50:23 +0200 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2007-07-02 19:50:23 +0200 |
| commit | 8a6fb613d6f18d33aef84460fac0fe59bc00f729 (patch) | |
| tree | c445426b0a8dd2756d6b9d045d66cb5f9ca5c24c /include | |
| parent | 214b9f80bf2b4935df8890cb9c6bb9aeb807ba80 (diff) | |
avivo: code cleanup.
Diffstat (limited to 'include')
| -rw-r--r-- | include/avivo.h | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/include/avivo.h b/include/avivo.h index da54946..e74de92 100644 --- a/include/avivo.h +++ b/include/avivo.h @@ -39,8 +39,8 @@ #include <pciaccess.h> #endif -#define AVIVO_NAME "Avivo-v0.2.90" -#define AVIVO_DRIVER_NAME "avivo-v0.2.90" +#define AVIVO_NAME "Avivo-v0.2.90" +#define AVIVO_DRIVER_NAME "avivo-v0.2.90" #define AVIVO_DRIVER_VERSION 1000 #define RADEON_VBIOS_SIZE 0x00010000 @@ -195,8 +195,6 @@ struct avivo_info INT16 cursor_x, cursor_y; }; -int avivo_probe_info(ScrnInfoPtr screen_info); - /* * avivo chipset */ @@ -205,27 +203,29 @@ void avivo_get_chipset(struct avivo_info *avivo); /* * avivo common functions */ -void radeon_set_indexed(ScrnInfoPtr screen_info, - unsigned int index_offset, - unsigned int data_offset, - unsigned int offset, - unsigned int value); -unsigned int radeon_get_indexed(ScrnInfoPtr screen_info, - unsigned int index_offset, - unsigned int data_offset, - unsigned int offset); -unsigned int radeon_get_mc(ScrnInfoPtr screen_info, unsigned int offset); -void radeon_set_mc(ScrnInfoPtr screen_info, - unsigned int offset, - unsigned int value); +void avivo_set_indexed(ScrnInfoPtr screen_info, + unsigned int index_offset, + unsigned int data_offset, + unsigned int offset, + unsigned int value); +unsigned int avivo_get_indexed(ScrnInfoPtr screen_info, + unsigned int index_offset, + unsigned int data_offset, + unsigned int offset); +unsigned int avivo_get_mc(ScrnInfoPtr screen_info, unsigned int offset); +void avivo_set_mc(ScrnInfoPtr screen_info, + unsigned int offset, + unsigned int value); struct avivo_info *avivo_get_info(ScrnInfoPtr screen_info); - /* * avivo state handling */ +void avivo_wait_idle(struct avivo_info *avivo); void avivo_restore_state(ScrnInfoPtr screen_info); void avivo_save_state(ScrnInfoPtr screen_info); +void avivo_restore_cursor(ScrnInfoPtr screen_info); +void avivo_save_cursor(ScrnInfoPtr screen_info); /* * avivo crtc handling @@ -236,7 +236,7 @@ Bool avivo_crtc_create(ScrnInfoPtr screen_info); * avivo output handling */ Bool avivo_output_exist(ScrnInfoPtr screen_info, xf86ConnectorType type, - int number, unsigned long ddc_reg); + int number, unsigned long ddc_reg); Bool avivo_output_init(ScrnInfoPtr screen_info, xf86ConnectorType type, int number, unsigned long ddc_reg); @@ -247,16 +247,6 @@ Bool avivo_output_setup(ScrnInfoPtr screen_info); * avivo cursor handling */ void avivo_cursor_init(ScreenPtr screen); - - -void avivo_wait_idle(struct avivo_info *avivo); - -void avivo_probe_monitor(ScrnInfoPtr screen_info); - -void avivo_restore_cursor(ScrnInfoPtr screen_info); - -void avivo_save_cursor(ScrnInfoPtr screen_info); - void avivo_setup_cursor(struct avivo_info *avivo, int id, int enable); #endif /* _AVIVO_H_ */ |