Ros-diffs

ros-diffs@reactos.org

81390 discussions

Re: [ros-diffs] [cfinck] 33985: Use a ClipRegion when collapsing, so that the TreeView works correctly. This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "comctl32_ros.diff" accord
by Steven Edwards 15 Jun '08

15 Jun '08

On Sun, Jun 15, 2008 at 12:05 PM, <cfinck(a)svn.reactos.org> wrote: > This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "comctl32_ros.diff" accordingly. You might resend after next week. 1.0 should be tagged Monday or sometime shortly there after and so Alexandre should start ignoring patches as normal rather than blaming it on the late hour of the code freeze. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

[cfinck] 33985: Use a ClipRegion when collapsing, so that the TreeView works correctly. This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "comctl32_ros.diff" accordingly. Patch by Timo Kreuzer
by cfinck＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: cfinck Date: Sun Jun 15 11:05:39 2008 New Revision: 33985 URL: http://svn.reactos.org/svn/reactos?rev=33985&view=rev Log: Use a ClipRegion when collapsing, so that the TreeView works correctly. This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "comctl32_ros.diff" accordingly. Patch by Timo Kreuzer Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Sun Jun 15 11:05:39 2008 @@ -123,8 +123,8 @@ Index: treeview.c =================================================================== ---- treeview.c (revision 27134) -+++ treeview.c (working copy) +--- D:/Wine-CVS/wine/dlls/comctl32/treeview.c Sun Jun 15 18:29:21 2008 ++++ D:/ReactOS-Trunk/reactos/dll/win32/comctl32/treeview.c Sun Jun 15 18:27:14 2008 @@ -2826,8 +2826,6 @@ } } @@ -134,3 +134,12 @@ if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); +@@ -3209,7 +3207,7 @@ + { + scrollRect.top = nextItem->rect.top; + +- ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, ++ ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, &scrollRect, + NULL, NULL, SW_ERASE | SW_INVALIDATE); + TREEVIEW_Invalidate(infoPtr, wineItem); + } else { Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sun Jun 15 11:05:39 2008 @@ -3207,7 +3207,7 @@ { scrollRect.top = nextItem->rect.top; - ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, + ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, &scrollRect, NULL, NULL, SW_ERASE | SW_INVALIDATE); TREEVIEW_Invalidate(infoPtr, wineItem); } else {

1 0

[cfinck] 33984: Fix yet another invalid use of WriteFile. This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "wininet_ros.diff" accordingly.
by cfinck＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: cfinck Date: Sun Jun 15 11:04:03 2008 New Revision: 33984 URL: http://svn.reactos.org/svn/reactos?rev=33984&view=rev Log: Fix yet another invalid use of WriteFile. This patch has already been submitted to Wine, but as they don't care currently, I applied it manually here and updated "wininet_ros.diff" accordingly. Modified: trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Sun Jun 15 11:04:03 2008 @@ -1689,7 +1689,9 @@ if (req->lpszCacheFile) { - if (!WriteFile(req->hCacheFile, p, bytes_read, NULL, NULL)) + DWORD dwBytesWritten; + + if (!WriteFile(req->hCacheFile, p, bytes_read, &dwBytesWritten, NULL)) WARN("WriteFile failed: %u\n", GetLastError()); } p += bytes_read; Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Sun Jun 15 11:04:03 2008 @@ -1,5 +1,5 @@ --- D:/Wine-CVS/wine/dlls/wininet/http.c Wed May 28 14:33:28 2008 -+++ D:/ReactOS-Trunk/reactos/dll/win32/wininet/http.c Sat May 31 11:59:23 2008 ++++ D:/ReactOS-Trunk/reactos/dll/win32/wininet/http.c Sun Jun 15 18:16:06 2008 @@ -61,6 +61,8 @@ #include "wine/debug.h" #include "wine/unicode.h" @@ -20,6 +20,17 @@ if(!res) WARN("WriteFile failed: %u\n", GetLastError()); } +@@ -1686,7 +1689,9 @@ + + if (req->lpszCacheFile) + { +- if (!WriteFile(req->hCacheFile, p, bytes_read, NULL, NULL)) ++ DWORD dwBytesWritten; ++ ++ if (!WriteFile(req->hCacheFile, p, bytes_read, &dwBytesWritten, NULL)) + WARN("WriteFile failed: %u\n", GetLastError()); + } + p += bytes_read; --- D:/Wine-CVS/wine/dlls/wininet/internet.c Wed May 28 14:33:28 2008 +++ D:/ReactOS-Trunk/reactos/dll/win32/wininet/internet.c Fri May 30 18:04:29 2008 @@ -3101,19 +3101,22 @@

1 0

[cfinck] 33983: Die with an error message if a user tries to edit his account settings using the phpBB Control Panel. This message is only shown if the board administrator forgot to disable the "Edit account settings" page in the phpBB Administration Control Panel (so a user usually never sees this message).
by cfinck＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: cfinck Date: Sun Jun 15 08:42:58 2008 New Revision: 33983 URL: http://svn.reactos.org/svn/reactos?rev=33983&view=rev Log: Die with an error message if a user tries to edit his account settings using the phpBB Control Panel. This message is only shown if the board administrator forgot to disable the "Edit account settings" page in the phpBB Administration Control Panel (so a user usually never sees this message). Modified: trunk/web/reactos.org/htdocs/forum/includes/ucp/ucp_profile.php Modified: trunk/web/reactos.org/htdocs/forum/includes/ucp/ucp_profile.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/includes/ucp/ucp_profile.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/includes/ucp/ucp_profile.php [iso-8859-1] Sun Jun 15 08:42:58 2008 @@ -42,226 +42,7 @@ switch ($mode) { case 'reg_details': - - $data = array( - 'username' => utf8_normalize_nfc(request_var('username', $user->data['username'], true)), - 'email' => strtolower(request_var('email', $user->data['user_email'])), - 'email_confirm' => strtolower(request_var('email_confirm', '')), - 'new_password' => request_var('new_password', '', true), - 'cur_password' => request_var('cur_password', '', true), - 'password_confirm' => request_var('password_confirm', '', true), - ); - - add_form_key('ucp_reg_details'); - - if ($submit) - { - // Do not check cur_password, it is the old one. - $check_ary = array( - 'new_password' => array( - array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), - array('password')), - 'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), - 'email' => array( - array('string', false, 6, 60), - array('email')), - 'email_confirm' => array('string', true, 6, 60), - ); - - if ($auth->acl_get('u_chgname') && $config['allow_namechange']) - { - $check_ary['username'] = array( - array('string', false, $config['min_name_chars'], $config['max_name_chars']), - array('username'), - ); - } - - $error = validate_data($data, $check_ary); - - if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password']) - { - $error[] = 'NEW_PASSWORD_ERROR'; - } - - if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) || ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], $user->data['user_password'])) - { - $error[] = 'CUR_PASSWORD_ERROR'; - } - - // Only check the new password against the previous password if there have been no errors - if (!sizeof($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && phpbb_check_hash($data['new_password'], $user->data['user_password'])) - { - $error[] = 'SAME_PASSWORD_ERROR'; - } - - if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email']) - { - $error[] = 'NEW_EMAIL_ERROR'; - } - - if (!check_form_key('ucp_reg_details')) - { - $error[] = 'FORM_INVALID'; - } - - if (!sizeof($error)) - { - $sql_ary = array( - 'username' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? $data['username'] : $user->data['username'], - 'username_clean' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? utf8_clean_string($data['username']) : $user->data['username_clean'], - 'user_email' => ($auth->acl_get('u_chgemail')) ? $data['email'] : $user->data['user_email'], - 'user_email_hash' => ($auth->acl_get('u_chgemail')) ? crc32($data['email']) . strlen($data['email']) : $user->data['user_email_hash'], - 'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : $user->data['user_password'], - 'user_passchg' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? time() : 0, - ); - - if ($auth->acl_get('u_chgname') && $config['allow_namechange'] && $data['username'] != $user->data['username']) - { - add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_NAME', $user->data['username'], $data['username']); - } - - if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !phpbb_check_hash($data['new_password'], $user->data['user_password'])) - { - $user->reset_login_keys(); - add_log('user', $user->data['user_id'], 'LOG_USER_NEW_PASSWORD', $data['username']); - } - - if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) - { - add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_EMAIL', $data['username'], $user->data['user_email'], $data['email']); - } - - $message = 'PROFILE_UPDATED'; - - if ($config['email_enable'] && $data['email'] != $user->data['user_email'] && $user->data['user_type'] != USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN)) - { - $message = ($config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN'; - - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $server_url = generate_board_url(); - - $user_actkey = gen_rand_string(10); - $key_len = 54 - (strlen($server_url)); - $key_len = ($key_len > 6) ? $key_len : 6; - $user_actkey = substr($user_actkey, 0, $key_len); - - $messenger = new messenger(false); - - $template_file = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate'; - $messenger->template($template_file, $user->data['user_lang']); - - $messenger->to($data['email'], $data['username']); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($data['username']), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey") - ); - - $messenger->send(NOTIFY_EMAIL); - - if ($config['require_activation'] == USER_ACTIVATION_ADMIN) - { - // Grab an array of user_id's with a_user permissions ... these users can activate a user - $admin_ary = $auth->acl_get_list(false, 'a_user', false); - $admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array(); - - // Also include founders - $where_sql = ' WHERE user_type = ' . USER_FOUNDER; - - if (sizeof($admin_ary)) - { - $where_sql .= ' OR ' . $db->sql_in_set('user_id', $admin_ary); - } - - $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type - FROM ' . USERS_TABLE . ' ' . - $where_sql; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $messenger->template('admin_activate', $row['user_lang']); - $messenger->to($row['user_email'], $row['username']); - $messenger->im($row['user_jabber'], $row['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($data['username']), - 'U_USER_DETAILS' => "$server_url/memberlist.$phpEx?mode=viewprofile&u={$user->data['user_id']}", - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey") - ); - - $messenger->send($row['user_notify_type']); - } - $db->sql_freeresult($result); - } - - user_active_flip('deactivate', $user->data['user_id'], INACTIVE_PROFILE); - - // Because we want the profile to be reactivated we set user_newpasswd to empty (else the reactivation will fail) - $sql_ary['user_actkey'] = $user_actkey; - $sql_ary['user_newpasswd'] = ''; - } - - if (sizeof($sql_ary)) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - } - - // Need to update config, forum, topic, posting, messages, etc. - if ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange']) - { - user_update_name($user->data['username'], $data['username']); - } - - // Now, we can remove the user completely (kill the session) - NOT BEFORE!!! - if (!empty($sql_ary['user_actkey'])) - { - meta_refresh(5, append_sid($phpbb_root_path . 'index.' . $phpEx)); - $message = $user->lang[$message] . ' ' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid($phpbb_root_path . 'index.' . $phpEx) . '">', '</a>'); - - // Because the user gets deactivated we log him out too, killing his session - $user->session_kill(); - } - else - { - meta_refresh(3, $this->u_action); - $message = $user->lang[$message] . ' ' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>'); - } - - trigger_error($message); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $template->assign_vars(array( - 'ERROR' => (sizeof($error)) ? implode(' ', $error) : '', - - 'USERNAME' => $data['username'], - 'EMAIL' => $data['email'], - 'PASSWORD_CONFIRM' => $data['password_confirm'], - 'NEW_PASSWORD' => $data['new_password'], - 'CUR_PASSWORD' => '', - - 'L_USERNAME_EXPLAIN' => sprintf($user->lang[$config['allow_name_chars'] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']), - 'L_CHANGE_PASSWORD_EXPLAIN' => sprintf($user->lang[$config['pass_complex'] . '_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']), - - 'S_FORCE_PASSWORD' => ($auth->acl_get('u_chgpasswd') && $config['chg_passforce'] && $user->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400)) ? true : false, - 'S_CHANGE_USERNAME' => ($config['allow_namechange'] && $auth->acl_get('u_chgname')) ? true : false, - 'S_CHANGE_EMAIL' => ($auth->acl_get('u_chgemail')) ? true : false, - 'S_CHANGE_PASSWORD' => ($auth->acl_get('u_chgpasswd')) ? true : false) - ); - break; + die('You can modify your account settings using the <a href="/roscms/?page=user&sec=account&sec2=edit">myReactOS Settings</a> page. Please tell an Administrator to disable this page in the phpBB Administration Panel.'); case 'profile_info':

