From 8f439a5b9a73b2c191b859c2f8430cccf2ad681e Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 20 Apr 2012 22:22:57 +0000 Subject: [PATCH] The fonts char.mt and char2.mt are included in the kernel is now. git-svn-id: svn://kolibrios.org@2640 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Vortex86MX-eng/Makefile | 3 +-- data/eng/Makefile | 3 +-- data/eng/fonts/char.mt | Bin 2304 -> 0 bytes data/eng/fonts/char2.mt | Bin 2560 -> 0 bytes data/rus/Makefile | 3 +-- data/rus/fonts/char.mt | Bin 2304 -> 0 bytes data/rus/fonts/char2.mt | Bin 2560 -> 0 bytes kernel/trunk/const.inc | 3 --- kernel/trunk/data32.inc | 7 ++----- .../fonts => kernel/trunk/gui}/char.mt | Bin .../fonts => kernel/trunk/gui}/char2.mt | Bin kernel/trunk/gui/font.inc | 8 ++++++++ kernel/trunk/kernel.asm | 8 ++++---- kernel/trunk/memmap.inc | 4 ++-- 14 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 data/eng/fonts/char.mt delete mode 100644 data/eng/fonts/char2.mt delete mode 100644 data/rus/fonts/char.mt delete mode 100644 data/rus/fonts/char2.mt rename {data/Vortex86MX-eng/fonts => kernel/trunk/gui}/char.mt (100%) rename {data/Vortex86MX-eng/fonts => kernel/trunk/gui}/char2.mt (100%) diff --git a/data/Vortex86MX-eng/Makefile b/data/Vortex86MX-eng/Makefile index c01360f166..42dda1ee2a 100644 --- a/data/Vortex86MX-eng/Makefile +++ b/data/Vortex86MX-eng/Makefile @@ -253,8 +253,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ File|Managers/icons.ini:File|Managers/ICONS.INI \ File|Managers/kfar.ini:File|Managers/KFAR.INI \ File|Managers/kfm.ini:File|Managers/KFM.INI \ - fonts/bold.chr:FONTS/BOLD.CHR fonts/char2.mt:FONTS/CHAR2.MT \ - fonts/char.mt:FONTS/CHAR.MT \ + fonts/bold.chr:FONTS/BOLD.CHR \ games/kosilka:GAMES/KOSILKA games/kosskin.gfx:GAMES/KOSSKIN.GFX \ games/reversi:GAMES/REVERSI games/rforces:GAMES/RFORCES \ games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \ diff --git a/data/eng/Makefile b/data/eng/Makefile index 372e603c65..170b50b8a9 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -261,8 +261,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ File|Managers/icons.ini:File|Managers/ICONS.INI \ File|Managers/kfar.ini:File|Managers/KFAR.INI \ File|Managers/kfm.ini:File|Managers/KFM.INI \ - fonts/bold.chr:FONTS/BOLD.CHR fonts/char2.mt:FONTS/CHAR2.MT \ - fonts/char.mt:FONTS/CHAR.MT \ + fonts/bold.chr:FONTS/BOLD.CHR \ games/checkers:GAMES/CHECKERS \ games/kosilka:GAMES/KOSILKA games/kosskin.gfx:GAMES/KOSSKIN.GFX \ games/reversi:GAMES/REVERSI games/rforces:GAMES/RFORCES \ diff --git a/data/eng/fonts/char.mt b/data/eng/fonts/char.mt deleted file mode 100644 index e9b702604c6fc4facf5c24387826ebb62ea13456..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2304 zcmd6o>tdrI5QWjuh&Dyolud22^8RnR-x<*U*$3D$(Q)oG9MHM{jHb1&lWKbHb${{n zvG@|bbBo9=&h4e_pP#>BhL~eo&kkxguFcDPytp-Y=R*w$5RG*-#<|gauk*FX@Uh}7 zs#Q6ENO8PFL=BCWrE>A+_qX`DqPpCJAGa^(;xLS5rb1O<6wE)6(HP~WtYT{K>uKk% z-fHSq$oEQdDG+%ah@3?c@2drpB#{n#m|K!6+$b$DyE+W3Np9n?npaJVLk8mLXUv|0 z`d1$P8>2G5uEUjXpvon>+|upBGiDmnG-Ceq=VMSkOU^ZC=SZZVRKqYR#WYj$%%Z9u zE44A!&amaYJBJ0{xJPRXudkGnRhZ|u%iD~Ka1e#$XDMc!@AtB8^5WHul^UZ{@@4gy zJM~1H2GbT<(&oi|S-PZ@Cjk+tqsExAjn3xG0LPIEhjH{FByt5&8-k7LxB*C(yi-iO zI%Ni=Gtll-iX@@1A*kxAVZO#yIpk<6t+2eP$Ab{>u?g;GX{TYZ0kLlCN-F2x3lkFa zaW}6v4^vroO{hht{O{|Livdv>F^FRekMjnMoqM+VFb^Wz4zK}9rMmV+Y_`|P>VOPD zPTy9Jrm9zjG9Js%K=l3t8|#qlT0xu7t`TSmz!|Ff2S3yh`KzlGY)$jFmHVBR!9!zC z*t~v;w3H`oPOzzVK~&g-TK0|~9;Rw-Sf9J)Qfek7Ne9VnRFh`0gImflVj7)E?lMNo zAXm_EV1s_-{5+Vbcyo_@}89*o4prwu-eA{A?^oy&ed5iLMVB|w8`*#Kxs1Z3;X z7|Dd_1}zW`o^`fOI_CwOS3}(lpuscQ^Dc}nb>P4v&Vr4dbsWp9Z8UjJ@iurGf_3^Z_;^Y1>Ch@(2Fc11Th&kvlmn};5 diff --git a/data/eng/fonts/char2.mt b/data/eng/fonts/char2.mt deleted file mode 100644 index d27525166328cdf80aa5cb1dbbc44ea46f4afc50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2560 zcmd5-O>f&c5G7Srrh_!L3LkPXWJ!xX)TaasqzT|sqH1TOLmK#y!yZx~=pSfrJ_OQV z-}i>3`+>bK&}mY?%y2&VW`;H@iitq|R!C1~&1|BTGVRyHaQNB+8QYuQqD(V|DEufh z^!;#m_lZbbXWIryZZwWS-XkJo=u7cY)Vv(aIZhjuCS#HcQYsUFbC#b8fYn$=$S5)jM7CLi!A|+DSTCK?j&~+=;`T64QI0p%4 z)VlGyO{W|0JGKl6VpuamG9Eq#e@-bdM3PVe5i4N+)G(e>4gS$eg})Kt4jyx{-{(K24H|XGp05#SX2V&=;bx3F;M$6P)ANL8e)zb^hknn;bgY#ESgy zdx%mv8hoK6TUN4xEmBAw0^9N$=RS0B77we75?y`mOTmP}$^yJ^Fi`#o0JdF?H!VP!OQZVCsx)#ivV8T;vQ^)amC%=H5>o`|A-VjDm9;EHYNv z`Tg*dgO)DWyg8!8J#x?ce)p06eLAA=Q|F_A-5;m!SOGZ;`zDA{SV*X#!>9D}r&$}? zmRwo1K%RylCX75*)z~5%o7=WH$5!<{Cnq3SC+TLp-EvBtd)V*y4?tSa@;sjb;cj8i zZ+5%Cce@+tFfGHjV}0mqn7U2Et%*HvWPg<^%0hb`Z-)t!*^v1I5(0e`cO87I%XfeN z0o|#J2tDW8%DI=W3wgP>!C&zBeRQ^t{MAP$flxeIbGRE= z1G-d=p6Q0w+gp2kON3#h2nsuG5HGOd5XAFB^lLmk0W&|v89MCyadAZED(YYj{WVvT z4%y5_tP0)NTE2;`%bG0XT!D2jhQ(uep^K{j0~LJh{QKf`n4!P!G2N0EB@AuD%CV~J zrO+i$uvp`M@XfJhDZ02Hm`(_{N8u$b>LSE@ko{1K8^ZnITXzU~Z?GWT52X&tdrI5QWjuh&Dyolud22^8RnR-x<*U*$3D$(Q)oG9MHM{jHb1&lWKbHb${{n zvG@|bbBo9=&h4e_pP#>BhL~eo&kkxguFcDPytp-Y=R*w$5RG*-#<|gauk*FX@Uh}7 zs#Q6ENO8PFL=BCWrE>A+_qX`DqPpCJAGa^(;xLS5rb1O<6wE)6(HP~WtYT{K>uKk% z-fHSq$oEQdDG+%ah@3?c@2drpB#{n#m|K!6+$b$DyE+W3Np9n?npaJVLk8mLXUv|0 z`d1$P8>2G5uEUjXpvon>+|upBGiDmnG-Ceq=VMSkOU^ZC=SZZVRKqYR#WYj$%%Z9u zE44A!&amaYJBJ0{xJPRXudkGnRhZ|u%iD~Ka1e#$XDMc!@AtB8^5WHul^UZ{@@4gy zJM~1H2GbT<(&oi|S-PZ@Cjk+tqsExAjn3xG0LPIEhjH{FByt5&8-k7LxB*C(yi-iO zI%Ni=Gtll-iX@@1A*kxAVZO#yIpk<6t+2eP$Ab{>u?g;GX{TYZ0kLlCN-F2x3lkFa zaW}6v4^vroO{hht{O{|Livdv>F^FRekMjnMoqM+VFb^Wz4zK}9rMmV+Y_`|P>VOPD zPTy9Jrm9zjG9Js%K=l3t8|#qlT0xu7t`TSmz!|Ff2S3yh`KzlGY)$jFmHVBR!9!zC z*t~v;w3H`oPOzzVK~&g-TK0|~9;Rw-Sf9J)Qfek7Ne9VnRFh`0gImflVj7)E?lMNo zAXm_EV1s_-{5+Vbcyo_@}89*o4prwu-eA{A?^oy&ed5iLMVB|w8`*#Kxs1Z3;X z7|Dd_1}zW`o^`fOI_CwOS3}(lpuscQ^Dc}nb>P4v&Vr4dbsWp9Z8UjJ@iurGf_3^Z_;^Y1>Ch@(2Fc11Th&kvlmn};5 diff --git a/data/rus/fonts/char2.mt b/data/rus/fonts/char2.mt deleted file mode 100644 index d27525166328cdf80aa5cb1dbbc44ea46f4afc50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2560 zcmd5-O>f&c5G7Srrh_!L3LkPXWJ!xX)TaasqzT|sqH1TOLmK#y!yZx~=pSfrJ_OQV z-}i>3`+>bK&}mY?%y2&VW`;H@iitq|R!C1~&1|BTGVRyHaQNB+8QYuQqD(V|DEufh z^!;#m_lZbbXWIryZZwWS-XkJo=u7cY)Vv(aIZhjuCS#HcQYsUFbC#b8fYn$=$S5)jM7CLi!A|+DSTCK?j&~+=;`T64QI0p%4 z)VlGyO{W|0JGKl6VpuamG9Eq#e@-bdM3PVe5i4N+)G(e>4gS$eg})Kt4jyx{-{(K24H|XGp05#SX2V&=;bx3F;M$6P)ANL8e)zb^hknn;bgY#ESgy zdx%mv8hoK6TUN4xEmBAw0^9N$=RS0B77we75?y`mOTmP}$^yJ^Fi`#o0JdF?H!VP!OQZVCsx)#ivV8T;vQ^)amC%=H5>o`|A-VjDm9;EHYNv z`Tg*dgO)DWyg8!8J#x?ce)p06eLAA=Q|F_A-5;m!SOGZ;`zDA{SV*X#!>9D}r&$}? zmRwo1K%RylCX75*)z~5%o7=WH$5!<{Cnq3SC+TLp-EvBtd)V*y4?tSa@;sjb;cj8i zZ+5%Cce@+tFfGHjV}0mqn7U2Et%*HvWPg<^%0hb`Z-)t!*^v1I5(0e`cO87I%XfeN z0o|#J2tDW8%DI=W3wgP>!C&zBeRQ^t{MAP$flxeIbGRE= z1G-d=p6Q0w+gp2kON3#h2nsuG5HGOd5XAFB^lLmk0W&|v89MCyadAZED(YYj{WVvT z4%y5_tP0)NTE2;`%bG0XT!D2jhQ(uep^K{j0~LJh{QKf`n4!P!G2N0EB@AuD%CV~J zrO+i$uvp`M@XfJhDZ02Hm`(_{N8u$b>LSE@ko{1K8^ZnITXzU~Z?GWT52X& 6DBFF stack at boot time (4Kb) ; -; 0x8006DC00 -> 6E5FF basic text font II -; 0x8006E600 -> 6Efff basic text font I +; 0x8006DC00 -> 6E5FF free (2560) +; 0x8006E600 -> 6Efff free (2560) ; 0x8006F000 -> 6FFFF main page directory ; 0x80070000 -> 7FFFF data of retrieved disks and partitions (Mario79)