WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/debugger/dbinput.c

 /******************************************************************************
+ *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
+ *
  * 2. License
+ *
 #define _COMPONENT          ACPI_CA_DEBUGGER
         ACPI_MODULE_NAME    ("dbinput")
-/* Local prototypes */
-static char *
-AcpiDbGetNextToken (
-    char                    *String,
-    char                    **Next);
+/* Local prototypes */
 static UINT32
 AcpiDbGetLine (
 AcpiDbSingleThread (
     void);
 static void
 AcpiDbDisplayHelp (
-    char                    *HelpType);
+    void);
     CMD_EXIT,
     CMD_FIND,
     CMD_GO,
     CMD_GPE,
     CMD_GPES,
+    CMD_HANDLERS,
     CMD_HELP,
     CMD_HELP2,
     CMD_HISTORY,
     CMD_HISTORY_EXE,
     CMD_HISTORY_LAST,
     CMD_METHODS,
     CMD_NAMESPACE,
     CMD_NOTIFY,
     CMD_OBJECT,
     CMD_OPEN,
+    CMD_OSI,
     CMD_OWNER,
     CMD_PREDEFINED,
     CMD_PREFIX,
     CMD_QUIT,
     CMD_REFERENCES,
     {"EXIT",         0},
     {"FIND",         1},
     {"GO",           0},
     {"GPE",          2},
     {"GPES",         0},
+    {"HANDLERS",     0},
     {"HELP",         0},
     {"?",            0},
     {"HISTORY",      0},
     {"!",            1},
     {"!!",           0},
     {"METHODS",      0},
     {"NAMESPACE",    0},
     {"NOTIFY",       2},
     {"OBJECT",       1},
     {"OPEN",         1},
+    {"OSI",          0},
     {"OWNER",        1},
     {"PREDEFINED",   0},
     {"PREFIX",       0},
     {"QUIT",         0},
     {"REFERENCES",   1},
 /*******************************************************************************
+ *
  * FUNCTION:    AcpiDbDisplayHelp
  *
- * PARAMETERS:  HelpType        - Subcommand (optional)
+ * PARAMETERS:  None
+ *
  * RETURN:      None
+ *
  * DESCRIPTION: Print a usage message.
+ *
  ******************************************************************************/
