Deleted Added
sdiff udiff text old ( 241973 ) new ( 243347 )
full compact
dmresrcl2.c (241973) dmresrcl2.c (243347)
1/*******************************************************************************
2 *
3 * Module Name: dmresrcl2.c - "Large" Resource Descriptor disassembly (#2)
4 *
5 ******************************************************************************/
6
7/*
8 * Copyright (C) 2000 - 2012, Intel Corp.

--- 187 unchanged lines hidden (view full) ---

196 AcpiUtPrintString (
197 ACPI_ADD_PTR (char, Resource, Resource->Gpio.ResSourceOffset),
198 ACPI_UINT8_MAX);
199 }
200
201 AcpiOsPrintf (", ");
202 AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
203 AcpiOsPrintf ("%s, ",
1/*******************************************************************************
2 *
3 * Module Name: dmresrcl2.c - "Large" Resource Descriptor disassembly (#2)
4 *
5 ******************************************************************************/
6
7/*
8 * Copyright (C) 2000 - 2012, Intel Corp.

--- 187 unchanged lines hidden (view full) ---

196 AcpiUtPrintString (
197 ACPI_ADD_PTR (char, Resource, Resource->Gpio.ResSourceOffset),
198 ACPI_UINT8_MAX);
199 }
200
201 AcpiOsPrintf (", ");
202 AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
203 AcpiOsPrintf ("%s, ",
204 AcpiGbl_ConsumeDecode [(Resource->Gpio.Flags & 1)]);
204 AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.Flags)]);
205
206 /* Insert a descriptor name */
207
208 AcpiDmDescriptorName ();
209 AcpiOsPrintf (",");
210
211 /* Dump the vendor data */
212

--- 55 unchanged lines hidden (view full) ---

268{
269
270 /* Dump the GpioInt-specific portion of the descriptor */
271
272 /* EdgeLevel, ActiveLevel, Shared */
273
274 AcpiDmIndent (Level);
275 AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
205
206 /* Insert a descriptor name */
207
208 AcpiDmDescriptorName ();
209 AcpiOsPrintf (",");
210
211 /* Dump the vendor data */
212

--- 55 unchanged lines hidden (view full) ---

268{
269
270 /* Dump the GpioInt-specific portion of the descriptor */
271
272 /* EdgeLevel, ActiveLevel, Shared */
273
274 AcpiDmIndent (Level);
275 AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
276 AcpiGbl_HeDecode [(Resource->Gpio.IntFlags & 1)],
277 AcpiGbl_LlDecode [(Resource->Gpio.IntFlags >> 1) & 1],
278 AcpiGbl_ShrDecode [(Resource->Gpio.IntFlags >> 3) & 1]);
276 AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
277 AcpiGbl_LlDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->Gpio.IntFlags, 1)],
278 AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
279
280 /* PinConfig, DebounceTimeout */
281
282 if (Resource->Gpio.PinConfig <= 3)
283 {
284 AcpiOsPrintf ("%s, ",
285 AcpiGbl_PpcDecode[Resource->Gpio.PinConfig]);
286 }

--- 14 unchanged lines hidden (view full) ---

301 * FUNCTION: AcpiDmGpioIoDescriptor
302 *
303 * PARAMETERS: Resource - Pointer to the resource descriptor
304 * Length - Length of the descriptor in bytes
305 * Level - Current source code indentation level
306 *
307 * RETURN: None
308 *
279
280 /* PinConfig, DebounceTimeout */
281
282 if (Resource->Gpio.PinConfig <= 3)
283 {
284 AcpiOsPrintf ("%s, ",
285 AcpiGbl_PpcDecode[Resource->Gpio.PinConfig]);
286 }

--- 14 unchanged lines hidden (view full) ---

