Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6241 → Rev 6282

/drivers/ddk/core.S
67,8 → 67,10
 
.global _RegService
 
.global _SetFramebuffer
 
.global _SetKeyboardData
.global _SetMouseData
.global _SetKeyboardData
 
.global _SetScreen
.global _SysMsgBoardStr
148,9 → 150,10
 
.def _RegService; .scl 2; .type 32; .endef
 
.def _SetFramebuffer; .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 _SetMouseData; .scl 2; .type 32; .endef
.def _SetKeyboardData; .scl 2; .type 32; .endef
.def _SysMsgBoardStr; .scl 2; .type 32; .endef
 
.def _TimerHS; .scl 2; .type 32; .endef
226,9 → 229,9
_RaiseEvent:
_RegService:
 
_SetFramebuffer:
_SetKeyboardData:
_SetMouseData:
_SetKeyboardData:
 
_SetScreen:
_SysMsgBoardStr:
 
307,9 → 310,9
 
.ascii " -export:RegService" # stdcall
 
.ascii " -export:SetFramebuffer" # fastcall
.ascii " -export:SetKeyboardData" # stdcall
.ascii " -export:SetMouseData" # stdcall
.ascii " -export:SetKeyboardData" # stdcall
 
.ascii " -export:SetScreen" # stdcall
.ascii " -export:SysMsgBoardStr" # stdcall
 
/drivers/ddk/linux/firmware.c
110,7 → 110,7
kfree((void*)fw);
}
}
 
/*
struct platform_device*
platform_device_register_simple(const char* c, int id, void *r, unsigned int i)
{
118,5 → 118,5
 
return &pd;
};
*/
 
 
/drivers/include/display.h
1,6 → 1,15
 
typedef struct tag_object kobj_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
{
kobj_t header;
16,6 → 25,21
#define KMS_CURSOR_WIDTH 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
{
u32 x;
24,7 → 48,7
u32 height;
u32 bpp;
u32 vrefresh;
void *lfb;
struct kos_framebuffer *current_lfb;
u32 lfb_pitch;
 
struct rw_semaphore win_map_lock;
55,5 → 79,4
 
extern display_t *os_display;
 
int init_cursor(cursor_t *cursor);
void __stdcall restore_cursor(int x, int y);
 
/drivers/include/linux/scatterlist.h
282,7 → 282,7
* Maximum number of entries that will be allocated in one piece, if
* 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