-static void
-AcpiDbDisplayHelp (
-    char                    *HelpType)
-{
-    AcpiUtStrupr (HelpType);
-    /* No parameter, just give the overview */
+static void
 AcpiDbDisplayHelp (
-    if (!HelpType)
-    {
-        AcpiOsPrintf ("ACPI CA Debugger Commands\n\n");
-        AcpiOsPrintf ("The following classes of commands are available.  Help is available for\n");
-        AcpiOsPrintf ("each class by entering \"Help \"\n\n");
-        AcpiOsPrintf ("    [GENERAL]       General-Purpose Commands\n");
-        AcpiOsPrintf ("    [NAMESPACE]     Namespace Access Commands\n");
-        AcpiOsPrintf ("    [METHOD]        Control Method Execution Commands\n");
-        AcpiOsPrintf ("    [STATISTICS]    Statistical Information\n");
-        AcpiOsPrintf ("    [FILE]          File I/O Commands\n");
-        return;
-    }
-    /*
-     * Parameter is the command class
-     *
-     * The idea here is to keep each class of commands smaller than a screenful
-     */
-    switch (HelpType[0])
+    void)
+{
     case 'G':
-        AcpiOsPrintf ("\nGeneral-Purpose Commands\n\n");
+    AcpiOsPrintf ("\nGeneral-Purpose Commands:\n");
-        AcpiOsPrintf ("Allocations                         Display list of current memory allocations\n");
+    AcpiOsPrintf ("  Allocations                         Display list of current memory allocations\n");
+    AcpiOsPrintf ("  Dump |\n");
-        AcpiOsPrintf ("Dump |\n");
+    AcpiOsPrintf ("       [Byte|Word|Dword|Qword]        Display ACPI objects or memory\n");
-        AcpiOsPrintf ("     [Byte|Word|Dword|Qword]        Display ACPI objects or memory\n");
+    AcpiOsPrintf ("  EnableAcpi                          Enable ACPI (hardware) mode\n");
-        AcpiOsPrintf ("EnableAcpi                          Enable ACPI (hardware) mode\n");
+    AcpiOsPrintf ("  Handlers                            Info about global handlers\n");
-        AcpiOsPrintf ("Help                                This help screen\n");
+    AcpiOsPrintf ("  Help                                This help screen\n");
+    AcpiOsPrintf ("  History                             Display command history buffer\n");
-        AcpiOsPrintf ("History                             Display command history buffer\n");
+    AcpiOsPrintf ("  Level [] [console]      Get/Set debug level for file or console\n");
-        AcpiOsPrintf ("Level [] [console]      Get/Set debug level for file or console\n");
+    AcpiOsPrintf ("  Locks                               Current status of internal mutexes\n");
-        AcpiOsPrintf ("Locks                               Current status of internal mutexes\n");
+    AcpiOsPrintf ("  Osi [Install|Remove ]         Display or modify global _OSI list\n");
-        AcpiOsPrintf ("Quit or Exit                        Exit this command\n");
-        AcpiOsPrintf ("Stats [Allocations|Memory|Misc\n");
-        AcpiOsPrintf ("      |Objects|Sizes|Stack|Tables]  Display namespace and memory statistics\n");
-        AcpiOsPrintf ("Tables                              Display info about loaded ACPI tables\n");
-        AcpiOsPrintf ("Unload  [Instance]        Unload an ACPI table\n");
-        AcpiOsPrintf ("!                    Execute command from history buffer\n");
-        AcpiOsPrintf ("!!                                  Execute last command again\n");
-        return;
     AcpiOsPrintf ("  Quit or Exit                        Exit this command\n");
-    case 'S':
+    AcpiOsPrintf ("  Stats [Allocations|Memory|Misc|\n");
-        AcpiOsPrintf ("\nStats Subcommands\n\n");
+    AcpiOsPrintf ("        Objects|Sizes|Stack|Tables]   Display namespace and memory statistics\n");
-        AcpiOsPrintf ("Allocations                         Display list of current memory allocations\n");
+    AcpiOsPrintf ("     Allocations                      Display list of current memory allocations\n");
-        AcpiOsPrintf ("Memory                              Dump internal memory lists\n");
+    AcpiOsPrintf ("     Memory                           Dump internal memory lists\n");
-        AcpiOsPrintf ("Misc                                Namespace search and mutex stats\n");
+    AcpiOsPrintf ("     Misc                             Namespace search and mutex stats\n");
-        AcpiOsPrintf ("Objects                             Summary of namespace objects\n");
+    AcpiOsPrintf ("     Objects                          Summary of namespace objects\n");
+    AcpiOsPrintf ("     Sizes                            Sizes for each of the internal objects\n");
-        AcpiOsPrintf ("Sizes                               Sizes for each of the internal objects\n");
+    AcpiOsPrintf ("     Stack                            Display CPU stack usage\n");
+    AcpiOsPrintf ("     Tables                           Info about current ACPI table(s)\n");
+    AcpiOsPrintf ("  Tables                              Display info about loaded ACPI tables\n");
-        AcpiOsPrintf ("Stack                               Display CPU stack usage\n");
-        AcpiOsPrintf ("Tables                              Info about current ACPI table(s)\n");
+    AcpiOsPrintf ("  Unload  [Instance]        Unload an ACPI table\n");
-        return;
+    AcpiOsPrintf ("  !                    Execute command from history buffer\n");
     AcpiOsPrintf ("  !!                                  Execute last command again\n");
     case 'N':
-        AcpiOsPrintf ("\nNamespace Access Commands\n\n");
+    AcpiOsPrintf ("\nNamespace Access Commands:\n");
-        AcpiOsPrintf ("Businfo                             Display system bus info\n");
+    AcpiOsPrintf ("  Businfo                             Display system bus info\n");
-        AcpiOsPrintf ("Resources                   Get and display Device resources\n");
+    AcpiOsPrintf ("  Resources                   Get and display Device resources\n");
-        AcpiOsPrintf ("Set N           Set value for named integer\n");
+    AcpiOsPrintf ("  Set N           Set value for named integer\n");
-        AcpiOsPrintf ("Sleep                   Simulate sleep/wake sequence\n");
+    AcpiOsPrintf ("  Sleep                   Simulate sleep/wake sequence\n");
-        AcpiOsPrintf ("Terminate                           Delete namespace and all internal objects\n");
+    AcpiOsPrintf ("  Terminate                           Delete namespace and all internal objects\n");
-        AcpiOsPrintf ("Type
+    AcpiOsPrintf ("  Type
-        return;
-    case 'M':
-        AcpiOsPrintf ("\nControl Method Execution Commands\n\n");
+    AcpiOsPrintf ("\nControl Method Execution Commands:\n");
-        AcpiOsPrintf ("Arguments (or Args)                 Display method arguments\n");
+    AcpiOsPrintf ("  Arguments (or Args)                 Display method arguments\n");
-        AcpiOsPrintf ("Breakpoint               Set an AML execution breakpoint\n");
+    AcpiOsPrintf ("  Breakpoint               Set an AML execution breakpoint\n");
-        AcpiOsPrintf ("Call                                Run to next control method invocation\n");
+    AcpiOsPrintf ("  Call                                Run to next control method invocation\n");
-        AcpiOsPrintf ("Debug  [Arguments]        Single Step a control method\n");
+    AcpiOsPrintf ("  Debug  [Arguments]        Single Step a control method\n");
+    AcpiOsPrintf ("  Execute  [Arguments]      Execute control method\n");
+    AcpiOsPrintf ("     Hex Integer                      Integer method argument\n");
+    AcpiOsPrintf ("     \"Ascii String\"                   String method argument\n");
+    AcpiOsPrintf ("     (Byte List)                      Buffer method argument\n");
-        AcpiOsPrintf ("Execute  [Arguments]      Execute control method\n");
+    AcpiOsPrintf ("     [Package Element List]           Package method argument\n");
-        AcpiOsPrintf ("Go                                  Allow method to run to completion\n");
+    AcpiOsPrintf ("  Go                                  Allow method to run to completion\n");
-        AcpiOsPrintf ("Information                         Display info about the current method\n");
+    AcpiOsPrintf ("  Information                         Display info about the current method\n");
-        AcpiOsPrintf ("Into                                Step into (not over) a method call\n");
+    AcpiOsPrintf ("  Into                                Step into (not over) a method call\n");
-        AcpiOsPrintf ("List [# of Aml Opcodes]             Display method ASL statements\n");
+    AcpiOsPrintf ("  List [# of Aml Opcodes]             Display method ASL statements\n");
-        AcpiOsPrintf ("Stop                                Terminate control method\n");
+    AcpiOsPrintf ("  Stop                                Terminate control method\n");
-        AcpiOsPrintf ("Thread    Spawn threads to execute method(s)\n");
+    AcpiOsPrintf ("  Thread    Spawn threads to execute method(s)\n");
-        AcpiOsPrintf ("Trace                  Trace method execution\n");
+    AcpiOsPrintf ("  Trace                  Trace method execution\n");
-        AcpiOsPrintf ("Tree                                Display control method calling tree\n");
+    AcpiOsPrintf ("  Tree                                Display control method calling tree\n");
-        AcpiOsPrintf ("                             Single step next AML opcode (over calls)\n");
+    AcpiOsPrintf ("                               Single step next AML opcode (over calls)\n");
-        return;
-    case 'F':
-        AcpiOsPrintf ("\nFile I/O Commands\n\n");
+    AcpiOsPrintf ("\nFile I/O Commands:\n");
-        AcpiOsPrintf ("Close                               Close debug output file\n");
-        AcpiOsPrintf ("Open               Open a file for debug output\n");
+    AcpiOsPrintf ("  Close                               Close debug output file\n");
-        AcpiOsPrintf ("Load                Load ACPI table from a file\n");
-        return;
-    default:
+    AcpiOsPrintf ("  Load                Load ACPI table from a file\n");
-        AcpiOsPrintf ("Unrecognized Command Class: %s\n", HelpType);
-        return;
     AcpiOsPrintf ("  Open               Open a file for debug output\n");
+}
+ *
  * DESCRIPTION: Command line parsing.  Get the next token on the command line
+ *
  ******************************************************************************/
-static char *
+char *
 AcpiDbGetNextToken (
     char                    *String,
+    char                    **Next,
-    char                    **Next)
+    ACPI_OBJECT_TYPE        *ReturnType)
+{
+    char                    *Start;
+    UINT32                  Depth;
-    char                    *Start;
+    ACPI_OBJECT_TYPE        Type = ACPI_TYPE_INTEGER;
     /* At end of buffer? */
     if (!String || !(*String))
+    {
         return (NULL);
+    }
+        {
             return (NULL);
+        }
+    }
+    switch (*String)
+    {
+    case '"':
+        /* This is a quoted string, scan until closing quote */
+        String++;
+        Start = String;
+        Type = ACPI_TYPE_STRING;
+        /* Find end of string */
+        while (*String && (*String != '"'))
+        {
+            String++;
+        }
+        break;
+    case '(':
+        /* This is the start of a buffer, scan until closing paren */
+        String++;
+        Start = String;
+        Type = ACPI_TYPE_BUFFER;
+        /* Find end of buffer */
+        while (*String && (*String != ')'))
+        {
+            String++;
+        }
+        break;
+    case '[':
+        /* This is the start of a package, scan until closing bracket */
+        String++;
+        Depth = 1;
+        Start = String;
+        Type = ACPI_TYPE_PACKAGE;
+        /* Find end of package (closing bracket) */
+        while (*String)
+        {
+            /* Handle String package elements */
+            if (*String == '"')
+            {
+                /* Find end of string */
+                String++;
+                while (*String && (*String != '"'))
+                {
+                    String++;
+                }
+                if (!(*String))
+                {
+                    break;
+                }
+            }
+            else if (*String == '[')
+            {
+                Depth++;         /* A nested package declaration */
+            }
+            else if (*String == ']')
+            {
+                Depth--;
+                if (Depth == 0) /* Found final package closing bracket */
+                {
+                    break;
+                }
+            }
+            String++;
+        }
+        break;
+    default:
-    Start = String;
+        Start = String;
-    /* Find end of token */
+        /* Find end of token */
-    while (*String && (*String != ' '))
+        while (*String && (*String != ' '))
+        {
+            String++;
+        }
-        String++;
+        break;
+    }
+    {
         *String = 0;
         *Next = String + 1;
+    }
     *ReturnType = Type;
     return (Start);
+}
     ACPI_STRCPY (AcpiGbl_DbParsedBuf, InputBuffer);
     This = AcpiGbl_DbParsedBuf;
     for (i = 0; i < ACPI_DEBUGGER_MAX_ARGS; i++)
     {
+        AcpiGbl_DbArgs[i] = AcpiDbGetNextToken (This, &Next,
-        AcpiGbl_DbArgs[i] = AcpiDbGetNextToken (This, &Next);
+            &AcpiGbl_DbArgTypes[i]);
         if (!AcpiGbl_DbArgs[i])
+        {
             break;
     case CMD_CLOSE:
         AcpiDbCloseDebugFile ();
         break;
+    case CMD_DEBUG:
-    case CMD_DEBUG:
+        AcpiDbExecute (AcpiGbl_DbArgs[1],
-        AcpiDbExecute (AcpiGbl_DbArgs[1], &AcpiGbl_DbArgs[2], EX_SINGLE_STEP);
+            &AcpiGbl_DbArgs[2], &AcpiGbl_DbArgTypes[2], EX_SINGLE_STEP);
         break;
     case CMD_DISASSEMBLE:
         AcpiOsPrintf ("Event command not implemented\n");
         break;
     case CMD_EXECUTE:
         AcpiDbExecute (AcpiGbl_DbArgs[1],
-            &AcpiGbl_DbArgs[2], EX_NO_SINGLE_STEP);
+            &AcpiGbl_DbArgs[2], &AcpiGbl_DbArgTypes[2], EX_NO_SINGLE_STEP);
         break;
     case CMD_FIND:
     case CMD_GPES:
         AcpiDbDisplayGpes ();
+        break;
+    case CMD_HANDLERS:
+        AcpiDbDisplayHandlers ();
         break;
     case CMD_HELP:
     case CMD_HELP2:
-        AcpiDbDisplayHelp (AcpiGbl_DbArgs[1]);
+        AcpiDbDisplayHelp ();
         break;
     case CMD_OPEN:
         AcpiDbOpenDebugFile (AcpiGbl_DbArgs[1]);
+        break;
+    case CMD_OSI:
+        AcpiDbDisplayInterfaces (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
         break;
     case CMD_OWNER:
         AcpiDbDumpNamespaceByOwner (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
             AcpiOsPrintf ("%1c ", ACPI_DEBUGGER_EXECUTE_PROMPT);
+        }
         /* Get the user input line */
+        Status = AcpiOsGetLine (AcpiGbl_DbLineBuf,
+            ACPI_DB_LINE_BUFFER_SIZE, NULL);
+        if (ACPI_FAILURE (Status))
+        {
+            ACPI_EXCEPTION ((AE_INFO, Status, "While parsing command line"));
             return (Status);
         (void) AcpiOsGetLine (AcpiGbl_DbLineBuf);

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/debugger/dbinput.c – Rev 1498 → 2216