301 * FUNCTION: AcpiDmGpioIoDescriptor
302 *
303 * PARAMETERS: Resource - Pointer to the resource descriptor
304 * Length - Length of the descriptor in bytes
305 * Level - Current source code indentation level
306 *
307 * RETURN: None
308 *
309 * DESCRIPTION: Decode a GPIO Interrupt descriptor
309 * DESCRIPTION: Decode a GPIO I/O descriptor
310 *
311 ******************************************************************************/
312
313static void
314AcpiDmGpioIoDescriptor (
315 AML_RESOURCE *Resource,
316 UINT32 Length,
317 UINT32 Level)
318{
319
320 /* Dump the GpioIo-specific portion of the descriptor */
321
322 /* Shared, PinConfig */
323
324 AcpiDmIndent (Level);
325 AcpiOsPrintf ("GpioIo (%s, ",
310 *
311 ******************************************************************************/
312
313static void
314AcpiDmGpioIoDescriptor (
315 AML_RESOURCE *Resource,
316 UINT32 Length,
317 UINT32 Level)
318{
319
320 /* Dump the GpioIo-specific portion of the descriptor */
321
322 /* Shared, PinConfig */
323
324 AcpiDmIndent (Level);
325 AcpiOsPrintf ("GpioIo (%s, ",
326 AcpiGbl_ShrDecode [(Resource->Gpio.IntFlags >> 3) & 1]);
326 AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
327
328 if (Resource->Gpio.PinConfig <= 3)
329 {
330 AcpiOsPrintf ("%s, ",
331 AcpiGbl_PpcDecode[Resource->Gpio.PinConfig]);
332 }
333 else
334 {
335 AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
336 }
337
338 /* DebounceTimeout, DriveStrength, IoRestriction */
339
340 AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
341 AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
342 AcpiOsPrintf ("%s,\n",
327
328 if (Resource->Gpio.PinConfig <= 3)
329 {
330 AcpiOsPrintf ("%s, ",
331 AcpiGbl_PpcDecode[Resource->Gpio.PinConfig]);
332 }
333 else
334 {
335 AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
336 }
337
338 /* DebounceTimeout, DriveStrength, IoRestriction */
339
340 AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
341 AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
342 AcpiOsPrintf ("%s,\n",
343 AcpiGbl_IorDecode [Resource->Gpio.IntFlags & 3]);
343 AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
344
345 /* Dump the GpioInt/GpioIo common portion of the descriptor */
346
347 AcpiDmGpioCommon (Resource, Level);
348}
349
350
351/*******************************************************************************

--- 123 unchanged lines hidden (view full) ---

475 UINT32 ResourceSourceOffset;
476
477
478 /* SlaveAddress, SlaveMode, ConnectionSpeed, AddressingMode */
479
480 AcpiDmIndent (Level);
481 AcpiOsPrintf ("I2cSerialBus (0x%4.4X, %s, 0x%8.8X,\n",
482 Resource->I2cSerialBus.SlaveAddress,
344
345 /* Dump the GpioInt/GpioIo common portion of the descriptor */
346
347 AcpiDmGpioCommon (Resource, Level);
348}
349
350
351/*******************************************************************************

--- 123 unchanged lines hidden (view full) ---

475 UINT32 ResourceSourceOffset;
476
477
478 /* SlaveAddress, SlaveMode, ConnectionSpeed, AddressingMode */
479
480 AcpiDmIndent (Level);
481 AcpiOsPrintf ("I2cSerialBus (0x%4.4X, %s, 0x%8.8X,\n",
482 Resource->I2cSerialBus.SlaveAddress,
483 AcpiGbl_SmDecode [(Resource->I2cSerialBus.Flags & 1)],
483 AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.Flags)],
484 Resource->I2cSerialBus.ConnectionSpeed);
485
486 AcpiDmIndent (Level + 1);
487 AcpiOsPrintf ("%s, ",
484 Resource->I2cSerialBus.ConnectionSpeed);
485
486 AcpiDmIndent (Level + 1);
487 AcpiOsPrintf ("%s, ",
488 AcpiGbl_AmDecode [(Resource->I2cSerialBus.TypeSpecificFlags & 1)]);
488 AcpiGbl_AmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.TypeSpecificFlags)]);
489
490 /* ResourceSource is a required field */
491
492 ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
493 Resource->CommonSerialBus.TypeDataLength;
494
495 AcpiUtPrintString (
496 ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
497 ACPI_UINT8_MAX);
498
499 /* ResourceSourceIndex, ResourceUsage */
500
501 AcpiOsPrintf (",\n");
502 AcpiDmIndent (Level + 1);
503 AcpiOsPrintf ("0x%2.2X, ", Resource->I2cSerialBus.ResSourceIndex);
504
505 AcpiOsPrintf ("%s, ",
489
490 /* ResourceSource is a required field */
491
492 ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
493 Resource->CommonSerialBus.TypeDataLength;
494
495 AcpiUtPrintString (
496 ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
497 ACPI_UINT8_MAX);
498
499 /* ResourceSourceIndex, ResourceUsage */
500
501 AcpiOsPrintf (",\n");
502 AcpiDmIndent (Level + 1);
503 AcpiOsPrintf ("0x%2.2X, ", Resource->I2cSerialBus.ResSourceIndex);
504
505 AcpiOsPrintf ("%s, ",
506 AcpiGbl_ConsumeDecode [(Resource->I2cSerialBus.Flags >> 1) & 1]);
506 AcpiGbl_ConsumeDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->I2cSerialBus.Flags, 1)]);
507
508 /* Insert a descriptor name */
509
510 AcpiDmDescriptorName ();
511 AcpiOsPrintf (",\n");
512
513 /* Dump the vendor data */
514