1 0

[dreimer] 33982: Bug 3320: Czech translation update by Radek Liska (radekliska@gmail.com) Small Update for the German USETUP by me.
by dreimer＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: dreimer Date: Sun Jun 15 03:14:43 2008 New Revision: 33982 URL: http://svn.reactos.org/svn/reactos?rev=33982&view=rev Log: Bug 3320: Czech translation update by Radek Liska (radekliska(a)gmail.com) Small Update for the German USETUP by me. Added: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h Added: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] Sun Jun 15 03:14:43 2008 @@ -1,0 +1,229 @@ +/* FILE: applications/dxdiag/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2008-06-05 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 478, 280 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "ReactX-diagnostický program" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 + PUSHBUTTON "&Nápovìda", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Dalí stránka", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Uloit vechny informace...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "U&konèit", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Tento nástroj poskytuje detailní informace o komponentách ReactX a ovladaèích nainstalovaných na tomto systému.", -1, 10, 10, 443, 17 + LTEXT "Pokud víte, ve které oblasti se nachází problém, kliknìte na vhodnou záloku výe. V opaèném pøípadì lze pouít tlaèítko \"Dalí stránka\" níe a procházet stránky postupnì.", -1, 10, 30, 443, 25 + GROUPBOX "Systémové informace", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "Souèasné datum a èas:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Název poèítaèe:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Operaèní systém:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Jazyk:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "Výrobce systému:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "Model systému:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT + LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Pamì:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Stránkovací soubor:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "Verze ReactX:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT + LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT +END + +IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zaøízení", -1, 10, 10, 250, 100 + RTEXT "Název:", -1, 20, 25, 70, 10 + RTEXT "Výrobce:", -1, 20, 35, 70, 10 + RTEXT "Typ èipu:", -1, 20, 45, 70, 10 + RTEXT "Typ DAC:", -1, 20, 55, 70, 10 + RTEXT "Celková pamì:", -1, 20, 65, 70, 10 + RTEXT "Zobrazovací mód:", -1, 20, 75, 70, 10 + RTEXT "Monitor:", -1, 20, 85, 70, 10 + LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10 + LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10 + + GROUPBOX "Ovladaè", -1, 270, 10, 190, 100 + RTEXT "Hlavní ovladaè:", -1, 275, 25, 55, 10 + RTEXT "Verze:", -1, 275, 35, 55, 10 + RTEXT "Datum:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Mini-VDD:", -1, 275, 65, 55, 10 + RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 + RTEXT "Verze DDI:", -1, 275, 85, 55, 10 + LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 + + GROUPBOX "Vlastnosti ReactX", -1, 10, 115, 450, 60 + RTEXT "DirectDraw akcelerace:", -1, 15, 130, 110, 12 + RTEXT "Direct3D akcelerace:", -1, 15, 145, 110, 12 + RTEXT "AGP akcelerace textur:", -1, 15, 160, 110, 12 + LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 + LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 + LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 + PUSHBUTTON "Zapnout", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "Zapnout", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "Zapnout", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "Otestovat DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "Otestovat Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED + + GROUPBOX "Poznámky", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + + +IDD_SOUND_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zaøízení", -1, 10, 10, 250, 100 + RTEXT "Název:", -1, 20, 25, 70, 10 + RTEXT "ID zaøízení:", -1, 20, 35, 70, 10 + RTEXT "ID výrobce:", -1, 20, 45, 70, 10 + RTEXT "ID produktu:", -1, 20, 55, 70, 10 + RTEXT "Typ:", -1, 20, 65, 70, 10 + RTEXT "Implicitní zaøízení:", -1, 20, 75, 70, 10 + LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 + LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 + GROUPBOX "Ovladaè", -1, 270, 10, 190, 100 + RTEXT "Název:", -1, 275, 25, 55, 10 + RTEXT "Verze:", -1, 275, 35, 55, 10 + RTEXT "Datum:", -1, 275, 45, 55, 10 + RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 + RTEXT "Dalí soubory:", -1, 275, 65, 55, 10 + RTEXT "Poskytovatel:", -1, 275, 75, 55, 10 + LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 + LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 + LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 + GROUPBOX "Vlastnosti ReactX", -1, 10, 115, 450, 60 + CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 + RTEXT "Hardwarový zvuk\nÚroveò akcelerace:", -1, 20, 135, 90, 20 + PUSHBUTTON "Otestovat DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 + GROUPBOX "Poznámky", -1, 10, 180, 450, 40 + EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP +END + +IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + + +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zaøízení DirectInput", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 + GROUPBOX "Vstupní zaøízení", -1, 10, 100, 452, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 + GROUPBOX "Informace", -1, 10, 170, 452, 50 + EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP +END + +IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Registrovaný poskytovatel sluby DirectPlay", -1, 10, 10, 452, 80 + CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 +END + +IDD_HELP_DIALOG DIALOGEX DISCARDABLE 0, 0, 462, 220 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MAIN_DIALOG "ReactX diagnostický nástroj" + IDS_SYSTEM_DIALOG "Systém" + IDS_DISPLAY_DIALOG "Obrazovka" + IDS_SOUND_DIALOG "Zvuk" + IDS_MUSIC_DIALOG "Hudba" + IDS_INPUT_DIALOG "Vstup" + IDS_NETWORK_DIALOG "Sí" + IDS_HELP_DIALOG "Nápovìda" + IDS_FORMAT_MB "%I64uMB RAM" + IDS_FORMAT_SWAP "%I64u MB pouito, %I64u MB volných" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPU)" + IDS_VERSION_UNKNOWN "Neznámá verze" + IDS_DEVICE_STATUS_ATTACHED "Pøipojeno" + IDS_DEVICE_STATUS_MISSING "Odpojeno" + IDS_DEVICE_STATUS_UNKNOWN "Neznámé" + IDS_DEVICE_NAME "Název zaøízení" + IDS_DEVICE_STATUS "Status" + IDS_DEVICE_CONTROLLER "ID øadièe" + IDS_DEVICE_MANUFACTURER "ID výrobce" + IDS_DEVICE_PRODUCT "ID produktu" + IDS_DEVICE_FORCEFEEDBACK "Ovladaè Force Feedback" + IDS_NOT_APPLICABLE "Nelze aplikovat" + IDS_OPTION_YES "Ano" + IDS_DIRECTPLAY_COL_NAME1 "Název" + IDS_DIRECTPLAY_COL_NAME2 "Registr" + IDS_DIRECTPLAY_COL_NAME3 "Soubor" + IDS_DIRECTPLAY_COL_NAME4 "Verze" + IDS_DIRECTPLAY8_MODEMSP "Poskytovatel sluby DirectPlay8-Modem" + IDS_DIRECTPLAY8_SERIALSP "Poskytovatel sluby DirectPlay8 Serial" + IDS_DIRECTPLAY8_IPXSP "Poskytovatel sluby DirectPlay8 IPX" + IDS_DIRECTPLAY8_TCPSP "Poskytovatel sluby DirectPlay8-TCP/IP" + IDS_DIRECTPLAY_TCPCONN "Internetové pøipojení TCP/IP pro DirectPlay" + IDS_DIRECTPLAY_IPXCONN "IPX pøipojení pro DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "Modemové pøipojení pro DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Sériové pøipojení pro DirectPlay" + IDS_REG_SUCCESS "OK" + IDS_REG_FAIL "Chyba" + IDS_DDTEST_ERROR "Test selhal!" + IDS_DDTEST_DESCRIPTION "Spustí se test rozhraní DirectDraw. Pokraèovat?" + IDS_DDPRIMARY_DESCRIPTION "Tento test pouije DirectDraw k vykreslování na primary surface. Mìly by být vykresleny èerné a bílé obdélníky. Pokraèovat?" + IDS_DDPRIMARY_RESULT "Byly vidìt èerné a bílé obdélníky?" + IDS_DDOFFSCREEN_DESCRIPTION "Tento test pouije DirectDraw k vykreslování do offscreen bufferu. Mìl by být vykreslen bílý pohybující se obdélník. Pokraèovat?" + IDS_DDOFFSCREEN_RESULT "Byl vidìt bílý pohybující se obdélník?" + IDS_DDFULLSCREEN_DESCRIPTION "Tento test pouije DirectDraw k vykreslování do celoobrazovkového módu. Mìl by být vykreslen bílý pohybující se obdélník. Pokraèovat?" + IDS_DDFULLSCREEN_RESULT "Vidìli jste bílý pohybující se obdélník v celoobrazovkovém módu?" + IDS_FORMAT_ADAPTER_MEM "%u MB" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_OPTION_NO "Ne" +END Propchange: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] Sun Jun 15 03:14:43 2008 @@ -4,6 +4,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Jun 15 03:14:43 2008 @@ -1,7 +1,7 @@ /* FILE: setup/usetup/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * THANKS TO: preston - * UPDATED: 2008-04-09 + * UPDATED: 2008-06-05 */ #ifndef LANG_CS_CZ_H__ @@ -1085,7 +1085,7 @@ { 6, 8, - "Please select a layout to be installed by default.", + "Pros¡m zvolte rozlo§en¡, kter bude implicitnØ nainstalov no.", TEXT_STYLE_NORMAL }, { @@ -1476,7 +1476,7 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" + "Nepodaýilo se pýidat rozlo§en¡ kl vesnice do registru.\n" "ENTER = Restartovat po¡ta" }, { @@ -1699,7 +1699,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "Pýid v m rozlo§en¡ kl ves"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Jun 15 03:14:43 2008 @@ -1079,7 +1079,7 @@ { 6, 8, - "Please select a layout to be installed by default.", + "Bitte whlen Sie ein zu installierendes Standard Layout.", TEXT_STYLE_NORMAL }, { @@ -1615,11 +1615,11 @@ {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM, - "Ausg. Speicher"}, + "Ausgel. Sp."}, {STRING_NONPAGEDMEM, - "Nicht ausg. Speich."}, + "Nicht ausgel. Sp."}, {STRING_FREEMEM, - "Freier Speicher"}, + "Freier Sp."}, {STRING_REGHIVEUPDATE, " Registry hives werden aktualisiert..."}, {STRING_IMPORTFILE,

