14 Sep
2007
14 Sep
'07
5:09 p.m.
Author: hpoussin
Date: Fri Sep 14 21:09:45 2007
New Revision: 29037
URL: http://svn.reactos.org/svn/reactos?rev=29037&view=rev
Log:
Add missing svn:eol-style=native property
Modified:
trunk/reactos/dll/keyboard/kbdbur/kbdbur.c (props changed)
trunk/reactos/dll/keyboard/kbdbur/kbdbur.def (props changed)
trunk/reactos/dll/keyboard/kbdbur/kbdbur.rc (props changed)
trunk/reactos/dll/keyboard/kbdfi/kbdfi.c (props changed)
trunk/reactos/dll/keyboard/kbdfi/kbdfi.def (props changed)
trunk/reactos/dll/keyboard/kbdfi/kbdfi.rc (props changed)
trunk/reactos/dll/keyboard/kbdit/kbdit.c (contents, props changed)
trunk/reactos/dll/keyboard/kbdit/kbdit.def (props changed)
trunk/reactos/dll/keyboard/kbdit/kbdit.rc (props changed)
trunk/reactos/dll/keyboard/kbdth/kbdth.c (props changed)
trunk/reactos/dll/keyboard/kbdth/kbdth.def (props changed)
trunk/reactos/dll/keyboard/kbdth/kbdth.rc (props changed)
trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c (props changed)
trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h (props changed)
trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc (props changed)
trunk/reactos/drivers/multimedia/audio/mpu401_nt4/portio.c (props changed)
trunk/reactos/drivers/multimedia/audio/mpu401_nt4/readme.txt (props changed)
trunk/reactos/drivers/multimedia/audio/mpu401_nt4/sbdebug.h (props changed)
trunk/reactos/drivers/multimedia/audio/mpu401_nt4/settings.c (props changed)
trunk/reactos/drivers/multimedia/audio/mpu401_nt4/test.c (props changed)
trunk/reactos/drivers/wdm/audio/sysaudio/main.c (props changed)
trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rc (props changed)
trunk/reactos/hal/halppc/generic/beep.c (props changed)
trunk/reactos/hal/halppc/generic/bus.c (props changed)
trunk/reactos/hal/halppc/generic/cmos.c (contents, props changed)
trunk/reactos/hal/halppc/generic/display.c (props changed)
trunk/reactos/hal/halppc/generic/dma.c (props changed)
trunk/reactos/hal/halppc/generic/drive.c (props changed)
trunk/reactos/hal/halppc/generic/enum.c (props changed)
trunk/reactos/hal/halppc/generic/fmutex.c (props changed)
trunk/reactos/hal/halppc/generic/font.c (props changed)
trunk/reactos/hal/halppc/generic/halinit.c (props changed)
trunk/reactos/hal/halppc/generic/ipi.c (props changed)
trunk/reactos/hal/halppc/generic/irql.c (props changed)
trunk/reactos/hal/halppc/generic/isa.c (props changed)
trunk/reactos/hal/halppc/generic/kdbg.c (props changed)
trunk/reactos/hal/halppc/generic/mca.c (props changed)
trunk/reactos/hal/halppc/generic/misc.c (props changed)
trunk/reactos/hal/halppc/generic/pci.c (props changed)
trunk/reactos/hal/halppc/generic/portio.c (props changed)
trunk/reactos/hal/halppc/generic/processor.c (props changed)
trunk/reactos/hal/halppc/generic/profil.c (contents, props changed)
trunk/reactos/hal/halppc/generic/pwroff.c (props changed)
trunk/reactos/hal/halppc/generic/reboot.c (props changed)
trunk/reactos/hal/halppc/generic/resource.c (props changed)
trunk/reactos/hal/halppc/generic/spinlock.c (props changed)
trunk/reactos/hal/halppc/generic/sysbus.c (props changed)
trunk/reactos/hal/halppc/generic/sysinfo.c (props changed)
trunk/reactos/hal/halppc/generic/systimer.S (contents, props changed)
trunk/reactos/hal/halppc/generic/time.c (props changed)
trunk/reactos/hal/halppc/generic/timer.c (props changed)
trunk/reactos/hal/halppc/include/apic.h (props changed)
trunk/reactos/hal/halppc/include/bus.h (props changed)
trunk/reactos/hal/halppc/include/hal.h (props changed)
trunk/reactos/hal/halppc/include/haldma.h (props changed)
trunk/reactos/hal/halppc/include/halirq.h (props changed)
trunk/reactos/hal/halppc/include/halp.h (props changed)
trunk/reactos/hal/halppc/include/ioapic.h (props changed)
trunk/reactos/hal/halppc/include/mps.h (props changed)
trunk/reactos/hal/halppc/up/halinit_up.c (props changed)
trunk/reactos/hal/halppc/up/halup.rc (props changed)
Propchange: trunk/reactos/dll/keyboard/kbdbur/kbdbur.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdbur/kbdbur.def
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdbur/kbdbur.rc
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdfi/kbdfi.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdfi/kbdfi.def
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdfi/kbdfi.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.c…
==============================================================================
--- trunk/reactos/dll/keyboard/kbdit/kbdit.c (original)
+++ trunk/reactos/dll/keyboard/kbdit/kbdit.c Fri Sep 14 21:09:45 2007
@@ -1,417 +1,417 @@
-/*
- * ReactOS Italian Keyboard layout
- * Copyright (C) 2007 ReactOS
- * License: LGPL, see: LGPL.txt
- *
- */
-
-#include <windows.h>
-#include <internal/kbd.h>
-
-#ifdef _M_IA64
-#define ROSDATA static __declspec(allocate(".data"))
-#else
-#ifdef _MSC_VER
-#pragma data_seg(".data")
-#define ROSDATA static
-#else
-#define ROSDATA static __attribute__((section(".data")))
-#endif
-#endif
-
-#define VK_EMPTY 0xff /* The non-existent VK */
-#define KSHIFT 0x001 /* Shift modifier */
-#define KCTRL 0x002 /* Ctrl modifier */
-#define KALT 0x004 /* Alt modifier */
-#define KEXT 0x100 /* Extended key code */
-#define KMULTI 0x200 /* Multi-key */
-#define KSPEC 0x400 /* Special key */
-#define KNUMP 0x800 /* Number-pad */
-#define KNUMS 0xc00 /* Special + number pad */
-#define KMEXT 0x300 /* Multi + ext */
-
-#define SHFT_INVALID 0x0F
-
-ROSDATA USHORT scancode_to_vk[] = {
-/* 00 */ VK_EMPTY,
-/* 01 */ VK_ESCAPE,
-/* 02 */ '1',
-/* 03 */ '2',
-/* 04 */ '3',
-/* 05 */ '4',
-/* 06 */ '5',
-/* 07 */ '6',
-/* 08 */ '7',
-/* 09 */ '8',
-/* 0a */ '9',
-/* 0b */ '0',
-/* 0c */ VK_OEM_4,
-/* 0d */ VK_OEM_6,
-/* 0e */ VK_BACK,
-/* 0f */ VK_TAB,
-/* 10 */ 'Q',
-/* 11 */ 'W',
-/* 12 */ 'E',
-/* 13 */ 'R',
-/* 14 */ 'T',
-/* 15 */ 'Y',
-/* 16 */ 'U',
-/* 17 */ 'I',
-/* 18 */ 'O',
-/* 19 */ 'P',
-/* 1a */ VK_OEM_1,
-/* 1b */ VK_OEM_PLUS,
-/* 1c */ VK_RETURN,
-/* 1d */ VK_LCONTROL,
-/* 1e */ 'A',
-/* 1f */ 'S',
-/* 20 */ 'D',
-/* 21 */ 'F',
-/* 22 */ 'G',
-/* 23 */ 'H',
-/* 24 */ 'J',
-/* 25 */ 'K',
-/* 26 */ 'L',
-/* 27 */ VK_OEM_3,
-/* 28 */ VK_OEM_7,
-/* 29 */ VK_OEM_2,
-/* 2a */ VK_LSHIFT,
-/* 2b */ VK_OEM_5,
-/* 2c */ 'Z',
-/* 2d */ 'X',
-/* 2e */ 'C',
-/* 2f */ 'V',
-/* 30 */ 'B',
-/* 31 */ 'N',
-/* 32 */ 'M',
-/* 33 */ VK_OEM_COMMA,
-/* 34 */ VK_OEM_PERIOD,
-/* 35 */ VK_OEM_MINUS,
-/* 36 */ VK_RSHIFT,
-/* 37 */ VK_MULTIPLY,
-/* 38 */ VK_LMENU,
-/* 39 */ VK_SPACE,
-/* 3a */ VK_CAPITAL,
-/* 3b */ VK_F1,
-/* 3c */ VK_F2,
-/* 3d */ VK_F3,
-/* 3e */ VK_F4,
-/* 3f */ VK_F5,
-/* 40 */ VK_F6,
-/* 41 */ VK_F7,
-/* 42 */ VK_F8,
-/* 43 */ VK_F9,
-/* 44 */ VK_F10,
-/* 45 */ VK_NUMLOCK | KMEXT,
-/* 46 */ VK_SCROLL | KMULTI,
-/* 47 */ VK_HOME | KNUMS,
-/* 48 */ VK_UP | KNUMS,
-/* 49 */ VK_PRIOR | KNUMS,
-/* 4a */ VK_SUBTRACT,
-/* 4b */ VK_LEFT | KNUMS,
-/* 4c */ VK_CLEAR | KNUMS,
-/* 4d */ VK_RIGHT | KNUMS,
-/* 4e */ VK_ADD,
-/* 4f */ VK_END | KNUMS,
-/* 50 */ VK_DOWN | KNUMS,
-/* 51 */ VK_NEXT | KNUMS,
-/* 52 */ VK_INSERT | KNUMS,
-/* 53 */ VK_DELETE | KNUMS,
-/* 54 */ VK_SNAPSHOT,
-/* 55 */ VK_EMPTY,
-/* 56 */ VK_OEM_102,
-/* 57 */ VK_F11,
-/* 58 */ VK_F12,
-/* 59 */ VK_EMPTY,
-/* 5a */ VK_CLEAR,
-/* 5b */ VK_EMPTY,
-/* 5c */ VK_EMPTY,
-/* 5d */ VK_EMPTY,
-/* 5e */ VK_EMPTY, /* EREOF */
-/* 5f */ VK_EMPTY,
-/* 60 */ VK_EMPTY,
-/* 61 */ VK_EMPTY,
-/* 62 */ VK_EMPTY,
-/* 63 */ VK_EMPTY, /* ZOOM */
-/* 64 */ VK_HELP,
-/* 65 */ VK_F13,
-/* 66 */ VK_F14,
-/* 67 */ VK_F15,
-/* 68 */ VK_F16,
-/* 69 */ VK_F17,
-/* 6a */ VK_F18,
-/* 6b */ VK_F19,
-/* 6c */ VK_F20,
-/* 6d */ VK_F21,
-/* 6e */ VK_F22,
-/* 6f */ VK_F23,
-/* 70 */ VK_EMPTY,
-/* 71 */ VK_EMPTY,
-/* 72 */ VK_EMPTY,
-/* 73 */ VK_EMPTY,
-/* 74 */ VK_EMPTY,
-/* 75 */ VK_EMPTY,
-/* 76 */ VK_EMPTY,
-/* 77 */ VK_F24,
-/* 78 */ VK_EMPTY,
-/* 79 */ VK_EMPTY,
-/* 7a */ VK_EMPTY,
-/* 7b */ VK_EMPTY,
-/* 7c */ VK_EMPTY,
-/* 7d */ VK_EMPTY,
-/* 7e */ VK_EMPTY,
-/* 7f */ VK_EMPTY,
-/* 80 */ VK_EMPTY,
-/* 00 */ 0
-};
-
-ROSDATA VSC_VK extcode0_to_vk[] = {
- { 0, 0 },
-};
-
-ROSDATA VSC_VK extcode1_to_vk[] = {
- { 0, 0 },
-};
-
-ROSDATA VK_TO_BIT modifier_keys[] = {
- { VK_SHIFT, KSHIFT },
- { VK_CONTROL, KCTRL },
- { VK_MENU, KALT },
- { 0, 0 }
-};
-
-ROSDATA MODIFIERS modifier_bits = {
- modifier_keys,
- 6,
- { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 }
-};
-
-#define NOCAPS 0
-#define CAPS KSHIFT /* Caps -> shift */
-
-ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
- /* Normal vs Shifted */
- /* The numbers */
- { '1', NOCAPS, {'1', '!'} },
- { '2', NOCAPS, {'2', '"'} },
- { '3', NOCAPS, {'3', 0x00a3} },
- { '4', NOCAPS, {'4', '$'} },
- { '5', NOCAPS, {'5', '%'} },
- { '6', NOCAPS, {'6', '&'} },
- { '7', NOCAPS, {'7', '/'} },
- { '8', NOCAPS, {'8', '('} },
- { '9', NOCAPS, {'9', ')'} },
- { '0', NOCAPS, {'0', '='} },
-
- /* Specials */
- /* Ctrl-_ generates US */
- { VK_OEM_2 ,NOCAPS, {'\\', '|'} },
- { VK_OEM_4 ,NOCAPS, {'\'', '?'} },
- { VK_OEM_102 ,NOCAPS, {'<', '>'} },
- { VK_OEM_COMMA ,NOCAPS, {',', ';'} },
- { VK_OEM_PERIOD ,NOCAPS, {'.', ':'} },
- { VK_OEM_MINUS ,NOCAPS, {'-', '_'} },
- /* Keys that do not have shift states */
- { VK_TAB ,NOCAPS, {'\t','\t'} },
- { VK_ADD ,NOCAPS, {'+', '+'} },
- { VK_SUBTRACT,NOCAPS, {'-', '-'} },
- { VK_MULTIPLY,NOCAPS, {'*', '*'} },
- { VK_DIVIDE ,NOCAPS, {'/', '/'} },
- { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} },
- { VK_SPACE ,NOCAPS, {' ', ' '} },
- { VK_OEM_5 ,NOCAPS, {0x00f9, 0x00a7} },//ù§
- { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
- /* Normal, Shifted, Ctrl */
- /* Legacy (telnet-style) ascii escapes */
- { VK_RETURN,0, {'\r', '\r', '\n'} },
- { 0,0 }
-};
-
-ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
- /* Normal, Shifted, Ctrl, C-S-x */
- { VK_OEM_6, NOCAPS, {0x00ec, '^', WCH_NONE, '~' } },
- { VK_OEM_3, NOCAPS, {0x00f2, 0x00e7, WCH_NONE, '@' } },//òç
- { VK_OEM_7, NOCAPS, {0x00e0, 0x00b0, WCH_NONE, '#'} },//à°
-
- { VK_OEM_1, NOCAPS, {0x00e8, 0x00e9, '{', '['} },// èé
- { VK_OEM_PLUS,NOCAPS, {'+', '*', '}', ']'} },
-
- /* The alphabet */
- { 'A', CAPS, {'a', 'A', 0x01, 0x01} },
- { 'B', CAPS, {'b', 'B', 0x02, 0x02} },
- { 'C', CAPS, {'c', 'C', 0x03, 0x03} },
- { 'D', CAPS, {'d', 'D', 0x04, 0x04} },
- { 'E', CAPS, {'e', 'E', 0x05, 0x20AC} }, // eE
- { 'F', CAPS, {'f', 'F', 0x06, 0x06} },
- { 'G', CAPS, {'g', 'G', 0x07, 0x07} },
- { 'H', CAPS, {'h', 'H', 0x08, 0x08} },
- { 'I', CAPS, {'i', 'I', 0x09, 0x09} },
- { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} },
- { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} },
- { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} },
- { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} },
- { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} },
- { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} },
- { 'P', CAPS, {'p', 'P', 0x10, 0x10} },
- { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} },
- { 'R', CAPS, {'r', 'R', 0x12, 0x12} },
- { 'S', CAPS, {'s', 'S', 0x13, 0x13} },
- { 'T', CAPS, {'t', 'T', 0x14, 0x14} },
- { 'U', CAPS, {'u', 'U', 0x15, 0x15} },
- { 'V', CAPS, {'v', 'V', 0x16, 0x16} },
- { 'W', CAPS, {'w', 'W', 0x17, 0x17} },
- { 'X', CAPS, {'x', 'X', 0x18, 0x18} },
- { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} },
- { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} },
-
- /* Legacy Ascii generators */
-//zz { VK_OEM_MINUS, NOCAPS, {'\'', '?', WCH_NONE, 0x1f /* US */}
},
- { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
- { VK_NUMPAD0, 0, {'0'} },
- { VK_NUMPAD1, 0, {'1'} },
- { VK_NUMPAD2, 0, {'2'} },
- { VK_NUMPAD3, 0, {'3'} },
- { VK_NUMPAD4, 0, {'4'} },
- { VK_NUMPAD5, 0, {'5'} },
- { VK_NUMPAD6, 0, {'6'} },
- { VK_NUMPAD7, 0, {'7'} },
- { VK_NUMPAD8, 0, {'8'} },
- { VK_NUMPAD9, 0, {'9'} },
- { VK_DECIMAL, 0, {'.'} },
- { VK_BACK, 0, {'\010'} },
- { 0,0 }
-};
-
-#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
-
-ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
- vk_master(1,keypad_numbers),
- vk_master(2,key_to_chars_2mod),
- vk_master(3,key_to_chars_3mod),
- vk_master(4,key_to_chars_4mod),
- { 0,0,0 }
-};
-
-ROSDATA VSC_LPWSTR key_names[] = {
- { 0x00, L"" },
- { 0x01, L"Esc" },
- { 0x0e, L"Backspace" },
- { 0x0f, L"Tab" },
- { 0x1c, L"Enter" },
- { 0x1d, L"Ctrl" },
- { 0x2a, L"Shift" },
- { 0x36, L"Right Shift" },
- { 0x37, L"Num *" },
- { 0x38, L"Alt" },
- { 0x39, L"Space" },
- { 0x3a, L"Caps Lock" },
- { 0x3b, L"F1" },
- { 0x3c, L"F2" },
- { 0x3d, L"F3" },
- { 0x3e, L"F4" },
- { 0x3f, L"F5" },
- { 0x40, L"F6" },
- { 0x41, L"F7" },
- { 0x42, L"F8" },
- { 0x43, L"F9" },
- { 0x44, L"F10" },
- { 0x45, L"Pause" },
- { 0x46, L"Scroll Lock" },
- { 0x47, L"Num 7" },
- { 0x48, L"Num 8" },
- { 0x49, L"Num 9" },
- { 0x4a, L"Num -" },
- { 0x4b, L"Num 4" },
- { 0x4c, L"Num 5" },
- { 0x4d, L"Num 6" },
- { 0x4e, L"Num +" },
- { 0x4f, L"Num 1" },
- { 0x50, L"Num 2" },
- { 0x51, L"Num 3" },
- { 0x52, L"Num 0" },
- { 0x53, L"Num Del" },
- { 0x54, L"Sys Req" },
- { 0x57, L"F11" },
- { 0x58, L"F12" },
- { 0x7c, L"F13" },
- { 0x7d, L"F14" },
- { 0x7e, L"F15" },
- { 0x7f, L"F16" },
- { 0x80, L"F17" },
- { 0x81, L"F18" },
- { 0x82, L"F19" },
- { 0x83, L"F20" },
- { 0x84, L"F21" },
- { 0x85, L"F22" },
- { 0x86, L"F23" },
- { 0x87, L"F24" },
- { 0, NULL },
-};
-
-ROSDATA VSC_LPWSTR extended_key_names[] = {
- { 0x1c, L"Num Enter" },
- { 0x1d, L"Right Ctrl" },
- { 0x35, L"Num /" },
- { 0x37, L"Prnt Scrn" },
- { 0x38, L"Right Alt" },
- { 0x45, L"Num Lock" },
- { 0x46, L"Break" },
- { 0x47, L"Home" },
- { 0x48, L"Up" },
- { 0x49, L"Page Up" },
- { 0x4a, L"Left" },
- { 0x4c, L"Center" },
- { 0x4d, L"Right" },
- { 0x4f, L"End" },
- { 0x50, L"Down" },
- { 0x51, L"Page Down" },
- { 0x52, L"Insert" },
- { 0x53, L"Delete" },
- { 0x54, L"<ReactOS>" },
- { 0x55, L"Help" },
- { 0x56, L"Left Windows" },
- { 0x5b, L"Right Windows" },
- { 0, NULL },
-};
-
-/* Finally, the master table */
-ROSDATA KBDTABLES keyboard_layout_table = {
- /* modifier assignments */
- &modifier_bits,
-
- /* character from vk tables */
- vk_to_wchar_master_table,
-
- /* diacritical marks -- currently implemented by wine code */
- /* doesn't have any, anyway */
- NULL,
-
- /* Key names */
- (VSC_LPWSTR *)key_names,
- (VSC_LPWSTR *)extended_key_names,
- NULL, /* Dead key names */
-
- /* scan code to virtual key maps */
- scancode_to_vk,
- sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
- extcode0_to_vk,
- extcode1_to_vk,
-
- MAKELONG(0,1), /* Version 1.0 */
-
- /* Ligatures */
- 0,
- 0,
- NULL
-};
-
-PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
- return &keyboard_layout_table;
-}
-
+/*
+ * ReactOS Italian Keyboard layout
+ * Copyright (C) 2007 ReactOS
+ * License: LGPL, see: LGPL.txt
+ *
+ */
+
+#include <windows.h>
+#include <internal/kbd.h>
+
+#ifdef _M_IA64
+#define ROSDATA static __declspec(allocate(".data"))
+#else
+#ifdef _MSC_VER
+#pragma data_seg(".data")
+#define ROSDATA static
+#else
+#define ROSDATA static __attribute__((section(".data")))
+#endif
+#endif
+
+#define VK_EMPTY 0xff /* The non-existent VK */
+#define KSHIFT 0x001 /* Shift modifier */
+#define KCTRL 0x002 /* Ctrl modifier */
+#define KALT 0x004 /* Alt modifier */
+#define KEXT 0x100 /* Extended key code */
+#define KMULTI 0x200 /* Multi-key */
+#define KSPEC 0x400 /* Special key */
+#define KNUMP 0x800 /* Number-pad */
+#define KNUMS 0xc00 /* Special + number pad */
+#define KMEXT 0x300 /* Multi + ext */
+
+#define SHFT_INVALID 0x0F
+
+ROSDATA USHORT scancode_to_vk[] = {
+/* 00 */ VK_EMPTY,
+/* 01 */ VK_ESCAPE,
+/* 02 */ '1',
+/* 03 */ '2',
+/* 04 */ '3',
+/* 05 */ '4',
+/* 06 */ '5',
+/* 07 */ '6',
+/* 08 */ '7',
+/* 09 */ '8',
+/* 0a */ '9',
+/* 0b */ '0',
+/* 0c */ VK_OEM_4,
+/* 0d */ VK_OEM_6,
+/* 0e */ VK_BACK,
+/* 0f */ VK_TAB,
+/* 10 */ 'Q',
+/* 11 */ 'W',
+/* 12 */ 'E',
+/* 13 */ 'R',
+/* 14 */ 'T',
+/* 15 */ 'Y',
+/* 16 */ 'U',
+/* 17 */ 'I',
+/* 18 */ 'O',
+/* 19 */ 'P',
+/* 1a */ VK_OEM_1,
+/* 1b */ VK_OEM_PLUS,
+/* 1c */ VK_RETURN,
+/* 1d */ VK_LCONTROL,
+/* 1e */ 'A',
+/* 1f */ 'S',
+/* 20 */ 'D',
+/* 21 */ 'F',
+/* 22 */ 'G',
+/* 23 */ 'H',
+/* 24 */ 'J',
+/* 25 */ 'K',
+/* 26 */ 'L',
+/* 27 */ VK_OEM_3,
+/* 28 */ VK_OEM_7,
+/* 29 */ VK_OEM_2,
+/* 2a */ VK_LSHIFT,
+/* 2b */ VK_OEM_5,
+/* 2c */ 'Z',
+/* 2d */ 'X',
+/* 2e */ 'C',
+/* 2f */ 'V',
+/* 30 */ 'B',
+/* 31 */ 'N',
+/* 32 */ 'M',
+/* 33 */ VK_OEM_COMMA,
+/* 34 */ VK_OEM_PERIOD,
+/* 35 */ VK_OEM_MINUS,
+/* 36 */ VK_RSHIFT,
+/* 37 */ VK_MULTIPLY,
+/* 38 */ VK_LMENU,
+/* 39 */ VK_SPACE,
+/* 3a */ VK_CAPITAL,
+/* 3b */ VK_F1,
+/* 3c */ VK_F2,
+/* 3d */ VK_F3,
+/* 3e */ VK_F4,
+/* 3f */ VK_F5,
+/* 40 */ VK_F6,
+/* 41 */ VK_F7,
+/* 42 */ VK_F8,
+/* 43 */ VK_F9,
+/* 44 */ VK_F10,
+/* 45 */ VK_NUMLOCK | KMEXT,
+/* 46 */ VK_SCROLL | KMULTI,
+/* 47 */ VK_HOME | KNUMS,
+/* 48 */ VK_UP | KNUMS,
+/* 49 */ VK_PRIOR | KNUMS,
+/* 4a */ VK_SUBTRACT,
+/* 4b */ VK_LEFT | KNUMS,
+/* 4c */ VK_CLEAR | KNUMS,
+/* 4d */ VK_RIGHT | KNUMS,
+/* 4e */ VK_ADD,
+/* 4f */ VK_END | KNUMS,
+/* 50 */ VK_DOWN | KNUMS,
+/* 51 */ VK_NEXT | KNUMS,
+/* 52 */ VK_INSERT | KNUMS,
+/* 53 */ VK_DELETE | KNUMS,
+/* 54 */ VK_SNAPSHOT,
+/* 55 */ VK_EMPTY,
+/* 56 */ VK_OEM_102,
+/* 57 */ VK_F11,
+/* 58 */ VK_F12,
+/* 59 */ VK_EMPTY,
+/* 5a */ VK_CLEAR,
+/* 5b */ VK_EMPTY,
+/* 5c */ VK_EMPTY,
+/* 5d */ VK_EMPTY,
+/* 5e */ VK_EMPTY, /* EREOF */
+/* 5f */ VK_EMPTY,
+/* 60 */ VK_EMPTY,
+/* 61 */ VK_EMPTY,
+/* 62 */ VK_EMPTY,
+/* 63 */ VK_EMPTY, /* ZOOM */
+/* 64 */ VK_HELP,
+/* 65 */ VK_F13,
+/* 66 */ VK_F14,
+/* 67 */ VK_F15,
+/* 68 */ VK_F16,
+/* 69 */ VK_F17,
+/* 6a */ VK_F18,
+/* 6b */ VK_F19,
+/* 6c */ VK_F20,
+/* 6d */ VK_F21,
+/* 6e */ VK_F22,
+/* 6f */ VK_F23,
+/* 70 */ VK_EMPTY,
+/* 71 */ VK_EMPTY,
+/* 72 */ VK_EMPTY,
+/* 73 */ VK_EMPTY,
+/* 74 */ VK_EMPTY,
+/* 75 */ VK_EMPTY,
+/* 76 */ VK_EMPTY,
+/* 77 */ VK_F24,
+/* 78 */ VK_EMPTY,
+/* 79 */ VK_EMPTY,
+/* 7a */ VK_EMPTY,
+/* 7b */ VK_EMPTY,
+/* 7c */ VK_EMPTY,
+/* 7d */ VK_EMPTY,
+/* 7e */ VK_EMPTY,
+/* 7f */ VK_EMPTY,
+/* 80 */ VK_EMPTY,
+/* 00 */ 0
+};
+
+ROSDATA VSC_VK extcode0_to_vk[] = {
+ { 0, 0 },
+};
+
+ROSDATA VSC_VK extcode1_to_vk[] = {
+ { 0, 0 },
+};
+
+ROSDATA VK_TO_BIT modifier_keys[] = {
+ { VK_SHIFT, KSHIFT },
+ { VK_CONTROL, KCTRL },
+ { VK_MENU, KALT },
+ { 0, 0 }
+};
+
+ROSDATA MODIFIERS modifier_bits = {
+ modifier_keys,
+ 6,
+ { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 }
+};
+
+#define NOCAPS 0
+#define CAPS KSHIFT /* Caps -> shift */
+
+ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
+ /* Normal vs Shifted */
+ /* The numbers */
+ { '1', NOCAPS, {'1', '!'} },
+ { '2', NOCAPS, {'2', '"'} },
+ { '3', NOCAPS, {'3', 0x00a3} },
+ { '4', NOCAPS, {'4', '$'} },
+ { '5', NOCAPS, {'5', '%'} },
+ { '6', NOCAPS, {'6', '&'} },
+ { '7', NOCAPS, {'7', '/'} },
+ { '8', NOCAPS, {'8', '('} },
+ { '9', NOCAPS, {'9', ')'} },
+ { '0', NOCAPS, {'0', '='} },
+
+ /* Specials */
+ /* Ctrl-_ generates US */
+ { VK_OEM_2 ,NOCAPS, {'\\', '|'} },
+ { VK_OEM_4 ,NOCAPS, {'\'', '?'} },
+ { VK_OEM_102 ,NOCAPS, {'<', '>'} },
+ { VK_OEM_COMMA ,NOCAPS, {',', ';'} },
+ { VK_OEM_PERIOD ,NOCAPS, {'.', ':'} },
+ { VK_OEM_MINUS ,NOCAPS, {'-', '_'} },
+ /* Keys that do not have shift states */
+ { VK_TAB ,NOCAPS, {'\t','\t'} },
+ { VK_ADD ,NOCAPS, {'+', '+'} },
+ { VK_SUBTRACT,NOCAPS, {'-', '-'} },
+ { VK_MULTIPLY,NOCAPS, {'*', '*'} },
+ { VK_DIVIDE ,NOCAPS, {'/', '/'} },
+ { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} },
+ { VK_SPACE ,NOCAPS, {' ', ' '} },
+ { VK_OEM_5 ,NOCAPS, {0x00f9, 0x00a7} },//ù§
+ { 0, 0 }
+};
+
+ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
+ /* Normal, Shifted, Ctrl */
+ /* Legacy (telnet-style) ascii escapes */
+ { VK_RETURN,0, {'\r', '\r', '\n'} },
+ { 0,0 }
+};
+
+ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
+ /* Normal, Shifted, Ctrl, C-S-x */
+ { VK_OEM_6, NOCAPS, {0x00ec, '^', WCH_NONE, '~' } },
+ { VK_OEM_3, NOCAPS, {0x00f2, 0x00e7, WCH_NONE, '@' } },//òç
+ { VK_OEM_7, NOCAPS, {0x00e0, 0x00b0, WCH_NONE, '#'} },//à°
+
+ { VK_OEM_1, NOCAPS, {0x00e8, 0x00e9, '{', '['} },// èé
+ { VK_OEM_PLUS,NOCAPS, {'+', '*', '}', ']'} },
+
+ /* The alphabet */
+ { 'A', CAPS, {'a', 'A', 0x01, 0x01} },
+ { 'B', CAPS, {'b', 'B', 0x02, 0x02} },
+ { 'C', CAPS, {'c', 'C', 0x03, 0x03} },
+ { 'D', CAPS, {'d', 'D', 0x04, 0x04} },
+ { 'E', CAPS, {'e', 'E', 0x05, 0x20AC} }, // eE
+ { 'F', CAPS, {'f', 'F', 0x06, 0x06} },
+ { 'G', CAPS, {'g', 'G', 0x07, 0x07} },
+ { 'H', CAPS, {'h', 'H', 0x08, 0x08} },
+ { 'I', CAPS, {'i', 'I', 0x09, 0x09} },
+ { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} },
+ { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} },
+ { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} },
+ { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} },
+ { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} },
+ { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} },
+ { 'P', CAPS, {'p', 'P', 0x10, 0x10} },
+ { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} },
+ { 'R', CAPS, {'r', 'R', 0x12, 0x12} },
+ { 'S', CAPS, {'s', 'S', 0x13, 0x13} },
+ { 'T', CAPS, {'t', 'T', 0x14, 0x14} },
+ { 'U', CAPS, {'u', 'U', 0x15, 0x15} },
+ { 'V', CAPS, {'v', 'V', 0x16, 0x16} },
+ { 'W', CAPS, {'w', 'W', 0x17, 0x17} },
+ { 'X', CAPS, {'x', 'X', 0x18, 0x18} },
+ { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} },
+ { 'Z', CAPS, {'z', 'Z', 0x1a, 0x1a} },
+
+ /* Legacy Ascii generators */
+//zz { VK_OEM_MINUS, NOCAPS, {'\'', '?', WCH_NONE, 0x1f /* US */}
},
+ { 0, 0 }
+};
+
+ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
+ { VK_NUMPAD0, 0, {'0'} },
+ { VK_NUMPAD1, 0, {'1'} },
+ { VK_NUMPAD2, 0, {'2'} },
+ { VK_NUMPAD3, 0, {'3'} },
+ { VK_NUMPAD4, 0, {'4'} },
+ { VK_NUMPAD5, 0, {'5'} },
+ { VK_NUMPAD6, 0, {'6'} },
+ { VK_NUMPAD7, 0, {'7'} },
+ { VK_NUMPAD8, 0, {'8'} },
+ { VK_NUMPAD9, 0, {'9'} },
+ { VK_DECIMAL, 0, {'.'} },
+ { VK_BACK, 0, {'\010'} },
+ { 0,0 }
+};
+
+#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
+
+ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
+ vk_master(1,keypad_numbers),
+ vk_master(2,key_to_chars_2mod),
+ vk_master(3,key_to_chars_3mod),
+ vk_master(4,key_to_chars_4mod),
+ { 0,0,0 }
+};
+
+ROSDATA VSC_LPWSTR key_names[] = {
+ { 0x00, L"" },
+ { 0x01, L"Esc" },
+ { 0x0e, L"Backspace" },
+ { 0x0f, L"Tab" },
+ { 0x1c, L"Enter" },
+ { 0x1d, L"Ctrl" },
+ { 0x2a, L"Shift" },
+ { 0x36, L"Right Shift" },
+ { 0x37, L"Num *" },
+ { 0x38, L"Alt" },
+ { 0x39, L"Space" },
+ { 0x3a, L"Caps Lock" },
+ { 0x3b, L"F1" },
+ { 0x3c, L"F2" },
+ { 0x3d, L"F3" },
+ { 0x3e, L"F4" },
+ { 0x3f, L"F5" },
+ { 0x40, L"F6" },
+ { 0x41, L"F7" },
+ { 0x42, L"F8" },
+ { 0x43, L"F9" },
+ { 0x44, L"F10" },
+ { 0x45, L"Pause" },
+ { 0x46, L"Scroll Lock" },
+ { 0x47, L"Num 7" },
+ { 0x48, L"Num 8" },
+ { 0x49, L"Num 9" },
+ { 0x4a, L"Num -" },
+ { 0x4b, L"Num 4" },
+ { 0x4c, L"Num 5" },
+ { 0x4d, L"Num 6" },
+ { 0x4e, L"Num +" },
+ { 0x4f, L"Num 1" },
+ { 0x50, L"Num 2" },
+ { 0x51, L"Num 3" },
+ { 0x52, L"Num 0" },
+ { 0x53, L"Num Del" },
+ { 0x54, L"Sys Req" },
+ { 0x57, L"F11" },
+ { 0x58, L"F12" },
+ { 0x7c, L"F13" },
+ { 0x7d, L"F14" },
+ { 0x7e, L"F15" },
+ { 0x7f, L"F16" },
+ { 0x80, L"F17" },
+ { 0x81, L"F18" },
+ { 0x82, L"F19" },
+ { 0x83, L"F20" },
+ { 0x84, L"F21" },
+ { 0x85, L"F22" },
+ { 0x86, L"F23" },
+ { 0x87, L"F24" },
+ { 0, NULL },
+};
+
+ROSDATA VSC_LPWSTR extended_key_names[] = {
+ { 0x1c, L"Num Enter" },
+ { 0x1d, L"Right Ctrl" },
+ { 0x35, L"Num /" },
+ { 0x37, L"Prnt Scrn" },
+ { 0x38, L"Right Alt" },
+ { 0x45, L"Num Lock" },
+ { 0x46, L"Break" },
+ { 0x47, L"Home" },
+ { 0x48, L"Up" },
+ { 0x49, L"Page Up" },
+ { 0x4a, L"Left" },
+ { 0x4c, L"Center" },
+ { 0x4d, L"Right" },
+ { 0x4f, L"End" },
+ { 0x50, L"Down" },
+ { 0x51, L"Page Down" },
+ { 0x52, L"Insert" },
+ { 0x53, L"Delete" },
+ { 0x54, L"<ReactOS>" },
+ { 0x55, L"Help" },
+ { 0x56, L"Left Windows" },
+ { 0x5b, L"Right Windows" },
+ { 0, NULL },
+};
+
+/* Finally, the master table */
+ROSDATA KBDTABLES keyboard_layout_table = {
+ /* modifier assignments */
+ &modifier_bits,
+
+ /* character from vk tables */
+ vk_to_wchar_master_table,
+
+ /* diacritical marks -- currently implemented by wine code */
+ /* doesn't have any, anyway */
+ NULL,
+
+ /* Key names */
+ (VSC_LPWSTR *)key_names,
+ (VSC_LPWSTR *)extended_key_names,
+ NULL, /* Dead key names */
+
+ /* scan code to virtual key maps */
+ scancode_to_vk,
+ sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+ extcode0_to_vk,
+ extcode1_to_vk,
+
+ MAKELONG(0,1), /* Version 1.0 */
+
+ /* Ligatures */
+ 0,
+ 0,
+ NULL
+};
+
+PKBDTABLES STDCALL KbdLayerDescriptor(VOID) {
+ return &keyboard_layout_table;
+}
+
Propchange: trunk/reactos/dll/keyboard/kbdit/kbdit.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdit/kbdit.def
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdit/kbdit.rc
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdth/kbdth.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdth/kbdth.def
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/dll/keyboard/kbdth/kbdth.rc
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/portio.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/readme.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/sbdebug.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/settings.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/test.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/wdm/audio/sysaudio/main.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rc
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/beep.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/bus.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/hal/halppc/generic/cmos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/cmos.c?…
==============================================================================
--- trunk/reactos/hal/halppc/generic/cmos.c (original)
+++ trunk/reactos/hal/halppc/generic/cmos.c Fri Sep 14 21:09:45 2007
@@ -1,291 +1,291 @@
-/*
- * PROJECT: ReactOS HAL
- * LICENSE: GPL - See COPYING in the top level directory
- * FILE: hal/halx86/generic/cmos.c
- * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood)
- * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
- * Eric Kohl (ekohl(a)abo.rhein-zeitung.de)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS *******************************************************************/
-
-KSPIN_LOCK HalpSystemHardwareLock;
-
-/* PRIVATE FUNCTIONS *********************************************************/
-
-UCHAR
-FORCEINLINE
-HalpReadCmos(IN UCHAR Reg)
-{
- /* Select the register */
- WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg);
-
- /* Query the value */
- return READ_PORT_UCHAR(CMOS_DATA_PORT);
-}
-
-VOID
-FORCEINLINE
-HalpWriteCmos(IN UCHAR Reg,
- IN UCHAR Value)
-{
- /* Select the register */
- WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg);
-
- /* Write the value */
- WRITE_PORT_UCHAR(CMOS_DATA_PORT, Value);
-}
-
-ULONG
-NTAPI
-HalpGetCmosData(IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN PVOID Buffer,
- IN ULONG Length)
-{
- PUCHAR Ptr = (PUCHAR)Buffer;
- ULONG Address = SlotNumber;
- ULONG Len = Length;
-
- /* FIXME: Acquire CMOS Lock */
-
- /* Do nothing if we don't have a length */
- if (!Length) return 0;
-
- /* Check if this is simple CMOS */
- if (!BusNumber)
- {
- /* Loop the buffer up to 0xFF */
- while ((Len > 0) && (Address < 0x100))
- {
- /* Read the data */
- *Ptr = HalpReadCmos((UCHAR)Address);
-
- /* Update position and length */
- Ptr++;
- Address++;
- Len--;
- }
- }
- else if (BusNumber == 1)
- {
- /* Loop the buffer up to 0xFFFF */
- while ((Len > 0) && (Address < 0x10000))
- {
- /* Write the data */
- *Ptr = HalpReadCmos((UCHAR)Address);
-
- /* Update position and length */
- Ptr++;
- Address++;
- Len--;
- }
- }
-
- /* FIXME: Release the CMOS Lock */
-
- /* Return length read */
- return Length - Len;
-}
-
-ULONG
-NTAPI
-HalpSetCmosData(IN ULONG BusNumber,
- IN ULONG SlotNumber,
- IN PVOID Buffer,
- IN ULONG Length)
-{
- PUCHAR Ptr = (PUCHAR)Buffer;
- ULONG Address = SlotNumber;
- ULONG Len = Length;
-
- /* FIXME: Acquire CMOS Lock */
-
- /* Do nothing if we don't have a length */
- if (!Length) return 0;
-
- /* Check if this is simple CMOS */
- if (!BusNumber)
- {
- /* Loop the buffer up to 0xFF */
- while ((Len > 0) && (Address < 0x100))
- {
- /* Write the data */
- HalpWriteCmos((UCHAR)Address, *Ptr);
-
- /* Update position and length */
- Ptr++;
- Address++;
- Len--;
- }
- }
- else if (BusNumber == 1)
- {
- /* Loop the buffer up to 0xFFFF */
- while ((Len > 0) && (Address < 0x10000))
- {
- /* Write the data */
- HalpWriteCmos((UCHAR)Address, *Ptr);
-
- /* Update position and length */
- Ptr++;
- Address++;
- Len--;
- }
- }
-
- /* FIXME: Release the CMOS Lock */
-
- /* Return length read */
- return Length - Len;
-}
-
-/* PUBLIC FUNCTIONS **********************************************************/
-
-/*
- * @implemented
- */
-ARC_STATUS
-NTAPI
-HalGetEnvironmentVariable(IN PCH Name,
- IN USHORT ValueLength,
- IN PCH Value)
-{
- UCHAR Val;
-
- /* Only variable supported on x86 */
- if (_stricmp(Name, "LastKnownGood")) return ENOENT;
-
- /* FIXME: Acquire CMOS Lock */
-
- /* Query the current value */
- Val = HalpReadCmos(RTC_REGISTER_B) & 0x01;
-
- /* FIXME: Release CMOS lock */
-
- /* Check the flag */
- if (Val)
- {
- /* Return false */
- strncpy(Value, "FALSE", ValueLength);
- }
- else
- {
- /* Return true */
- strncpy(Value, "TRUE", ValueLength);
- }
-
- /* Return success */
- return ESUCCESS;
-}
-
-/*
- * @implemented
- */
-ARC_STATUS
-NTAPI
-HalSetEnvironmentVariable(IN PCH Name,
- IN PCH Value)
-{
- UCHAR Val;
-
- /* Only variable supported on x86 */
- if (_stricmp(Name, "LastKnownGood")) return ENOMEM;
-
- /* Check if this is true or false */
- if (!_stricmp(Value, "TRUE"))
- {
- /* It's true, acquire CMOS lock (FIXME) */
-
- /* Read the current value and add the flag */
- Val = HalpReadCmos(RTC_REGISTER_B) | 1;
- }
- else if (!_stricmp(Value, "FALSE"))
- {
- /* It's false, acquire CMOS lock (FIXME) */
-
- /* Read the current value and mask out the flag */
- Val = HalpReadCmos(RTC_REGISTER_B) & ~1;
- }
- else
- {
- /* Fail */
- return ENOMEM;
- }
-
- /* Write new value */
- HalpWriteCmos(RTC_REGISTER_B, Val);
-
- /* Release the lock and return success */
- return ESUCCESS;
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-HalQueryRealTimeClock(OUT PTIME_FIELDS Time)
-{
- /* FIXME: Acquire CMOS Lock */
-
- /* Loop while update is in progress */
- while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP);
-
- /* Set the time data */
- Time->Second = BCD_INT(HalpReadCmos(0));
- Time->Minute = BCD_INT(HalpReadCmos(2));
- Time->Hour = BCD_INT(HalpReadCmos(4));
- Time->Weekday = BCD_INT(HalpReadCmos(6));
- Time->Day = BCD_INT(HalpReadCmos(7));
- Time->Month = BCD_INT(HalpReadCmos(8));
- Time->Year = BCD_INT(HalpReadCmos(9));
- Time->Milliseconds = 0;
-
- /* FIXME: Check century byte */
-
- /* Compensate for the century field */
- Time->Year += (Time->Year > 80) ? 1900: 2000;
-
- /* FIXME: Release CMOS Lock */
-
- /* Always return TRUE */
- return TRUE;
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-HalSetRealTimeClock(IN PTIME_FIELDS Time)
-{
- /* FIXME: Acquire CMOS Lock */
-
- /* Loop while update is in progress */
- while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP);
-
- /* Write time fields to CMOS RTC */
- HalpWriteCmos(0, INT_BCD(Time->Second));
- HalpWriteCmos(2, INT_BCD(Time->Minute));
- HalpWriteCmos(4, INT_BCD(Time->Hour));
- HalpWriteCmos(6, INT_BCD(Time->Weekday));
- HalpWriteCmos(7, INT_BCD(Time->Day));
- HalpWriteCmos(8, INT_BCD(Time->Month));
- HalpWriteCmos(9, INT_BCD(Time->Year % 100));
-
- /* FIXME: Set the century byte */
-
- /* FIXME: Release the CMOS Lock */
-
- /* Always return TRUE */
- return TRUE;
-}
-
-/* EOF */
+/*
+ * PROJECT: ReactOS HAL
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: hal/halx86/generic/cmos.c
+ * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood)
+ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
+ * Eric Kohl (ekohl(a)abo.rhein-zeitung.de)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <hal.h>
+#define NDEBUG
+#include <debug.h>
+
+/* GLOBALS *******************************************************************/
+
+KSPIN_LOCK HalpSystemHardwareLock;
+
+/* PRIVATE FUNCTIONS *********************************************************/
+
+UCHAR
+FORCEINLINE
+HalpReadCmos(IN UCHAR Reg)
+{
+ /* Select the register */
+ WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg);
+
+ /* Query the value */
+ return READ_PORT_UCHAR(CMOS_DATA_PORT);
+}
+
+VOID
+FORCEINLINE
+HalpWriteCmos(IN UCHAR Reg,
+ IN UCHAR Value)
+{
+ /* Select the register */
+ WRITE_PORT_UCHAR(CMOS_CONTROL_PORT, Reg);
+
+ /* Write the value */
+ WRITE_PORT_UCHAR(CMOS_DATA_PORT, Value);
+}
+
+ULONG
+NTAPI
+HalpGetCmosData(IN ULONG BusNumber,
+ IN ULONG SlotNumber,
+ IN PVOID Buffer,
+ IN ULONG Length)
+{
+ PUCHAR Ptr = (PUCHAR)Buffer;
+ ULONG Address = SlotNumber;
+ ULONG Len = Length;
+
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Do nothing if we don't have a length */
+ if (!Length) return 0;
+
+ /* Check if this is simple CMOS */
+ if (!BusNumber)
+ {
+ /* Loop the buffer up to 0xFF */
+ while ((Len > 0) && (Address < 0x100))
+ {
+ /* Read the data */
+ *Ptr = HalpReadCmos((UCHAR)Address);
+
+ /* Update position and length */
+ Ptr++;
+ Address++;
+ Len--;
+ }
+ }
+ else if (BusNumber == 1)
+ {
+ /* Loop the buffer up to 0xFFFF */
+ while ((Len > 0) && (Address < 0x10000))
+ {
+ /* Write the data */
+ *Ptr = HalpReadCmos((UCHAR)Address);
+
+ /* Update position and length */
+ Ptr++;
+ Address++;
+ Len--;
+ }
+ }
+
+ /* FIXME: Release the CMOS Lock */
+
+ /* Return length read */
+ return Length - Len;
+}
+
+ULONG
+NTAPI
+HalpSetCmosData(IN ULONG BusNumber,
+ IN ULONG SlotNumber,
+ IN PVOID Buffer,
+ IN ULONG Length)
+{
+ PUCHAR Ptr = (PUCHAR)Buffer;
+ ULONG Address = SlotNumber;
+ ULONG Len = Length;
+
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Do nothing if we don't have a length */
+ if (!Length) return 0;
+
+ /* Check if this is simple CMOS */
+ if (!BusNumber)
+ {
+ /* Loop the buffer up to 0xFF */
+ while ((Len > 0) && (Address < 0x100))
+ {
+ /* Write the data */
+ HalpWriteCmos((UCHAR)Address, *Ptr);
+
+ /* Update position and length */
+ Ptr++;
+ Address++;
+ Len--;
+ }
+ }
+ else if (BusNumber == 1)
+ {
+ /* Loop the buffer up to 0xFFFF */
+ while ((Len > 0) && (Address < 0x10000))
+ {
+ /* Write the data */
+ HalpWriteCmos((UCHAR)Address, *Ptr);
+
+ /* Update position and length */
+ Ptr++;
+ Address++;
+ Len--;
+ }
+ }
+
+ /* FIXME: Release the CMOS Lock */
+
+ /* Return length read */
+ return Length - Len;
+}
+
+/* PUBLIC FUNCTIONS **********************************************************/
+
+/*
+ * @implemented
+ */
+ARC_STATUS
+NTAPI
+HalGetEnvironmentVariable(IN PCH Name,
+ IN USHORT ValueLength,
+ IN PCH Value)
+{
+ UCHAR Val;
+
+ /* Only variable supported on x86 */
+ if (_stricmp(Name, "LastKnownGood")) return ENOENT;
+
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Query the current value */
+ Val = HalpReadCmos(RTC_REGISTER_B) & 0x01;
+
+ /* FIXME: Release CMOS lock */
+
+ /* Check the flag */
+ if (Val)
+ {
+ /* Return false */
+ strncpy(Value, "FALSE", ValueLength);
+ }
+ else
+ {
+ /* Return true */
+ strncpy(Value, "TRUE", ValueLength);
+ }
+
+ /* Return success */
+ return ESUCCESS;
+}
+
+/*
+ * @implemented
+ */
+ARC_STATUS
+NTAPI
+HalSetEnvironmentVariable(IN PCH Name,
+ IN PCH Value)
+{
+ UCHAR Val;
+
+ /* Only variable supported on x86 */
+ if (_stricmp(Name, "LastKnownGood")) return ENOMEM;
+
+ /* Check if this is true or false */
+ if (!_stricmp(Value, "TRUE"))
+ {
+ /* It's true, acquire CMOS lock (FIXME) */
+
+ /* Read the current value and add the flag */
+ Val = HalpReadCmos(RTC_REGISTER_B) | 1;
+ }
+ else if (!_stricmp(Value, "FALSE"))
+ {
+ /* It's false, acquire CMOS lock (FIXME) */
+
+ /* Read the current value and mask out the flag */
+ Val = HalpReadCmos(RTC_REGISTER_B) & ~1;
+ }
+ else
+ {
+ /* Fail */
+ return ENOMEM;
+ }
+
+ /* Write new value */
+ HalpWriteCmos(RTC_REGISTER_B, Val);
+
+ /* Release the lock and return success */
+ return ESUCCESS;
+}
+
+/*
+ * @implemented
+ */
+BOOLEAN
+NTAPI
+HalQueryRealTimeClock(OUT PTIME_FIELDS Time)
+{
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Loop while update is in progress */
+ while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP);
+
+ /* Set the time data */
+ Time->Second = BCD_INT(HalpReadCmos(0));
+ Time->Minute = BCD_INT(HalpReadCmos(2));
+ Time->Hour = BCD_INT(HalpReadCmos(4));
+ Time->Weekday = BCD_INT(HalpReadCmos(6));
+ Time->Day = BCD_INT(HalpReadCmos(7));
+ Time->Month = BCD_INT(HalpReadCmos(8));
+ Time->Year = BCD_INT(HalpReadCmos(9));
+ Time->Milliseconds = 0;
+
+ /* FIXME: Check century byte */
+
+ /* Compensate for the century field */
+ Time->Year += (Time->Year > 80) ? 1900: 2000;
+
+ /* FIXME: Release CMOS Lock */
+
+ /* Always return TRUE */
+ return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOLEAN
+NTAPI
+HalSetRealTimeClock(IN PTIME_FIELDS Time)
+{
+ /* FIXME: Acquire CMOS Lock */
+
+ /* Loop while update is in progress */
+ while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP);
+
+ /* Write time fields to CMOS RTC */
+ HalpWriteCmos(0, INT_BCD(Time->Second));
+ HalpWriteCmos(2, INT_BCD(Time->Minute));
+ HalpWriteCmos(4, INT_BCD(Time->Hour));
+ HalpWriteCmos(6, INT_BCD(Time->Weekday));
+ HalpWriteCmos(7, INT_BCD(Time->Day));
+ HalpWriteCmos(8, INT_BCD(Time->Month));
+ HalpWriteCmos(9, INT_BCD(Time->Year % 100));
+
+ /* FIXME: Set the century byte */
+
+ /* FIXME: Release the CMOS Lock */
+
+ /* Always return TRUE */
+ return TRUE;
+}
+
+/* EOF */
Propchange: trunk/reactos/hal/halppc/generic/cmos.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/display.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/dma.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/drive.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/enum.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/fmutex.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/font.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/halinit.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/ipi.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/irql.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/isa.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/kdbg.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/mca.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/misc.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/pci.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/portio.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/processor.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/hal/halppc/generic/profil.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/profil.…
==============================================================================
--- trunk/reactos/hal/halppc/generic/profil.c (original)
+++ trunk/reactos/hal/halppc/generic/profil.c Fri Sep 14 21:09:45 2007
@@ -1,61 +1,61 @@
-/*
- * PROJECT: ReactOS HAL
- * LICENSE: GPL - See COPYING in the top level directory
- * FILE: hal/halx86/generic/profil.c
- * PURPOSE: System Profiling
- * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <hal.h>
-#define NDEBUG
-#include <debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
-/*
- * @unimplemented
- */
-VOID
-NTAPI
-HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
-{
- KEBUGCHECK(0);
- return;
-}
-
-/*
- * @unimplemented
- */
-VOID
-NTAPI
-HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
-{
- KEBUGCHECK(0);
- return;
-}
-
-/*
- * @unimplemented
- */
-ULONG_PTR
-NTAPI
-HalSetProfileInterval(IN ULONG_PTR Interval)
-{
- KEBUGCHECK(0);
- return Interval;
-}
-
-ULONG HalpDecrementerRoll = 0;
-
-LARGE_INTEGER
-KeQueryPerformanceCounter(PLARGE_INTEGER PerformanceFrequency)
-{
- LARGE_INTEGER Result;
- /* for now */
- if(PerformanceFrequency) PerformanceFrequency->QuadPart = 100000000;
- Result.HighPart = HalpDecrementerRoll;
- Result.LowPart = __rdtsc();
- return Result;
-}
+/*
+ * PROJECT: ReactOS HAL
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: hal/halx86/generic/profil.c
+ * PURPOSE: System Profiling
+ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <hal.h>
+#define NDEBUG
+#include <debug.h>
+
+/* FUNCTIONS *****************************************************************/
+
+/*
+ * @unimplemented
+ */
+VOID
+NTAPI
+HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
+{
+ KEBUGCHECK(0);
+ return;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+NTAPI
+HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource)
+{
+ KEBUGCHECK(0);
+ return;
+}
+
+/*
+ * @unimplemented
+ */
+ULONG_PTR
+NTAPI
+HalSetProfileInterval(IN ULONG_PTR Interval)
+{
+ KEBUGCHECK(0);
+ return Interval;
+}
+
+ULONG HalpDecrementerRoll = 0;
+
+LARGE_INTEGER
+KeQueryPerformanceCounter(PLARGE_INTEGER PerformanceFrequency)
+{
+ LARGE_INTEGER Result;
+ /* for now */
+ if(PerformanceFrequency) PerformanceFrequency->QuadPart = 100000000;
+ Result.HighPart = HalpDecrementerRoll;
+ Result.LowPart = __rdtsc();
+ return Result;
+}
Propchange: trunk/reactos/hal/halppc/generic/profil.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/pwroff.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/reboot.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/resource.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/spinlock.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/sysbus.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/sysinfo.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/hal/halppc/generic/systimer.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/systime…
==============================================================================
--- trunk/reactos/hal/halppc/generic/systimer.S (original)
+++ trunk/reactos/hal/halppc/generic/systimer.S Fri Sep 14 21:09:45 2007
@@ -1,48 +1,48 @@
-/*
- * FILE: hal/halx86/generic/timer.S
- * COPYRIGHT: See COPYING in the top level directory
- * PURPOSE: System Timer Interrupt and Management
- * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <asm.h>
-#include <internal/i386/asmmacro.S>
-.intel_syntax noprefix
-
-/* FUNCTIONS *****************************************************************/
-
-.globl _HalpClockInterrupt@0
-.func HalpClockInterrupt@0
-_HalpClockInterrupt@0:
-
- /* Enter trap */
- INT_PROLOG Hci, DoPushFakeErrorCode
-
- /* Push vector and make stack for IRQL */
- push 0x30
- sub esp, 4
-
- /* Begin the interrupt */
- push esp
- push 0x30
- push CLOCK2_LEVEL
- call _HalBeginSystemInterrupt@12
-
- /* Check if it's spurious */
- or al, al
- jz Spurious
-
- /* Do a tick */
- mov eax, 100000
- jmp _KeUpdateSystemTime@0
-
-Spurious:
-
- /* Exit the interrupt */
- add esp, 8
- mov esi, $
- jmp _Kei386EoiHelper@0
-.endfunc
-
+/*
+ * FILE: hal/halx86/generic/timer.S
+ * COPYRIGHT: See COPYING in the top level directory
+ * PURPOSE: System Timer Interrupt and Management
+ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <asm.h>
+#include <internal/i386/asmmacro.S>
+.intel_syntax noprefix
+
+/* FUNCTIONS *****************************************************************/
+
+.globl _HalpClockInterrupt@0
+.func HalpClockInterrupt@0
+_HalpClockInterrupt@0:
+
+ /* Enter trap */
+ INT_PROLOG Hci, DoPushFakeErrorCode
+
+ /* Push vector and make stack for IRQL */
+ push 0x30
+ sub esp, 4
+
+ /* Begin the interrupt */
+ push esp
+ push 0x30
+ push CLOCK2_LEVEL
+ call _HalBeginSystemInterrupt@12
+
+ /* Check if it's spurious */
+ or al, al
+ jz Spurious
+
+ /* Do a tick */
+ mov eax, 100000
+ jmp _KeUpdateSystemTime@0
+
+Spurious:
+
+ /* Exit the interrupt */
+ add esp, 8
+ mov esi, $
+ jmp _Kei386EoiHelper@0
+.endfunc
+
Propchange: trunk/reactos/hal/halppc/generic/systimer.S
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/time.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/generic/timer.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/include/apic.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/include/bus.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/include/hal.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/include/haldma.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/include/halirq.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/include/halp.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/include/ioapic.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/include/mps.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/up/halinit_up.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/hal/halppc/up/halup.rc
------------------------------------------------------------------------------
svn:eol-style = native