From 6b82f99a8b533ba59f1e302e40e12a6ec0ec37f6 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Sat, 24 Mar 2012 12:51:49 +0000 Subject: [PATCH] 1) Fix for r. 2485 2) Corrected memmap.inc git-svn-id: svn://kolibrios.org@2504 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/const.inc | 2 +- kernel/trunk/memmap.inc | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/kernel/trunk/const.inc b/kernel/trunk/const.inc index cd9ab05c64..012fe90c16 100644 --- a/kernel/trunk/const.inc +++ b/kernel/trunk/const.inc @@ -289,7 +289,7 @@ BgrAuxTable equ (OS_BASE+0x0298000) SB16Buffer equ (OS_BASE+0x02A0000) SB16_Status equ (OS_BASE+0x02B0000) -BUTTON_INFO equ (OS_BASE+0x02C0000) +BUTTON_INFO equ (OS_BASE+0x02B3FFE) BPSLine_calc_area equ (OS_BASE+0x02C4000) d_width_calc_area equ (OS_BASE+0x02CA000) diff --git a/kernel/trunk/memmap.inc b/kernel/trunk/memmap.inc index c47c92a777..5e3abfdd19 100644 --- a/kernel/trunk/memmap.inc +++ b/kernel/trunk/memmap.inc @@ -204,15 +204,18 @@ ; 0x80284000 -> 28BFFF HDD DMA AREA (32k) ; 0x8028C000 -> 297FFF free (48k) ; -; 0x80298000 -> 29ffff auxiliary table for background smoothing code (32k) +; 0x80298000 -> 29FFFF auxiliary table for background smoothing code (32k) ; -; 0x802A0000 -> 2B00ff wav device buffer (64k) -; 0x802A0000 -> 2B00ff wav device status (256) -; 0x802B0100 -> 2Bffff free (63k8) -; 0x802C0000 -> 2C3fff button info (8k) +; 0x802A0000 -> 2B00FF wav device buffer (64k) +; 0x802A0000 -> 2B00FF wav device status (256) ; -; 0000 word number of buttons -; first button entry at 0x10 +; 0x802B0100 -> 2B3FFD free (15k7) +; +; 0x802B3FFE -> 2C3FFF button info (64K + 2 byte) +; 2B3FFE 0000 word number of buttons +; 2B4000 first button entry +; +; button entry at 0x10 ; +0000 word process number ; +0002 word button id number : bits 00-15 ; +0004 word x start