1 0

[ros-arm-bringup] 33981: - Continue cleanup, use new peripheral headers (And fix them) - Fix ARM HAL headers and use them
by ros-arm-bringup＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: ros-arm-bringup Date: Sun Jun 15 02:54:18 2008 New Revision: 33981 URL: http://svn.reactos.org/svn/reactos?rev=33981&view=rev Log: - Continue cleanup, use new peripheral headers (And fix them) - Fix ARM HAL headers and use them Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/hal/halarm/include/hal.h trunk/reactos/hal/halarm/include/halp.h trunk/reactos/include/psdk/intrin_arm.h trunk/reactos/include/reactos/arm/peripherals/pl190.h trunk/reactos/include/reactos/arm/peripherals/sp804.h Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Sun Jun 15 02:54:18 2008 @@ -1,28 +1,14 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/hal.c - * PURPOSE: Hardware Abstraction Layer DLL - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISION HISTORY: - * 01-08-2001 CSH Created - */ - -/* INCLUDES ******************************************************************/ - -#include <ntddk.h> -#include <ntdddisk.h> -#include <arc/arc.h> -#include <intrin.h> -#include <ndk/halfuncs.h> -#include <ndk/iofuncs.h> -#include <ndk/kdfuncs.h> -#include <ndk/kefuncs.h> -#include <ndk/rtlfuncs.h> -#include <internal/arm/ke.h> -#include <internal/arm/intrin_i.h> -#include <bugcodes.h> - + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halarm/generic/hal.c + * PURPOSE: Hardware Abstraction Layer + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> #define NDEBUG #include <debug.h> @@ -41,380 +27,6 @@ /* DATA **********************************************************************/ ULONG _KdComPortInUse = 0; - -/* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -DriverEntry( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -{ - UNIMPLEMENTED; - - return STATUS_SUCCESS; -} - -/* -* @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; -} - -VOID -FASTCALL -ExAcquireFastMutex( - PFAST_MUTEX FastMutex) -{ - UNIMPLEMENTED; -} - - -VOID -FASTCALL -ExReleaseFastMutex( - PFAST_MUTEX FastMutex) -{ - UNIMPLEMENTED; -} - - -BOOLEAN FASTCALL -ExTryToAcquireFastMutex( - PFAST_MUTEX FastMutex) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalAcquireDisplayOwnership( - PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) -{ - UNIMPLEMENTED; -} - - -NTSTATUS -NTAPI -HalAdjustResourceList( - PCM_RESOURCE_LIST Resources) -{ - UNIMPLEMENTED; - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalAllProcessorsStarted(VOID) -{ - /* Do nothing */ - return TRUE; -} - - -NTSTATUS -NTAPI -HalAllocateAdapterChannel( - PADAPTER_OBJECT AdapterObject, - PWAIT_CONTEXT_BLOCK WaitContextBlock, - ULONG NumberOfMapRegisters, - PDRIVER_CONTROL ExecutionRoutine) -{ - UNIMPLEMENTED; - - return STATUS_SUCCESS; -} - - -PVOID -NTAPI -HalAllocateCommonBuffer( - PADAPTER_OBJECT AdapterObject, - ULONG Length, - PPHYSICAL_ADDRESS LogicalAddress, - BOOLEAN CacheEnabled) -{ - UNIMPLEMENTED; - - return NULL; -} - - -PVOID -NTAPI -HalAllocateCrashDumpRegisters( - PADAPTER_OBJECT AdapterObject, - PULONG NumberOfMapRegisters) -{ - UNIMPLEMENTED; - return NULL; -} - - -NTSTATUS -NTAPI -HalAssignSlotResources( - PUNICODE_STRING RegistryPath, - PUNICODE_STRING DriverClassName, - PDRIVER_OBJECT DriverObject, - PDEVICE_OBJECT DeviceObject, - INTERFACE_TYPE BusType, - ULONG BusNumber, - ULONG SlotNumber, - PCM_RESOURCE_LIST *AllocatedResources) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -BOOLEAN -NTAPI -HalBeginSystemInterrupt (KIRQL Irql, - ULONG Vector, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalCalibratePerformanceCounter( - volatile LONG *Count, - ULONGLONG NewCount) -{ - UNIMPLEMENTED; -} - - -BOOLEAN -NTAPI -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalDisplayString( - PCH String) -{ - UNIMPLEMENTED; -} - - -BOOLEAN -NTAPI -HalEnableSystemInterrupt( - ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalEndSystemInterrupt( - KIRQL Irql, - ULONG Unknown2) -{ - UNIMPLEMENTED; -} - - -BOOLEAN -NTAPI -HalFlushCommonBuffer( - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4, - ULONG Unknown5) -{ - UNIMPLEMENTED; - - return TRUE; -} - - -VOID -NTAPI -HalFreeCommonBuffer( - PADAPTER_OBJECT AdapterObject, - ULONG Length, - PHYSICAL_ADDRESS LogicalAddress, - PVOID VirtualAddress, - BOOLEAN CacheEnabled) -{ - UNIMPLEMENTED; -} - - -PADAPTER_OBJECT -NTAPI -HalGetAdapter( - PDEVICE_DESCRIPTION DeviceDescription, - PULONG NumberOfMapRegisters) -{ - UNIMPLEMENTED; - - return (PADAPTER_OBJECT)NULL; -} - - -ULONG -NTAPI -HalGetBusData( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Length) -{ - UNIMPLEMENTED; - - return 0; -} - - -ULONG -NTAPI -HalGetBusDataByOffset( - BUS_DATA_TYPE BusDataType, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - UNIMPLEMENTED; - - return 0; -} - - -ARC_STATUS -NTAPI -HalGetEnvironmentVariable( - PCH Name, - USHORT ValueLength, - PCH Value) -{ - UNIMPLEMENTED; - - return ENOENT; -} - - -ULONG -NTAPI -HalGetInterruptVector( - INTERFACE_TYPE InterfaceType, - ULONG BusNumber, - ULONG BusInterruptLevel, - ULONG BusInterruptVector, - PKIRQL Irql, - PKAFFINITY Affinity) -{ - UNIMPLEMENTED; - - return 0; -} - - -VOID -NTAPI -HalHandleNMI( - PVOID NmiData) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI -HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PCHAR CommandLine; - - /* Make sure we have a loader block and command line */ - if ((LoaderBlock) && (LoaderBlock->LoadOptions)) - { - /* Read the command line */ - CommandLine = LoaderBlock->LoadOptions; - - /* Check for initial breakpoint */ - if (strstr(CommandLine, "BREAK")) DbgBreakPoint(); - } -} - -// -// INTs on the Versatile: -// -// 0 WATCHDOG -> We use it for profiling -// 1 SOFTWARE INTERRUPT -> We use it for APC delivery -// 2 COMM RX -> We use it for DPC delivery -// 3 COMM TX -> We use it for IPI delivery -// 4 TIMER0/1 -> Use for Clock Interrupt. -// 5+ XXX -> Mapped to to actual device -// -// So we have the following IRQL masks: -// PASSIVE_LEVEL - 0xFFFFFFFF (enable all interrupts) -// APC_LEVEL - 0xFFFFFFFD (disable interrupt 1) -// DISPATCH_LEVEL - 0xFFFFFFF9 (disable interrupts 1, 2) -// DEVICE_LEVEL_0 - 0xFFFFFFD9 (disable interrupts 1, 2, 5) -// DEVICE_LEVEL_N - 0x19 (everything disabled except 0, 3, 4) -// PROFILE_LEVEL - 0x18 (everything disabled except, 3, 4) -// CLOCK_LEVEL - 0x10 (everything disabled except 4) -// POWER_LEVEL, IPI_LEVEL, HIGH_LEVEL - 0x00 (everything disabled) ULONG HalpIrqlTable[HIGH_LEVEL + 1] = { @@ -454,11 +66,11 @@ UCHAR HalpMaskTable[HIGH_LEVEL + 1] = { - PROFILE_LEVEL, - APC_LEVEL, - DISPATCH_LEVEL, - IPI_LEVEL, - CLOCK2_LEVEL, + PROFILE_LEVEL, // INT 0 WATCHDOG + APC_LEVEL, // INT 1 SOFTWARE INTERRUPT + DISPATCH_LEVEL,// INT 2 COMM RX + IPI_LEVEL, // INT 3 COMM TX + CLOCK2_LEVEL, // INT 4 TIMER 0 3, 4, 5, @@ -487,32 +99,359 @@ 26 }; -#define VICINTSTATUS (PVOID)0xE0040000 -#define VICINTENABLE (PVOID)0xE0040010 -#define VICINTENCLEAR (PVOID)0xE0040014 -#define VICSOFTINT (PVOID)0xE0040018 -#define VICSOFTINTCLEAR (PVOID)0xE004001C - -#define TIMER_LOAD (PVOID)0xE00E2000 -#define TIMER_VALUE (PVOID)0xE00E2004 -#define TIMER_CONTROL (PVOID)0xE00E2008 -#define TIMER_INT_CLEAR (PVOID)0xE00E200C -#define TIMER_INT_STATUS (PVOID)0xE00E2010 -#define TIMER_INT_MASK (PVOID)0xE00E2014 -#define TIMER_BACKGROUND_LOAD (PVOID)0xE00E2018 - -#define TIMER2_LOAD (PVOID)0xE00E3000 -#define TIMER2_VALUE (PVOID)0xE00E3004 -#define TIMER2_CONTROL (PVOID)0xE00E3008 -#define TIMER2_INT_CLEAR (PVOID)0xE00E300C -#define TIMER2_INT_STATUS (PVOID)0xE00E3010 -#define TIMER2_INT_MASK (PVOID)0xE00E3014 -#define TIMER2_BACKGROUND_LOAD (PVOID)0xE00E3018 - -#define _clz(a) \ -({ ULONG __value, __arg = (a); \ - asm ("clz\t%0, %1": "=r" (__value): "r" (__arg)); \ - __value; }) +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + +/* +* @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; +} + +VOID +FASTCALL +ExAcquireFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; +} + + +VOID +FASTCALL +ExReleaseFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; +} + + +BOOLEAN FASTCALL +ExTryToAcquireFastMutex( + PFAST_MUTEX FastMutex) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalAcquireDisplayOwnership( + PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) +{ + UNIMPLEMENTED; +} + + +NTSTATUS +NTAPI +HalAdjustResourceList( + PCM_RESOURCE_LIST Resources) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalAllProcessorsStarted(VOID) +{ + /* Do nothing */ + return TRUE; +} + + +NTSTATUS +NTAPI +HalAllocateAdapterChannel( + PADAPTER_OBJECT AdapterObject, + PWAIT_CONTEXT_BLOCK WaitContextBlock, + ULONG NumberOfMapRegisters, + PDRIVER_CONTROL ExecutionRoutine) +{ + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + + +PVOID +NTAPI +HalAllocateCommonBuffer( + PADAPTER_OBJECT AdapterObject, + ULONG Length, + PPHYSICAL_ADDRESS LogicalAddress, + BOOLEAN CacheEnabled) +{ + UNIMPLEMENTED; + + return NULL; +} + + +PVOID +NTAPI +HalAllocateCrashDumpRegisters( + PADAPTER_OBJECT AdapterObject, + PULONG NumberOfMapRegisters) +{ + UNIMPLEMENTED; + return NULL; +} + + +NTSTATUS +NTAPI +HalAssignSlotResources( + PUNICODE_STRING RegistryPath, + PUNICODE_STRING DriverClassName, + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT DeviceObject, + INTERFACE_TYPE BusType, + ULONG BusNumber, + ULONG SlotNumber, + PCM_RESOURCE_LIST *AllocatedResources) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +BOOLEAN +NTAPI +HalBeginSystemInterrupt (KIRQL Irql, + ULONG Vector, + PKIRQL OldIrql) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalCalibratePerformanceCounter( + volatile LONG *Count, + ULONGLONG NewCount) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalDisplayString( + PCH String) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalEndSystemInterrupt( + KIRQL Irql, + ULONG Unknown2) +{ + UNIMPLEMENTED; +} + + +BOOLEAN +NTAPI +HalFlushCommonBuffer( + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4, + ULONG Unknown5) +{ + UNIMPLEMENTED; + + return TRUE; +} + + +VOID +NTAPI +HalFreeCommonBuffer( + PADAPTER_OBJECT AdapterObject, + ULONG Length, + PHYSICAL_ADDRESS LogicalAddress, + PVOID VirtualAddress, + BOOLEAN CacheEnabled) +{ + UNIMPLEMENTED; +} + + +PADAPTER_OBJECT +NTAPI +HalGetAdapter( + PDEVICE_DESCRIPTION DeviceDescription, + PULONG NumberOfMapRegisters) +{ + UNIMPLEMENTED; + + return (PADAPTER_OBJECT)NULL; +} + + +ULONG +NTAPI +HalGetBusData( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ULONG +NTAPI +HalGetBusDataByOffset( + BUS_DATA_TYPE BusDataType, + ULONG BusNumber, + ULONG SlotNumber, + PVOID Buffer, + ULONG Offset, + ULONG Length) +{ + UNIMPLEMENTED; + + return 0; +} + + +ARC_STATUS +NTAPI +HalGetEnvironmentVariable( + PCH Name, + USHORT ValueLength, + PCH Value) +{ + UNIMPLEMENTED; + + return ENOENT; +} + + +ULONG +NTAPI +HalGetInterruptVector( + INTERFACE_TYPE InterfaceType, + ULONG BusNumber, + ULONG BusInterruptLevel, + ULONG BusInterruptVector, + PKIRQL Irql, + PKAFFINITY Affinity) +{ + UNIMPLEMENTED; + + return 0; +} + + +VOID +NTAPI +HalHandleNMI( + PVOID NmiData) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PCHAR CommandLine; + + /* Make sure we have a loader block and command line */ + if ((LoaderBlock) && (LoaderBlock->LoadOptions)) + { + /* Read the command line */ + CommandLine = LoaderBlock->LoadOptions; + + /* Check for initial breakpoint */ + if (strstr(CommandLine, "BREAK")) DbgBreakPoint(); + } +} ULONG HalGetInterruptSource(VOID) @@ -522,7 +461,7 @@ // // Get the interrupt status, and return the highest bit set // - InterruptStatus = READ_REGISTER_ULONG(VICINTSTATUS); + InterruptStatus = READ_REGISTER_ULONG(VIC_INT_STATUS); return 31 - _clz(InterruptStatus); } @@ -533,7 +472,7 @@ // Clear the interrupt // //DPRINT1("CLOCK INTERRUPT!!!\n"); - WRITE_REGISTER_ULONG(TIMER_INT_CLEAR, 1); + WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); //while (TRUE); } @@ -543,7 +482,7 @@ // // Clear the interrupt // - WRITE_REGISTER_ULONG(TIMER_INT_CLEAR, 1); + WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); } VOID @@ -551,18 +490,18 @@ { PKPCR Pcr = (PKPCR)KeGetPcr(); ULONG ClockInterval; + SP804_CONTROL_REGISTER ControlRegister; // // Fill out the IRQL mappings // RtlCopyMemory(Pcr->IrqlTable, HalpIrqlTable, sizeof(Pcr->IrqlTable)); RtlCopyMemory(Pcr->IrqlMask, HalpMaskTable, sizeof(Pcr->IrqlMask)); - + // // Setup the clock and profile interrupt // Pcr->InterruptRoutine[CLOCK2_LEVEL] = HalpStallInterrupt; - // Pcr->InterruptRoutine[PROFILE_LEVEL] = HalpCountInterrupt; // // Configure the interval to 10ms @@ -571,18 +510,21 @@ // (TIMCLKENXdiv (1) * PRESCALEdiv (1)) // ClockInterval = 0x2710; - + + // + // Configure the timer + // + ControlRegister.AsUlong = 0; + ControlRegister.Wide = TRUE; + ControlRegister.Periodic = TRUE; + ControlRegister.Interrupt = TRUE; + ControlRegister.Enabled = TRUE; + // // Enable the timer // - WRITE_REGISTER_ULONG(TIMER_LOAD, ClockInterval); - WRITE_REGISTER_ULONG(TIMER_CONTROL, - 0 << 0 | // wrapping mode - 1 << 1 | // 32-bit mode - 0 << 2 | // 0 stages of prescale, divided by 1 - 1 << 5 | // enable interrupt - 1 << 6 | // periodic mode - 1 << 7); // enable it + WRITE_REGISTER_ULONG(TIMER0_LOAD, ClockInterval); + WRITE_REGISTER_ULONG(TIMER0_CONTROL, ControlRegister.AsUlong); } ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; @@ -805,7 +747,7 @@ // Force a software interrupt // DPRINT1("[SOFTINT]: %d\n", Request); - WRITE_REGISTER_ULONG(VICSOFTINT, 1 << Request); + WRITE_REGISTER_ULONG(VIC_SOFT_INT, 1 << Request); } VOID @@ -816,7 +758,7 @@ // Force a software interrupt // DPRINT1("[SOFTINTC] %d\n", Request); - WRITE_REGISTER_ULONG(VICSOFTINTCLEAR, 1 << Request); + WRITE_REGISTER_ULONG(VIC_SOFT_INT_CLEAR, 1 << Request); } VOID @@ -1081,31 +1023,27 @@ NTAPI KeStallExecutionProcessor(IN ULONG Microseconds) { - // - // Configure the interval to xxx Micrseconds - // (INTERVAL (xxx us) * TIMCLKfreq (1MHz)) - // --------------------------------------- - // (TIMCLKENXdiv (1) * PRESCALEdiv (1)) - // - // This works out great, since 1MHz * 1 us = 1! - // + SP804_CONTROL_REGISTER ControlRegister; // // Enable the timer // - WRITE_REGISTER_ULONG(TIMER2_LOAD, Microseconds); - WRITE_REGISTER_ULONG(TIMER2_CONTROL, - 1 << 0 | // one-shot mode - 1 << 1 | // 32-bit mode - 0 << 2 | // 0 stages of prescale, divided by 1 - 0 << 5 | // no interrupt - 1 << 6 | // periodic mode - 1 << 7); // enable it + WRITE_REGISTER_ULONG(TIMER1_LOAD, Microseconds); + + // + // Configure the timer + // + ControlRegister.AsUlong = 0; + ControlRegister.OneShot = TRUE; + ControlRegister.Wide = TRUE; + ControlRegister.Periodic = TRUE; + ControlRegister.Enabled = TRUE; + WRITE_REGISTER_ULONG(TIMER1_CONTROL, ControlRegister.AsUlong); // // Now we will loop until the timer reached 0 // - while (READ_REGISTER_ULONG(TIMER2_VALUE)); + while (READ_REGISTER_ULONG(TIMER1_VALUE)); } VOID @@ -1137,13 +1075,13 @@ // // Clear interrupts associated to the old IRQL // - WRITE_REGISTER_ULONG(VICINTENCLEAR, 0xFFFFFFFF); + WRITE_REGISTER_ULONG(VIC_INT_CLEAR, 0xFFFFFFFF); // // Set the new interrupt mask // PL190 VIC support only for now // - WRITE_REGISTER_ULONG(VICINTENABLE, InterruptMask); + WRITE_REGISTER_ULONG(VIC_INT_ENABLE, InterruptMask); // // Save the new IRQL @@ -1183,13 +1121,13 @@ // // Clear interrupts associated to the old IRQL // - WRITE_REGISTER_ULONG(VICINTENCLEAR, 0xFFFFFFFF); + WRITE_REGISTER_ULONG(VIC_INT_CLEAR, 0xFFFFFFFF); // // Set the new interrupt mask // PL190 VIC support only for now // - WRITE_REGISTER_ULONG(VICINTENABLE, InterruptMask); + WRITE_REGISTER_ULONG(VIC_INT_ENABLE, InterruptMask); // // Save the new IRQL Modified: trunk/reactos/hal/halarm/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halarm/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/include/hal.h [iso-8859-1] Sun Jun 15 02:54:18 2008 @@ -1,9 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Hardware Abstraction Layer - * FILE: hal/halx86/include/hal.h - * PURPOSE: HAL Header - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halarm/include/hal.h + * PURPOSE: Hardware Abstraction Layer Header + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/hal/halarm/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halarm/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/include/halp.h [iso-8859-1] Sun Jun 15 02:54:18 2008 @@ -1,114 +1,22 @@ -/* - * - */ - #ifndef __INTERNAL_HAL_HAL_H #define __INTERNAL_HAL_HAL_H -/* WDK Hack */ +// +// ARM Headers +// +#include <internal/arm/ke.h> +#include <internal/arm/intrin_i.h> + +// +// Versatile Peripherals +// +#include <peripherals/pl011.h> +#include <peripherals/pl190.h> +#include <peripherals/sp804.h> + +// +// WDK Hack +// #define KdComPortInUse _KdComPortInUse -#define HAL_APC_REQUEST 0 -#define HAL_DPC_REQUEST 1 - -/* Conversion functions */ -#define BCD_INT(bcd) \ - (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F)) -#define INT_BCD(int) \ - (UCHAR)(((int / 10) << 4) + (int % 10)) - -/* adapter.c */ -PADAPTER_OBJECT STDCALL HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); - -/* bus.c */ -VOID NTAPI HalpInitNonBusHandler (VOID); - -/* irql.c */ -VOID NTAPI HalpInitPICs(VOID); - -/* udelay.c */ -VOID NTAPI HalpInitializeClock(VOID); - -/* pci.c */ -VOID HalpInitPciBus (VOID); - -/* dma.c */ -VOID HalpInitDma (VOID); - -/* Non-generic initialization */ -VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); -VOID HalpInitPhase1(VOID); -VOID NTAPI HalpClockInterrupt(VOID); - -// -// KD Support -// -VOID -NTAPI -HalpCheckPowerButton( - VOID -); - -VOID -NTAPI -HalpRegisterKdSupportFunctions( - VOID -); - -NTSTATUS -NTAPI -HalpSetupPciDeviceForDebugging( - IN PVOID LoaderBlock, - IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice -); - -NTSTATUS -NTAPI -HalpReleasePciDeviceForDebugging( - IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice -); - -// -// Memory routines -// -PVOID -NTAPI -HalpMapPhysicalMemory64( - IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberPage -); - -VOID -NTAPI -HalpUnmapVirtualAddress( - IN PVOID VirtualAddress, - IN ULONG NumberPages -); - -/* sysinfo.c */ -NTSTATUS -NTAPI -HaliQuerySystemInformation( - IN HAL_QUERY_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN OUT PVOID Buffer, - OUT PULONG ReturnedLength -); - -NTSTATUS -NTAPI -HaliSetSystemInformation( - IN HAL_SET_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN OUT PVOID Buffer -); - -typedef struct tagHALP_HOOKS -{ - void (*InitPciBus)(ULONG BusNumber, PBUS_HANDLER BusHandler); -} HALP_HOOKS, *PHALP_HOOKS; - -extern HALP_HOOKS HalpHooks; -extern KSPIN_LOCK HalpSystemHardwareLock; - #endif /* __INTERNAL_HAL_HAL_H */ Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] Sun Jun 15 02:54:18 2008 @@ -289,6 +289,10 @@ } #endif +#define _clz(a) \ +({ ULONG __value, __arg = (a); \ +asm ("clz\t%0, %1": "=r" (__value): "r" (__arg)); \ +__value; }) #endif /* EOF */ Modified: trunk/reactos/include/reactos/arm/peripherals/pl190.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] Sun Jun 15 02:54:18 2008 @@ -16,5 +16,5 @@ #define VIC_INT_STATUS (VIC_BASE + 0x00) #define VIC_INT_ENABLE (VIC_BASE + 0x10) #define VIC_INT_CLEAR (VIC_BASE + 0x14) -#define VIC_SOFT_INT (VIC_BASE + 0x18 +#define VIC_SOFT_INT (VIC_BASE + 0x18) #define VIC_SOFT_INT_CLEAR (VIC_BASE + 0x1C) Modified: trunk/reactos/include/reactos/arm/peripherals/sp804.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] Sun Jun 15 02:54:18 2008 @@ -12,20 +12,20 @@ // Timer Registers // #define TIMER_BASE(x) (PVOID)(0xE00E2000 + (x * 0x1000)) /* HACK: freeldr mapped it here */ -#define TIMER0_LOAD TIMER_BASE(0, 0x00) -#define TIMER0_VALUE TIMER_BASE(0, 0x04) -#define TIMER0_CONTROL TIMER_BASE(0, 0x08) -#define TIMER0_INT_CLEAR TIMER_BASE(0, 0x0C) -#define TIMER0_INT_STATUS TIMER_BASE(0, 0x10) -#define TIMER0_INT_MASK TIMER_BASE(0, 0x14) -#define TIMER0_BACKGROUND_LOAD TIMER_BASE(0, 0x18) -#define TIMER1_LOAD TIMER_BASE(1, 0x00) -#define TIMER1_VALUE TIMER_BASE(1, 0x04) -#define TIMER1_CONTROL TIMER_BASE(1, 0x08) -#define TIMER1_INT_CLEAR TIMER_BASE(1, 0x0C) -#define TIMER1_INT_STATUS TIMER_BASE(1, 0x10) -#define TIMER1_INT_MASK TIMER_BASE(1, 0x14) -#define TIMER1_BACKGROUND_LOAD TIMER_BASE(1, 0x18) +#define TIMER0_LOAD TIMER_BASE(0) + 0x00 +#define TIMER0_VALUE TIMER_BASE(0) + 0x04 +#define TIMER0_CONTROL TIMER_BASE(0) + 0x08 +#define TIMER0_INT_CLEAR TIMER_BASE(0) + 0x0C +#define TIMER0_INT_STATUS TIMER_BASE(0) + 0x10 +#define TIMER0_INT_MASK TIMER_BASE(0) + 0x14 +#define TIMER0_BACKGROUND_LOAD TIMER_BASE(1) + 0x18 +#define TIMER1_LOAD TIMER_BASE(1) + 0x00 +#define TIMER1_VALUE TIMER_BASE(1) + 0x04 +#define TIMER1_CONTROL TIMER_BASE(1) + 0x08 +#define TIMER1_INT_CLEAR TIMER_BASE(1) + 0x0C +#define TIMER1_INT_STATUS TIMER_BASE(1) + 0x10 +#define TIMER1_INT_MASK TIMER_BASE(1) + 0x14 +#define TIMER1_BACKGROUND_LOAD TIMER_BASE(1) + 0x18 // // Control Register @@ -34,13 +34,14 @@ { struct { - ULONG Wrap:1; + ULONG OneShot:1; ULONG Wide:1; ULONG Prescale:2; ULONG Reserved:1; ULONG Interrupt:1; ULONG Periodic:1; ULONG Enabled:1; + ULONG Unused:24; }; ULONG AsUlong; } SP804_CONTROL_REGISTER, *PSP804_CONTROL_REGISTER;

