57,61d56
< static char *
< AcpiDbGetNextToken (
< char *String,
< char **Next);
<
287a283,286
> AcpiOsPrintf (" Hex Integer Integer method argument\n");
> AcpiOsPrintf (" \"Ascii String\" String method argument\n");
> AcpiOsPrintf (" (Byte List) Buffer method argument\n");
> AcpiOsPrintf (" [Package Element List] Package method argument\n");
321c320
< static char *
---
> char *
324c323,324
< char **Next)
---
> char **Next,
> ACPI_OBJECT_TYPE *ReturnType)
326a327,328
> UINT32 Depth;
> ACPI_OBJECT_TYPE Type = ACPI_TYPE_INTEGER;
336c338
< /* Get rid of any spaces at the beginning */
---
> /* Remove any spaces at the beginning */
351c353
< if (*String == '"')
---
> switch (*String)
352a355,356
> case '"':
>
356a361
> Type = ACPI_TYPE_STRING;
358c363
< /* Find end of token */
---
> /* Find end of string */
364,366c369,375
< }
< else
< {
---
> break;
>
> case '(':
>
> /* This is the start of a buffer, scan until closing paren */
>
> String++;
367a377
> Type = ACPI_TYPE_BUFFER;
368a379,436
> /* 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;
>
374a443
> break;
386a456
> *ReturnType = Type;
419c489,490
< AcpiGbl_DbArgs[i] = AcpiDbGetNextToken (This, &Next);
---
> AcpiGbl_DbArgs[i] = AcpiDbGetNextToken (This, &Next,
> &AcpiGbl_DbArgTypes[i]);
578c649,650
< AcpiDbExecute (AcpiGbl_DbArgs[1], &AcpiGbl_DbArgs[2], EX_SINGLE_STEP);
---
> AcpiDbExecute (AcpiGbl_DbArgs[1],
> &AcpiGbl_DbArgs[2], &AcpiGbl_DbArgTypes[2], EX_SINGLE_STEP);
604c676
< &AcpiGbl_DbArgs[2], EX_NO_SINGLE_STEP);
---
> &AcpiGbl_DbArgs[2], &AcpiGbl_DbArgTypes[2], EX_NO_SINGLE_STEP);
964c1036,1042
< (void) AcpiOsGetLine (AcpiGbl_DbLineBuf);
---
> 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);
> }