--- 26 unchanged lines hidden (view full) ---

541 UINT32 ResourceSourceOffset;
542
543
544 /* DeviceSelection, DeviceSelectionPolarity, WireMode, DataBitLength */
545
546 AcpiDmIndent (Level);
547 AcpiOsPrintf ("SpiSerialBus (0x%4.4X, %s, %s, 0x%2.2X,\n",
548 Resource->SpiSerialBus.DeviceSelection,
507
508 /* Insert a descriptor name */
509
510 AcpiDmDescriptorName ();
511 AcpiOsPrintf (",\n");
512
513 /* Dump the vendor data */
514

--- 26 unchanged lines hidden (view full) ---

541 UINT32 ResourceSourceOffset;
542
543
544 /* DeviceSelection, DeviceSelectionPolarity, WireMode, DataBitLength */
545
546 AcpiDmIndent (Level);
547 AcpiOsPrintf ("SpiSerialBus (0x%4.4X, %s, %s, 0x%2.2X,\n",
548 Resource->SpiSerialBus.DeviceSelection,
549 AcpiGbl_DpDecode [(Resource->SpiSerialBus.TypeSpecificFlags >> 1) & 1],
550 AcpiGbl_WmDecode [(Resource->SpiSerialBus.TypeSpecificFlags & 1)],
549 AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags, 1)],
550 AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags)],
551 Resource->SpiSerialBus.DataBitLength);
552
553 /* SlaveMode, ConnectionSpeed, ClockPolarity, ClockPhase */
554
555 AcpiDmIndent (Level + 1);
556 AcpiOsPrintf ("%s, 0x%8.8X, %s,\n",
551 Resource->SpiSerialBus.DataBitLength);
552
553 /* SlaveMode, ConnectionSpeed, ClockPolarity, ClockPhase */
554
555 AcpiDmIndent (Level + 1);
556 AcpiOsPrintf ("%s, 0x%8.8X, %s,\n",
557 AcpiGbl_SmDecode [(Resource->SpiSerialBus.Flags & 1)],
557 AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.Flags)],
558 Resource->SpiSerialBus.ConnectionSpeed,
558 Resource->SpiSerialBus.ConnectionSpeed,
559 AcpiGbl_CpoDecode [(Resource->SpiSerialBus.ClockPolarity & 1)]);
559 AcpiGbl_CpoDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.ClockPolarity)]);
560
561 AcpiDmIndent (Level + 1);
562 AcpiOsPrintf ("%s, ",
560
561 AcpiDmIndent (Level + 1);
562 AcpiOsPrintf ("%s, ",
563 AcpiGbl_CphDecode [(Resource->SpiSerialBus.ClockPhase & 1)]);
563 AcpiGbl_CphDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.ClockPhase)]);
564
565 /* ResourceSource is a required field */
566
567 ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
568 Resource->CommonSerialBus.TypeDataLength;
569
570 AcpiUtPrintString (
571 ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
572 ACPI_UINT8_MAX);
573
574 /* ResourceSourceIndex, ResourceUsage */
575
576 AcpiOsPrintf (",\n");
577 AcpiDmIndent (Level + 1);
578 AcpiOsPrintf ("0x%2.2X, ", Resource->SpiSerialBus.ResSourceIndex);
579
580 AcpiOsPrintf ("%s, ",
564
565 /* ResourceSource is a required field */
566
567 ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
568 Resource->CommonSerialBus.TypeDataLength;
569
570 AcpiUtPrintString (
571 ACPI_ADD_PTR (char, Resource, ResourceSourceOffset),
572 ACPI_UINT8_MAX);
573
574 /* ResourceSourceIndex, ResourceUsage */
575
576 AcpiOsPrintf (",\n");
577 AcpiDmIndent (Level + 1);
578 AcpiOsPrintf ("0x%2.2X, ", Resource->SpiSerialBus.ResSourceIndex);
579
580 AcpiOsPrintf ("%s, ",
581 AcpiGbl_ConsumeDecode [(Resource->SpiSerialBus.Flags >> 1) & 1]);
581 AcpiGbl_ConsumeDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->SpiSerialBus.Flags, 1)]);
582
583 /* Insert a descriptor name */
584
585 AcpiDmDescriptorName ();
586 AcpiOsPrintf (",\n");
587
588 /* Dump the vendor data */
589