1 0

[ros-arm-bringup] 33980: - These are peripherals, not targets
by ros-arm-bringup＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: ros-arm-bringup Date: Sun Jun 15 01:15:13 2008 New Revision: 33980 URL: http://svn.reactos.org/svn/reactos?rev=33980&view=rev Log: - These are peripherals, not targets Added: trunk/reactos/include/reactos/arm/peripherals/ - copied from r33979, trunk/reactos/include/reactos/arm/targets/ Removed: trunk/reactos/include/reactos/arm/targets/

1 0

[ros-arm-bringup] 33979: - Start major ARM port cleanup: - Make use of the SARCH rbuild parameter to define the target board (default to ARM VersatilePB for now) - Make official ARM include directory (include/reactos/arm) and move the ARM DDK there - Start creating header files for different target board components. - Update halfuncs in NDK with one missing function, and temporarily, one ARM function.
by ros-arm-bringup＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: ros-arm-bringup Date: Sun Jun 15 01:14:02 2008 New Revision: 33979 URL: http://svn.reactos.org/svn/reactos?rev=33979&view=rev Log: - Start major ARM port cleanup: - Make use of the SARCH rbuild parameter to define the target board (default to ARM VersatilePB for now) - Make official ARM include directory (include/reactos/arm) and move the ARM DDK there - Start creating header files for different target board components. - Update halfuncs in NDK with one missing function, and temporarily, one ARM function. Added: trunk/reactos/include/reactos/arm/ trunk/reactos/include/reactos/arm/armddk.h - copied unchanged from r33967, trunk/reactos/include/reactos/armddk.h trunk/reactos/include/reactos/arm/targets/ trunk/reactos/include/reactos/arm/targets/pl011.h (with props) trunk/reactos/include/reactos/arm/targets/pl190.h (with props) trunk/reactos/include/reactos/arm/targets/sp804.h (with props) Removed: trunk/reactos/include/reactos/armddk.h Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/config-arm.template.rbuild trunk/reactos/include/ndk/halfuncs.h trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=339… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sun Jun 15 01:14:02 2008 @@ -12,8 +12,14 @@ <define name="_ARM_" /> <define name="__arm__" /> + <include>include/reactos/arm</include> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> + + <if property="SARCH" value="versatile"> + <define name="BOARD_CONFIG_VERSATILE"/> + </if> <if property="OPTIMIZE" value="1"> <compilerflag>-Os</compilerflag> Modified: trunk/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild… ============================================================================== --- trunk/reactos/config-arm.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-arm.template.rbuild [iso-8859-1] Sun Jun 15 01:14:02 2008 @@ -14,15 +14,16 @@  -<property name="SARCH" value="" /> +<property name="SARCH" value="versatile" />  Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] Sun Jun 15 01:14:02 2008 @@ -137,6 +137,12 @@ PKIRQL OldIrql ); +VOID +FASTCALL +HalClearSoftwareInterrupt( + IN KIRQL Request +); + NTHALAPI BOOLEAN NTAPI @@ -162,6 +168,13 @@ ULONG Vector ); +#ifdef _ARM_ // FIXME: ndk/arm? armddk.h? +ULONG +HalGetInterruptSource( + VOID +); +#endif + NTHALAPI VOID NTAPI Added: trunk/reactos/include/reactos/arm/targets/pl011.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/target… ============================================================================== --- trunk/reactos/include/reactos/arm/targets/pl011.h (added) +++ trunk/reactos/include/reactos/arm/targets/pl011.h [iso-8859-1] Sun Jun 15 01:14:02 2008 @@ -1,0 +1,58 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: include/reactos/arm/targets/pl011.h + * PURPOSE: PL011 Registers and Constants + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* GLOBALS ********************************************************************/ + +// +// UART Registers +// +#define UART_BASE (PVOID)0xE00F1000 /* HACK: freeldr mapped it here */ + +#define UART_PL01x_DR (UART_BASE + 0x00) +#define UART_PL01x_RSR (UART_BASE + 0x04) +#define UART_PL01x_ECR (UART_BASE + 0x04) +#define UART_PL01x_FR (UART_BASE + 0x18) +#define UART_PL011_IBRD (UART_BASE + 0x24) +#define UART_PL011_FBRD (UART_BASE + 0x28) +#define UART_PL011_LCRH (UART_BASE + 0x2C) +#define UART_PL011_CR (UART_BASE + 0x30) +#define UART_PL011_IMSC (UART_BASE + 0x38) + +// +// LCR Values +// +typedef union _PL011_LCR_REGISTER +{ + ULONG Todo; +} PL011_LCR_REGISTER, *PPL011_LCR_REGISTER; + +#define UART_PL011_LCRH_WLEN_8 0x60 +#define UART_PL011_LCRH_FEN 0x10 + +// +// FCR Values +// +typedef union _PL011_FCR_REGISTER +{ + ULONG Todo; +} PL011_FCR_REGISTER, *PPL011_FCR_REGISTER; + +#define UART_PL011_CR_UARTEN 0x01 +#define UART_PL011_CR_TXE 0x100 +#define UART_PL011_CR_RXE 0x200 + +// +// LSR Values +// +typedef union _PL011_LSR_REGISTER +{ + ULONG Todo; +} PL011_LSR_REGISTER, *PPL011_LSR_REGISTER; + +#define UART_PL01x_FR_RXFE 0x10 +#define UART_PL01x_FR_TXFF 0x20 Propchange: trunk/reactos/include/reactos/arm/targets/pl011.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/arm/targets/pl011.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/include/reactos/arm/targets/pl190.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/target… ============================================================================== --- trunk/reactos/include/reactos/arm/targets/pl190.h (added) +++ trunk/reactos/include/reactos/arm/targets/pl190.h [iso-8859-1] Sun Jun 15 01:14:02 2008 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: include/reactos/arm/targets/pl190.h + * PURPOSE: PL190 Registers and Constants + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* GLOBALS ********************************************************************/ + +// +// VIC Registers +// +#define VIC_BASE (PVOID)0xE0040000 /* HACK: freeldr mapped it here */ + +#define VIC_INT_STATUS (VIC_BASE + 0x00) +#define VIC_INT_ENABLE (VIC_BASE + 0x10) +#define VIC_INT_CLEAR (VIC_BASE + 0x14) +#define VIC_SOFT_INT (VIC_BASE + 0x18 +#define VIC_SOFT_INT_CLEAR (VIC_BASE + 0x1C) Propchange: trunk/reactos/include/reactos/arm/targets/pl190.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/arm/targets/pl190.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/include/reactos/arm/targets/sp804.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/target… ============================================================================== --- trunk/reactos/include/reactos/arm/targets/sp804.h (added) +++ trunk/reactos/include/reactos/arm/targets/sp804.h [iso-8859-1] Sun Jun 15 01:14:02 2008 @@ -1,0 +1,46 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: include/reactos/arm/targets/pl011.h + * PURPOSE: SB804 Registers and Constants + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* GLOBALS ********************************************************************/ + +// +// Timer Registers +// +#define TIMER_BASE(x) (PVOID)(0xE00E2000 + (x * 0x1000)) /* HACK: freeldr mapped it here */ +#define TIMER0_LOAD TIMER_BASE(0, 0x00) +#define TIMER0_VALUE TIMER_BASE(0, 0x04) +#define TIMER0_CONTROL TIMER_BASE(0, 0x08) +#define TIMER0_INT_CLEAR TIMER_BASE(0, 0x0C) +#define TIMER0_INT_STATUS TIMER_BASE(0, 0x10) +#define TIMER0_INT_MASK TIMER_BASE(0, 0x14) +#define TIMER0_BACKGROUND_LOAD TIMER_BASE(0, 0x18) +#define TIMER1_LOAD TIMER_BASE(1, 0x00) +#define TIMER1_VALUE TIMER_BASE(1, 0x04) +#define TIMER1_CONTROL TIMER_BASE(1, 0x08) +#define TIMER1_INT_CLEAR TIMER_BASE(1, 0x0C) +#define TIMER1_INT_STATUS TIMER_BASE(1, 0x10) +#define TIMER1_INT_MASK TIMER_BASE(1, 0x14) +#define TIMER1_BACKGROUND_LOAD TIMER_BASE(1, 0x18) + +// +// Control Register +// +typedef union _SP804_CONTROL_REGISTER +{ + struct + { + ULONG Wrap:1; + ULONG Wide:1; + ULONG Prescale:2; + ULONG Reserved:1; + ULONG Interrupt:1; + ULONG Periodic:1; + ULONG Enabled:1; + }; + ULONG AsUlong; +} SP804_CONTROL_REGISTER, *PSP804_CONTROL_REGISTER; Propchange: trunk/reactos/include/reactos/arm/targets/sp804.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/arm/targets/sp804.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Removed: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/armddk.h (removed) @@ -1,166 +1,0 @@ -#ifndef _ARMDDK_ -#define _ARMDDK_ - -// -// IRQLs -// -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define SYNCH_LEVEL DISPATCH_LEVEL -#define PROFILE_LEVEL 27 -#define CLOCK1_LEVEL 28 -#define CLOCK2_LEVEL 28 -#define IPI_LEVEL 29 -#define POWER_LEVEL 30 -#define HIGH_LEVEL 31 - -// -// FIXME: mmtypes.h? -// -#define KIPCR 0xFFFFF000 -#define KI_USER_SHARED_DATA 0xFFFFE000 -#define USPCR 0x7FFF0000 -#define PCR ((volatile KPCR * const)KIPCR) -#define USERPCR ((volatile KPCR * const)USPCR) - -// -// Maximum IRQs -// -#define MAXIMUM_VECTOR 16 - -// -// Just read it from the PCR -// -#define KeGetCurrentProcessorNumber() PCR->Number -#define KeGetCurrentIrql() PCR->CurrentIrql -#define _KeGetCurrentThread() PCR->CurrentThread -#define _KeGetPreviousMode() PCR->CurrentThread->PreviousMode -#define _KeIsExecutingDpc() (PCR->DpcRoutineActive != 0) -#define KeGetDcacheFillSize() PCR->DcacheFillSize - -// -// Stub -// -typedef struct _KFLOATING_SAVE -{ - ULONG Reserved; -} KFLOATING_SAVE, *PKFLOATING_SAVE; - -// -// Processor Control Region -// On ARM, it's actually readable from user-mode, much like KUSER_SHARED_DATA -// -#ifdef _WINNT_H -typedef -VOID -(*PKINTERRUPT_ROUTINE)(VOID); -#endif -typedef struct _KPCR -{ - ULONG MinorVersion; - ULONG MajorVersion; - PKINTERRUPT_ROUTINE InterruptRoutine[MAXIMUM_VECTOR]; - PVOID XcodeDispatch; - ULONG FirstLevelDcacheSize; - ULONG FirstLevelDcacheFillSize; - ULONG FirstLevelIcacheSize; - ULONG FirstLevelIcacheFillSize; - ULONG SecondLevelDcacheSize; - ULONG SecondLevelDcacheFillSize; - ULONG SecondLevelIcacheSize; - ULONG SecondLevelIcacheFillSize; - struct _KPRCB *Prcb; - struct _TEB *Teb; - PVOID TlsArray; - ULONG DcacheFillSize; - ULONG IcacheAlignment; - ULONG IcacheFillSize; - ULONG ProcessorId; - ULONG ProfileInterval; - ULONG ProfileCount; - ULONG StallExecutionCount; - ULONG StallScaleFactor; - CCHAR Number; - PVOID DataBusError; - PVOID InstructionBusError; - ULONG CachePolicy; - ULONG AlignedCachePolicy; - UCHAR IrqlMask[HIGH_LEVEL + 1]; - ULONG IrqlTable[HIGH_LEVEL + 1]; - UCHAR CurrentIrql; - KAFFINITY SetMember; - struct _KTHREAD *CurrentThread; - ULONG ReservedVectors; - KAFFINITY NotMember; - ULONG SystemReserved[6]; - ULONG DcacheAlignment; - ULONG HalReserved[64]; - BOOLEAN FirstLevelActive; - BOOLEAN DpcRoutineActive; - ULONG CurrentPid; - BOOLEAN OnInterruptStack; - PVOID SavedInitialStack; - PVOID SavedStackLimit; - PVOID SystemServiceDispatchStart; - PVOID SystemServiceDispatchEnd; - PVOID InterruptStack; - PVOID PanicStack; - PVOID BadVaddr; - PVOID InitialStack; - PVOID StackLimit; - ULONG QuantumEnd; - PVOID PerfGlobalGroupMask; - ULONG ContextSwitches; -} KPCR, *PKPCR; - -// -// Get the current TEB -// -FORCEINLINE -struct _TEB* NtCurrentTeb(VOID) -{ - return (struct _TEB*)USERPCR->Teb; -} - -// -// IRQL Support on ARM is similar to MIPS/ALPHA -// -KIRQL -KfRaiseIrql( - IN KIRQL NewIrql -); - -VOID -KfLowerIrql( - IN KIRQL NewIrql -); - -KIRQL -KeRaiseIrqlToSynchLevel( - VOID -); - -KIRQL -KeRaiseIrqlToDpcLevel( - VOID -); - -#define KeLowerIrql(NewIrql) KfLowerIrql(NewIrql) -#define KeRaiseIrql(NewIrql, OldIrql) *(OldIrql) = KfRaiseIrql(NewIrql) - -// -// Cache clean and flush -// -VOID -HalSweepDcache( - VOID -); - -VOID -HalSweepIcache( - VOID -); - -#endif Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sun Jun 15 01:14:02 2008 @@ -26,12 +26,6 @@ ); /* FUNCTIONS ******************************************************************/ - -ULONG -HalGetInterruptSource(VOID); - -VOID FASTCALL -HalClearSoftwareInterrupt(IN KIRQL Request); VOID KiIdleLoop(VOID)

