ramenu/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

ddk: update

Browse Source 
git-svn-id: svn://kolibrios.org@6282 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2016-02-22 08:52:35 +00:00
parent 4deb98e54d
commit e1e0ae1b7a
4 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/ddk/core.S
View File

@ -67,8 +67,10 @@
.global _RegService .global _RegService
.global _SetMouseData .global _SetFramebuffer
.global _SetKeyboardData .global _SetKeyboardData
.global _SetMouseData
.global _SetScreen .global _SetScreen
.global _SysMsgBoardStr .global _SysMsgBoardStr
@ -148,9 +150,10 @@
.def _RegService; .scl 2; .type 32; .endef .def _RegService; .scl 2; .type 32; .endef
.def _SetScreen; .scl 2; .type 32; .endef .def _SetFramebuffer; .scl 2; .type 32; .endef
.def _SetMouseData; .scl 2; .type 32; .endef
.def _SetKeyboardData; .scl 2; .type 32; .endef .def _SetKeyboardData; .scl 2; .type 32; .endef
.def _SetMouseData; .scl 2; .type 32; .endef
.def _SetScreen; .scl 2; .type 32; .endef
.def _SysMsgBoardStr; .scl 2; .type 32; .endef .def _SysMsgBoardStr; .scl 2; .type 32; .endef
.def _TimerHS; .scl 2; .type 32; .endef .def _TimerHS; .scl 2; .type 32; .endef
@ -226,9 +229,9 @@ _PciWrite8:
_RaiseEvent: _RaiseEvent:
_RegService: _RegService:
_SetMouseData: _SetFramebuffer:
_SetKeyboardData: _SetKeyboardData:
_SetMouseData:
_SetScreen: _SetScreen:
_SysMsgBoardStr: _SysMsgBoardStr:
@ -307,9 +310,9 @@ _WaitEventTimeout:
.ascii " -export:RegService" # stdcall .ascii " -export:RegService" # stdcall
.ascii " -export:SetMouseData" # stdcall .ascii " -export:SetFramebuffer" # fastcall
.ascii " -export:SetKeyboardData" # stdcall .ascii " -export:SetKeyboardData" # stdcall
.ascii " -export:SetMouseData" # stdcall
.ascii " -export:SetScreen" # stdcall .ascii " -export:SetScreen" # stdcall
.ascii " -export:SysMsgBoardStr" # stdcall .ascii " -export:SysMsgBoardStr" # stdcall

4
drivers/ddk/linux/firmware.c
View File

@ -110,7 +110,7 @@ release_firmware(const struct firmware *fw)
kfree((void*)fw); kfree((void*)fw);
} }
} }
/*
struct platform_device* struct platform_device*
platform_device_register_simple(const char* c, int id, void *r, unsigned int i) platform_device_register_simple(const char* c, int id, void *r, unsigned int i)
{ {
@ -118,5 +118,5 @@ platform_device_register_simple(const char* c, int id, void *r, unsigned int i)
return &pd; return &pd;
}; };
*/

31
drivers/include/display.h
View File

@ -1,6 +1,15 @@
typedef struct tag_object kobj_t;
typedef struct tag_display display_t; typedef struct tag_display display_t;
struct tag_object
{
uint32_t magic;
void *destroy;
kobj_t *fd;
kobj_t *bk;
uint32_t pid;
};
typedef struct typedef struct
{ {
kobj_t header; kobj_t header;
@ -16,6 +25,21 @@ typedef struct
#define KMS_CURSOR_WIDTH 64 #define KMS_CURSOR_WIDTH 64
#define KMS_CURSOR_HEIGHT 64 #define KMS_CURSOR_HEIGHT 64
struct kos_framebuffer
{
struct list_head list;
uint32_t magic;
uint32_t handle;
void *destructor;
uint32_t width;
uint32_t height;
uint32_t pitch;
uint32_t format;
void *private;
uint32_t pde[8];
};
struct tag_display struct tag_display
{ {
u32 x; u32 x;
@ -24,7 +48,7 @@ struct tag_display
u32 height; u32 height;
u32 bpp; u32 bpp;
u32 vrefresh; u32 vrefresh;
void *lfb; struct kos_framebuffer *current_lfb;
u32 lfb_pitch; u32 lfb_pitch;
struct rw_semaphore win_map_lock; struct rw_semaphore win_map_lock;
@ -55,5 +79,4 @@ struct tag_display
extern display_t *os_display; extern display_t *os_display;
int init_cursor(cursor_t *cursor);
void __stdcall restore_cursor(int x, int y);

2
drivers/include/linux/scatterlist.h
View File

@ -282,7 +282,7 @@ size_t sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents,
* Maximum number of entries that will be allocated in one piece, if * Maximum number of entries that will be allocated in one piece, if
* a list larger than this is required then chaining will be utilized. * a list larger than this is required then chaining will be utilized.
*/ */
#define SG_MAX_SINGLE_ALLOC (4*PAGE_SIZE / sizeof(struct scatterlist)) #define SG_MAX_SINGLE_ALLOC (8*PAGE_SIZE / sizeof(struct scatterlist))
/* /*
* sg page iterator * sg page iterator