This should have been part of r24675. Not sure what happened as I specified

the path on the commit line.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24676 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-03-30 11:42:32 +00:00
parent 6328832fba
commit e549b218af
1 changed files with 11 additions and 21 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Copyright 2005-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef VESA_INFO_H
@ -11,9 +11,13 @@
#include <PCI.h>
#define DEVICE_NAME "vesa"
#define VESA_ACCELERANT_NAME "vesa.accelerant"
#define VESA_MODES_BOOT_INFO "vesa_modes/v1"
struct vesa_mode {
uint16 width;
uint16 height;
uint8 bits_per_pixel;
};
struct vesa_shared_info {
int32 type;
@ -24,21 +28,12 @@ struct vesa_shared_info {
area_id registers_area; // area of memory mapped registers
area_id frame_buffer_area; // area of frame buffer
uint8 *frame_buffer; // pointer to frame buffer (visible by all apps!)
uint8 *frame_buffer;
// pointer to frame buffer (visible by all apps!)
uint8 *physical_frame_buffer;
};
struct vesa_info {
uint32 cookie_magic;
int32 open_count;
int32 id;
pci_info *pci;
uint8 *registers;
area_id registers_area;
struct vesa_shared_info *shared_info;
area_id shared_area;
uint8 *reloc_io;
area_id reloc_io_area;
uint32 vesa_mode_offset;
uint32 vesa_mode_count;
};
//----------------- ioctl() interface ----------------
@ -67,9 +62,4 @@ struct vga_planar_blit_args {
int32 bottom;
};
//----------------------------------------------------------
extern status_t vesa_init(vesa_info &info);
extern void vesa_uninit(vesa_info &info);
#endif /* VESA_INFO_H */