1 0

[dchapyshev] 33978: - Update Russian translation
by dchapyshev＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: dchapyshev Date: Sun Jun 15 01:01:53 2008 New Revision: 33978 URL: http://svn.reactos.org/svn/reactos?rev=33978&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer/explorer-ru.rc Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Sun Jun 15 01:01:53 2008 @@ -18,15 +18,15 @@ MENUITEM "", -1, MFT_SEPARATOR POPUP "&Ïðîãðàììû", IDM_PROGRAMS BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Èçáðàííîå", IDM_FAVORITES BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Äîêóìåíòû", IDM_DOCUMENTS BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Ïóñòî)", -1, MFT_STRING, MFS_GRAYED END POPUP "&Íàñòðîéêè", IDM_SETTINGS BEGIN Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] Sun Jun 15 01:01:53 2008 @@ -381,9 +381,9 @@ IDS_DESKTOPBAR_SETTINGS "Íàñòðîéêè ðàáî÷åãî ñòîëà" IDS_DESKTOP "Ðàáî÷èé ñòîë" IDS_TASKBAR "Ïàíåëü çàäà÷" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" - IDS_MENUCOLUMN "Menu path" + IDS_NAMECOLUMN "Èìÿ" + IDS_PATHCOLUMN "Ïóòü" + IDS_MENUCOLUMN "Ïóòü â ìåíþ" END #endif // Russian resources