--- 26 unchanged lines hidden (view full) ---

616 UINT32 ResourceSourceOffset;
617
618
619 /* ConnectionSpeed, BitsPerByte, StopBits */
620
621 AcpiDmIndent (Level);
622 AcpiOsPrintf ("UartSerialBus (0x%8.8X, %s, %s,\n",
623 Resource->UartSerialBus.DefaultBaudRate,
582
583 /* Insert a descriptor name */
584
585 AcpiDmDescriptorName ();
586 AcpiOsPrintf (",\n");
587
588 /* Dump the vendor data */
589

--- 26 unchanged lines hidden (view full) ---

616 UINT32 ResourceSourceOffset;
617
618
619 /* ConnectionSpeed, BitsPerByte, StopBits */
620
621 AcpiDmIndent (Level);
622 AcpiOsPrintf ("UartSerialBus (0x%8.8X, %s, %s,\n",
623 Resource->UartSerialBus.DefaultBaudRate,
624 AcpiGbl_BpbDecode [(Resource->UartSerialBus.TypeSpecificFlags >> 4) & 3],
625 AcpiGbl_SbDecode [(Resource->UartSerialBus.TypeSpecificFlags >> 2) & 3]);
624 AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 4)],
625 AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 2)]);
626
627 /* LinesInUse, IsBigEndian, Parity, FlowControl */
628
629 AcpiDmIndent (Level + 1);
630 AcpiOsPrintf ("0x%2.2X, %s, %s, %s,\n",
631 Resource->UartSerialBus.LinesEnabled,
626
627 /* LinesInUse, IsBigEndian, Parity, FlowControl */
628
629 AcpiDmIndent (Level + 1);
630 AcpiOsPrintf ("0x%2.2X, %s, %s, %s,\n",
631 Resource->UartSerialBus.LinesEnabled,
632 AcpiGbl_EdDecode [(Resource->UartSerialBus.TypeSpecificFlags >> 7) & 1],
633 AcpiGbl_PtDecode [Resource->UartSerialBus.Parity & 7],
634 AcpiGbl_FcDecode [Resource->UartSerialBus.TypeSpecificFlags & 3]);
632 AcpiGbl_EdDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 7)],
633 AcpiGbl_PtDecode [ACPI_GET_3BIT_FLAG (Resource->UartSerialBus.Parity)],
634 AcpiGbl_FcDecode [ACPI_GET_2BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags)]);
635
636 /* ReceiveBufferSize, TransmitBufferSize */
637
638 AcpiDmIndent (Level + 1);
639 AcpiOsPrintf ("0x%4.4X, 0x%4.4X, ",
640 Resource->UartSerialBus.RxFifoSize,
641 Resource->UartSerialBus.TxFifoSize);
642

--- 8 unchanged lines hidden (view full) ---

651
652 /* ResourceSourceIndex, ResourceUsage */
653
654 AcpiOsPrintf (",\n");
655 AcpiDmIndent (Level + 1);
656 AcpiOsPrintf ("0x%2.2X, ", Resource->UartSerialBus.ResSourceIndex);
657
658 AcpiOsPrintf ("%s, ",
635
636 /* ReceiveBufferSize, TransmitBufferSize */
637
638 AcpiDmIndent (Level + 1);
639 AcpiOsPrintf ("0x%4.4X, 0x%4.4X, ",
640 Resource->UartSerialBus.RxFifoSize,
641 Resource->UartSerialBus.TxFifoSize);
642

--- 8 unchanged lines hidden (view full) ---

651
652 /* ResourceSourceIndex, ResourceUsage */
653
654 AcpiOsPrintf (",\n");
655 AcpiDmIndent (Level + 1);
656 AcpiOsPrintf ("0x%2.2X, ", Resource->UartSerialBus.ResSourceIndex);
657
658 AcpiOsPrintf ("%s, ",
659 AcpiGbl_ConsumeDecode [(Resource->UartSerialBus.Flags >> 1) & 1]);
659 AcpiGbl_ConsumeDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->UartSerialBus.Flags, 1)]);
660
661 /* Insert a descriptor name */
662
663 AcpiDmDescriptorName ();
664 AcpiOsPrintf (",\n");
665
666 /* Dump the vendor data */
667

--- 32 unchanged lines hidden --- 		660
661 /* Insert a descriptor name */
662
663 AcpiDmDescriptorName ();
664 AcpiOsPrintf (",\n");
665
666 /* Dump the vendor data */
667

--- 32 unchanged lines hidden ---