1 0

[ros-arm-bringup] 33977: - Create cmhardwr.c for ARM, stub it out. - Implement KiInitMachineDependent -- this is only useful for x86 and has nothing relevant to ARM, so we just return. - Implement HalAllProcessorsStarted (again, a no-op) and HalQueryRealTimeClock (uses the RTC on the board -- uboot must set it up first). - Make sure we get the right Sp during a system call (this is still broken though). - We need to fix our system call handler next.
by ros-arm-bringup＠svn.reactos.org 15 Jun '08

15 Jun '08

Author: ros-arm-bringup Date: Sun Jun 15 00:40:27 2008 New Revision: 33977 URL: http://svn.reactos.org/svn/reactos?rev=33977&view=rev Log: - Create cmhardwr.c for ARM, stub it out. - Implement KiInitMachineDependent -- this is only useful for x86 and has nothing relevant to ARM, so we just return. - Implement HalAllProcessorsStarted (again, a no-op) and HalQueryRealTimeClock (uses the RTC on the board -- uboot must set it up first). - Make sure we get the right Sp during a system call (this is still broken though). - We need to fix our system call handler next. Added: trunk/reactos/ntoskrnl/config/arm/ trunk/reactos/ntoskrnl/config/arm/cmhardwr.c - copied, changed from r33932, trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -18,6 +18,7 @@ #include <ndk/iofuncs.h> #include <ndk/kdfuncs.h> #include <ndk/kefuncs.h> +#include <ndk/rtlfuncs.h> #include <internal/arm/ke.h> #include <internal/arm/intrin_i.h> #include <bugcodes.h> @@ -135,13 +136,15 @@ } +/* + * @implemented + */ BOOLEAN NTAPI HalAllProcessorsStarted(VOID) { - UNIMPLEMENTED; - - return TRUE; + /* Do nothing */ + return TRUE; } @@ -733,16 +736,31 @@ UNIMPLEMENTED; } +#define RTC_DATA (PVOID)0xE00E8000 BOOLEAN NTAPI -HalQueryRealTimeClock( - PTIME_FIELDS Time) -{ - UNIMPLEMENTED; - return FALSE; -} - +HalQueryRealTimeClock(IN PTIME_FIELDS Time) +{ + LARGE_INTEGER LargeTime; + ULONG Seconds; + + // + // Query the RTC value + // + Seconds = READ_REGISTER_ULONG(RTC_DATA); + + // + // Convert to time + // + RtlSecondsSince1970ToTime(Seconds, &LargeTime); + + // + // Convert to time-fields + // + RtlTimeToTimeFields(&LargeTime, Time); + return TRUE; +} ULONG NTAPI Copied: trunk/reactos/ntoskrnl/config/arm/cmhardwr.c (from r33932, trunk/reactos/ntoskrnl/config/i386/cmhardwr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/arm/cmhard… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/arm/cmhardwr.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/i386/cmhardwr.c - * PURPOSE: Configuration Manager - Hardware-Specific Code - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * FILE: ntoskrnl/config/arm/cmhardwr.c + * PURPOSE: Configuration Manager - ARM Specific Code + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES ******************************************************************/ @@ -14,820 +14,12 @@ /* GLOBALS *******************************************************************/ -PCHAR CmpID1 = "80%u86-%c%x"; -PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; -PCHAR CmpBiosStrings[] = -{ - "Ver", - "Rev", - "Rel", - "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", - "v 0", "v 1", "v 2", "v 3", "v 4", "v 5", "v 6", "v 7", "v 8", "v 9", - NULL -}; - -PCHAR CmpBiosBegin, CmpBiosSearchStart, CmpBiosSearchEnd; - /* FUNCTIONS *****************************************************************/ - -BOOLEAN -NTAPI -CmpGetBiosDate(IN PCHAR BiosStart, - IN ULONG BiosLength, - IN PCHAR BiosDate, - IN BOOLEAN FromBios) -{ - CHAR LastDate[11] = {0}, CurrentDate[11]; - PCHAR p, pp; - - /* Skip the signature and the magic, and loop the BIOS ROM */ - p = BiosStart + 2; - pp = BiosStart + BiosLength - 5; - while (p < pp) - { - /* Check for xx/yy/zz which we assume to be a date */ - if ((p[0] == '/') && - (p[3] == '/') && - (isdigit(p[-1])) && - (isdigit(p[1])) && - (isdigit(p[2])) && - (isdigit(p[4])) && - (isdigit(p[5]))) - { - /* Copy the string proper */ - RtlMoveMemory(&CurrentDate[5], p - 2, 5); - - /* Add a 0 if the month only has one digit */ - if (!isdigit(CurrentDate[5])) CurrentDate[5] = '0'; - - /* Now copy the year */ - CurrentDate[2] = p[4]; - CurrentDate[3] = p[5]; - CurrentDate[4] = CurrentDate[7] = CurrentDate[10] = ANSI_NULL; - - /* If the date comes from the BIOS, check if it's a 4-digit year */ - if ((FromBios) && - (isdigit(p[6])) && - (isdigit(p[7])) && - ((RtlEqualMemory(&p[4], "19", 2)) || - (RtlEqualMemory(&p[4], "20", 2)))) - { - /* Copy the year proper */ - CurrentDate[0] = p[4]; - CurrentDate[1] = p[5]; - CurrentDate[2] = p[6]; - CurrentDate[3] = p[7]; - } - else - { - /* Otherwise, we'll just assume anything under 80 is 2000 */ - if (strtoul(&CurrentDate[2], NULL, 10) < 80) - { - /* Hopefully your BIOS wasn't made in 1979 */ - CurrentDate[0] = '2'; - CurrentDate[1] = '0'; - } - else - { - /* Anything over 80, was probably made in the 1900s... */ - CurrentDate[0] = '1'; - CurrentDate[1] = '9'; - } - } - - /* Add slashes were we previously had NULLs */ - CurrentDate[4] = CurrentDate[7] = '/'; - - /* Check which date is newer */ - if (memcmp(LastDate, CurrentDate, 10) < 0) - { - /* Found a newer date, select it */ - RtlMoveMemory(LastDate, CurrentDate, 10); - } - - p += 2; - } - p++; - } - - /* Make sure we found a date */ - if (LastDate[0]) - { - /* Copy the year at the pp, and keep only the last two digits */ - RtlMoveMemory(BiosDate, &LastDate[5], 5); - BiosDate[5] = '/'; - BiosDate[6] = LastDate[2]; - BiosDate[7] = LastDate[3]; - BiosDate[8] = ANSI_NULL; - return TRUE; - } - - /* No date found, return empty string */ - BiosDate[0] = ANSI_NULL; - return FALSE; -} - -BOOLEAN -NTAPI -CmpGetBiosVersion(IN PCHAR BiosStart, - IN ULONG BiosLength, - IN PCHAR BiosVersion) -{ - CHAR Buffer[128]; - PCHAR p, pp; - USHORT i; - - /* Check if we were given intitial data for the search */ - if (BiosStart) - { - /* Save it for later use */ - CmpBiosBegin = BiosStart; - CmpBiosSearchStart = BiosStart + 1; - CmpBiosSearchEnd = BiosStart + BiosLength - 2; - } - - /* Now loop the BIOS area */ - for (;;) - { - /* Start an initial search looking for numbers and periods */ - pp = NULL; - while (CmpBiosSearchStart <= CmpBiosSearchEnd) - { - /* Check if we have an "x.y" version string */ - if ((*CmpBiosSearchStart == '.') && - (*(CmpBiosSearchStart + 1) >= '0') && - (*(CmpBiosSearchStart + 1) <= '9') && - (*(CmpBiosSearchStart - 1) >= '0') && - (*(CmpBiosSearchStart - 1) <= '9')) - { - /* Start looking in this area for the actual BIOS Version */ - pp = CmpBiosSearchStart; - break; - } - else - { - /* Keep searching */ - CmpBiosSearchStart++; - } - } - - /* Break out if we're went past the BIOS area */ - if (CmpBiosSearchStart > CmpBiosSearchEnd) return FALSE; - - /* Move to the next 2 bytes */ - CmpBiosSearchStart += 2; - - /* Null-terminate our scratch buffer and start the string here */ - Buffer[127] = ANSI_NULL; - p = &Buffer[127]; - - /* Go back one character since we're doing this backwards */ - pp--; - - /* Loop the identifier we found as long as it's valid */ - i = 0; - while ((i++ < 127) && - (pp >= CmpBiosBegin) && - (*pp >= ' ') && - (*pp != '$')) - { - /* Copy the character */ - *--p = *pp--; - } - - /* Go past the last character since we went backwards */ - pp++; - - /* Loop the strings we recognize */ - for (i = 0; CmpBiosStrings[i]; i++) - { - /* Check if a match was found */ - if (strstr(p, CmpBiosStrings[i])) goto Match; - } - } - -Match: - /* Skip until we find a space */ - for (; *pp == ' '; pp++); - - /* Loop the final string */ - i = 0; - do - { - /* Copy the character into the final string */ - BiosVersion[i] = *pp++; - } while ((++i < 127) && - (pp <= (CmpBiosSearchEnd + 1)) && - (*pp >= ' ') && - (*pp != '$')); - - /* Null-terminate the version string */ - BiosVersion[i] = ANSI_NULL; - return TRUE; -} NTSTATUS NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - UNICODE_STRING KeyName, ValueName, Data, SectionName; - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG HavePae, CacheSize, ViewSize, Length, TotalLength = 0, i, Disposition; - NTSTATUS Status; - HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; - CONFIGURATION_COMPONENT_DATA ConfigData; - CHAR Buffer[128]; - ULONG ExtendedId, Dummy; - PKPRCB Prcb; - USHORT IndexTable[MaximumType + 1] = {0}; - ANSI_STRING TempString; - PCHAR PartialString = NULL, BiosVersion; - CHAR CpuString[48]; - PVOID BaseAddress = NULL; - LARGE_INTEGER ViewBase = {{0}}; - ULONG_PTR VideoRomBase; - PCHAR CurrentVersion; - extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; - extern UNICODE_STRING KeRosVideoBiosDate, KeRosVideoBiosVersion; - - /* Open the SMSS Memory Management key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" - L"Control\\Session Manager\\Memory Management"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&KeyHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - /* Detect if PAE is enabled */ - HavePae = SharedUserData->ProcessorFeatures[PF_PAE_ENABLED]; - - /* Set the value */ - RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); - NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_DWORD, - &HavePae, - sizeof(HavePae)); - - /* Close the key */ - NtClose(KeyHandle); - } - - /* Open the hardware description key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\Hardware\\Description\\System"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&SystemHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return Status; - - /* Create the BIOS Information key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" - L"Control\\BIOSINFO"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtCreateKey(&BiosHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - if (ExpInTextModeSetup) - { - if (!NT_SUCCESS(Status)) - BiosHandle = NULL; - } - else if (!NT_SUCCESS(Status)) - return Status; - - /* Create the CPU Key, and check if it already existed */ - RtlInitUnicodeString(&KeyName, L"CentralProcessor"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - SystemHandle, - NULL); - Status = NtCreateKey(&KeyHandle, - KEY_READ | KEY_WRITE, - &ObjectAttributes, - 0, - NULL, - 0, - &Disposition); - NtClose(KeyHandle); - - /* The key shouldn't already exist */ - if (Disposition == REG_CREATED_NEW_KEY) - { - /* Allocate the configuration data for cmconfig.c */ - CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, - CmpConfigurationAreaSize, - TAG_CM); - if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES; - - /* Loop all CPUs */ - for (i = 0; i < KeNumberProcessors; i++) - { - /* Get the PRCB */ - Prcb = KiProcessorBlock[i]; - - /* Setup the Configuration Entry for the Processor */ - RtlZeroMemory(&ConfigData, sizeof (ConfigData)); - ConfigData.ComponentEntry.Class = ProcessorClass; - ConfigData.ComponentEntry.Type = CentralProcessor; - ConfigData.ComponentEntry.Key = i; - ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); - ConfigData.ComponentEntry.Identifier = Buffer; - - /* Check if the CPU doesn't support CPUID */ - if (!Prcb->CpuID) - { - /* Build ID1-style string for older CPUs */ - sprintf(Buffer, - CmpID1, - Prcb->CpuType, - (Prcb->CpuStep >> 8) + 'A', - Prcb->CpuStep & 0xff); - } - else - { - /* Build ID2-style string for newer CPUs */ - sprintf(Buffer, - CmpID2, - Prcb->CpuType, - (Prcb->CpuStep >> 8), - Prcb->CpuStep & 0xff); - } - - /* Save the ID string length now that we've created it */ - ConfigData.ComponentEntry.IdentifierLength = strlen(Buffer) + 1; - - /* Initialize the registry configuration node for it */ - Status = CmpInitializeRegistryNode(&ConfigData, - SystemHandle, - &KeyHandle, - InterfaceTypeUndefined, - 0xFFFFFFFF, - IndexTable); - if (!NT_SUCCESS(Status)) return(Status); - - /* Check if we have an FPU */ - if (KeI386NpxPresent) - { - /* Setup the Configuration Entry for the FPU */ - RtlZeroMemory(&ConfigData, sizeof(ConfigData)); - ConfigData.ComponentEntry.Class = ProcessorClass; - ConfigData.ComponentEntry.Type = FloatingPointProcessor; - ConfigData.ComponentEntry.Key = i; - ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); - ConfigData.ComponentEntry.Identifier = Buffer; - - /* For 386 cpus, the CPU pp is the identifier */ - if (Prcb->CpuType == 3) strcpy(Buffer, "80387"); - - /* Save the ID string length now that we've created it */ - ConfigData.ComponentEntry.IdentifierLength = strlen(Buffer) + 1; - - /* Initialize the registry configuration node for it */ - Status = CmpInitializeRegistryNode(&ConfigData, - SystemHandle, - &FpuHandle, - InterfaceTypeUndefined, - 0xFFFFFFFF, - IndexTable); - if (!NT_SUCCESS(Status)) - { - /* Failed, close the CPU handle and return */ - NtClose(KeyHandle); - return Status; - } - - /* Close this new handle */ - NtClose(FpuHandle); - - /* Stay on this CPU only */ - KeSetSystemAffinityThread(Prcb->SetMember); - if (!Prcb->CpuID) - { - /* Uh oh, no CPUID! */ - } - else - { - /* Check if we have extended CPUID that supports name ID */ - Ki386Cpuid(0x80000000, &ExtendedId, &Dummy, &Dummy, &Dummy); - if (ExtendedId >= 0x80000004) - { - /* Do all the CPUIDs requred to get the full name */ - PartialString = CpuString; - for (ExtendedId = 2; ExtendedId <= 4; ExtendedId++) - { - /* Do the CPUID and save the name string */ - Ki386Cpuid(0x80000000 | ExtendedId, - (PULONG)PartialString, - (PULONG)PartialString + 1, - (PULONG)PartialString + 2, - (PULONG)PartialString + 3); - - /* Go to the next name string */ - PartialString += 16; - } - - /* Null-terminate it */ - CpuString[47] = ANSI_NULL; - } - } - - /* Get the cache size while we're still localized */ - CacheSize = ((PKIPCR)KeGetPcr())->SecondLevelCacheSize; - - /* Go back to user affinity */ - KeRevertToUserAffinityThread(); - - /* Check if we have a CPU Name */ - if (PartialString) - { - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, CpuString); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Add it to the registry */ - RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosProcessorName, Data.Buffer); - - /* Free the temporary buffer */ - RtlFreeUnicodeString(&Data); - } - - /* Check if we had a Vendor ID */ - if (Prcb->VendorString) - { - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Prcb->VendorString); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Add it to the registry */ - RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* Free the temporary buffer */ - RtlFreeUnicodeString(&Data); - } - - /* Check if we have features bits */ - if (Prcb->FeatureBits) - { - /* Add them to the registry */ - RtlInitUnicodeString(&ValueName, L"FeatureSet"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_DWORD, - &Prcb->FeatureBits, - sizeof(Prcb->FeatureBits)); - } - - /* Check if we detected the CPU Speed */ - if (Prcb->MHz) - { - /* Add it to the registry */ - RtlInitUnicodeString(&ValueName, L"~MHz"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_DWORD, - &Prcb->MHz, - sizeof(Prcb->MHz)); - } - - /* Check if we have an update signature */ - if (Prcb->UpdateSignature.QuadPart) - { - /* Add it to the registry */ - RtlInitUnicodeString(&ValueName, L"Update Signature"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_BINARY, - &Prcb->UpdateSignature, - sizeof(Prcb->UpdateSignature)); - } - - /* Close the processor handle */ - NtClose(KeyHandle); - - /* FIXME: Detect CPU mismatches */ - } - } - - /* Free the configuration data */ - ExFreePool(CmpConfigurationData); - } - - /* Open physical memory */ - RtlInitUnicodeString(&SectionName, L"\\Device\\PhysicalMemory"); - InitializeObjectAttributes(&ObjectAttributes, - &SectionName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenSection(&SectionHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* Map the first 1KB of memory to get the IVT */ - ViewSize = PAGE_SIZE; - Status = ZwMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &ViewBase, - &ViewSize, - ViewUnmap, - MEM_DOS_LIM, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - /* Assume default */ - VideoRomBase = 0xC0000; - } - else - { - /* Calculate the base address from the vector */ - VideoRomBase = (*((PULONG)BaseAddress + 0x10) >> 12) & 0xFFFF0; - VideoRomBase += *((PULONG)BaseAddress + 0x10) & 0xFFF0; - - /* Now get to the actual ROM Start and make sure it's not invalid*/ - VideoRomBase &= 0xFFFF8000; - if (VideoRomBase < 0xC0000) VideoRomBase = 0xC0000; - - /* And unmap the section */ - ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - } - - /* Allocate BIOS Version pp Buffer */ - BiosVersion = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); - - /* Setup settings to map the 64K BIOS ROM */ - BaseAddress = 0; - ViewSize = 16 * PAGE_SIZE; - ViewBase.LowPart = 0xF0000; - ViewBase.HighPart = 0; - - /* Map it */ - Status = ZwMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &ViewBase, - &ViewSize, - ViewUnmap, - MEM_DOS_LIM, - PAGE_READWRITE); - if (NT_SUCCESS(Status)) - { - /* Scan the ROM to get the BIOS Date */ - if (CmpGetBiosDate(BaseAddress, 16 * PAGE_SIZE, Buffer, TRUE)) - { - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Write the date into the registry */ - RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - - if (BiosHandle) - { - /* Get the BIOS Date Identifier */ - RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); - Buffer[8] = ANSI_NULL; - - /* Convert it to unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - if (NT_SUCCESS(Status)) - { - /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosBiosDate, Data.Buffer); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - } - - /* Close the bios information handle */ - NtClose(BiosHandle); - } - } - - /* Get the BIOS Version */ - if (CmpGetBiosVersion(BaseAddress, 16* PAGE_SIZE, Buffer)) - { - /* Start at the beginning of our buffer */ - CurrentVersion = BiosVersion; - do - { - /* Convert to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Calculate the length of this string and copy it in */ - Length = Data.Length + sizeof(UNICODE_NULL); - RtlMoveMemory(CurrentVersion, Data.Buffer, Length); - - /* Free the unicode string */ - RtlFreeUnicodeString(&Data); - - /* Update the total length and see if we're out of space */ - TotalLength += Length; - if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) - { - /* One more string would push us out, so stop here */ - break; - } - - /* Go to the next string inside the multi-string buffer */ - CurrentVersion += Length; - - /* Query the next BIOS Version */ - } while (CmpGetBiosVersion(NULL, 0, Buffer)); - - /* Check if we found any strings at all */ - if (TotalLength) - { - /* Add the final null-terminator */ - *(PWSTR)CurrentVersion = UNICODE_NULL; - TotalLength += sizeof(UNICODE_NULL); - - /* Write the BIOS Version to the registry */ - RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_MULTI_SZ, - BiosVersion, - TotalLength); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosBiosVersion, (PWCH)BiosVersion); - } - } - - /* Unmap the section */ - ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - } - - /* Now prepare for Video BIOS Mapping of 32KB */ - BaseAddress = 0; - ViewSize = 8 * PAGE_SIZE; - ViewBase.LowPart = VideoRomBase; - ViewBase.HighPart = 0; - - /* Map it */ - Status = ZwMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &ViewBase, - &ViewSize, - ViewUnmap, - MEM_DOS_LIM, - PAGE_READWRITE); - if (NT_SUCCESS(Status)) - { - /* Scan the ROM to get the BIOS Date */ - if (CmpGetBiosDate(BaseAddress, 8 * PAGE_SIZE, Buffer, FALSE)) - { - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Write the date into the registry */ - RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosVideoBiosDate, Data.Buffer); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - } - - /* Get the Video BIOS Version */ - if (CmpGetBiosVersion(BaseAddress, 8* PAGE_SIZE, Buffer)) - { - /* Start at the beginning of our buffer */ - CurrentVersion = BiosVersion; - do - { - /* Convert to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Calculate the length of this string and copy it in */ - Length = Data.Length + sizeof(UNICODE_NULL); - RtlMoveMemory(CurrentVersion, Data.Buffer, Length); - - /* Free the unicode string */ - RtlFreeUnicodeString(&Data); - - /* Update the total length and see if we're out of space */ - TotalLength += Length; - if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) - { - /* One more string would push us out, so stop here */ - break; - } - - /* Go to the next string inside the multi-string buffer */ - CurrentVersion += Length; - - /* Query the next BIOS Version */ - } while (CmpGetBiosVersion(NULL, 0, Buffer)); - - /* Check if we found any strings at all */ - if (TotalLength) - { - /* Add the final null-terminator */ - *(PWSTR)CurrentVersion = UNICODE_NULL; - TotalLength += sizeof(UNICODE_NULL); - - /* Write the BIOS Version to the registry */ - RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_MULTI_SZ, - BiosVersion, - TotalLength); - - /* ROS: Save a copy for bugzilla reporting */ - RtlCreateUnicodeString(&KeRosVideoBiosVersion, (PWCH)BiosVersion); - } - } - - /* Unmap the section */ - ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - } - - /* Close the section */ - ZwClose(SectionHandle); - - /* Free the BIOS version string buffer */ - if (BiosVersion) ExFreePool(BiosVersion); - -Quickie: - /* Close the procesor handle */ - NtClose(KeyHandle); - return STATUS_SUCCESS; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=339… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -1265,12 +1265,6 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE KeyHandle, OptionHandle; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; -#ifdef _ARM_ - DPRINT1("*** Phase 1 Initialization Thread\n"); - DPRINT1("Beginning consistency checks...\n"); - // CHECK STACKS, IRQLS, DISPATCHER AND MAKE SURE WE ARE GOOD TO GO! - //while (TRUE); -#endif /* Allocate the initialization buffer */ InitBuffer = ExAllocatePoolWithTag(NonPagedPool, Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -38,6 +38,16 @@ // void arm_kprintf(const char *fmt, ...); arm_kprintf("%s", Buffer); +} + +VOID +NTAPI +KiInitMachineDependent(VOID) +{ + // + // There is nothing to do on ARM + // + return; } VOID Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -45,9 +45,7 @@ GENERATE_ARM_STUB KiDispatchException GENERATE_ARM_STUB KiSwapProcess GENERATE_ARM_STUB KeSwitchKernelStack -GENERATE_ARM_STUB KiInitMachineDependent GENERATE_ARM_STUB KiComputeTimerTableIndex -GENERATE_ARM_STUB CmpInitializeMachineDependentConfiguration // // Traps, Debugging and Execeptions Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -400,7 +400,7 @@ cmp r6, #4 //strne sp, [r5], #4 //subne r6, r6, #1 - beq . + bge . // // Now do the system call Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -492,13 +492,27 @@ if (ArgumentCount > 4) { // - // FIXME: Validate the user stack - // - + // Check where the stack is + // + if (Thread->PreviousMode == UserMode) + { + // + // FIXME: Validate the user stack + // + Argument = (PULONG)TrapFrame->UserSp; + } + else + { + // + // We were called from the kernel + // + Argument = (PULONG)TrapFrame->SvcSp; + } + // // Copy the rest // - Argument = (PULONG)TrapFrame->UserSp; + DPRINT1("Stack: %p\n", Argument); for (i = 4; i < ArgumentCount; i++) { // Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 15 00:40:27 2008 @@ -126,6 +126,11 @@ <file>cmhardwr.c</file> </directory> </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>cmhardwr.c</file> + </directory> + </if> <if property="ARCH" value="powerpc"> <directory name="powerpc"> <file>cmhardwr.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs