Author: kallisti5 Date: 2011-09-08 05:15:37 +0200 (Thu, 08 Sep 2011) New Revision: 42724 Changeset: https://dev.haiku-os.org/changeset/42724 Modified: haiku/trunk/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c haiku/trunk/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c Log: * make ata/ide channel pretty names more descriptive * verified nothing in the source tree references "IDE PCI" * line length fixes Modified: haiku/trunk/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c =================================================================== --- haiku/trunk/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c 2011-09-08 02:30:43 UTC (rev 42723) +++ haiku/trunk/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c 2011-09-08 03:15:37 UTC (rev 42724) @@ -9,6 +9,7 @@ #include <KernelExport.h> #include <malloc.h> +#include <stdio.h> #include <string.h> #include <ata_adapter.h> @@ -489,14 +490,21 @@ uint8 channel_index, const char *name, const io_resource *resources, device_node **node) { + char prettyName[25]; + sprintf(prettyName, "ATA Channel %" B_PRIu8, channel_index); + device_attr attrs[] = { // info about ourself and our consumer - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "IDE PCI" }}, - { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, { string: ATA_FOR_CONTROLLER_MODULE_NAME }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, + { string: prettyName }}, + { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, + { string: ATA_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify channel - { ATA_ADAPTER_COMMAND_BLOCK_BASE, B_UINT16_TYPE, { ui16: command_block_base }}, - { ATA_ADAPTER_CONTROL_BLOCK_BASE, B_UINT16_TYPE, { ui16: control_block_base }}, + { ATA_ADAPTER_COMMAND_BLOCK_BASE, B_UINT16_TYPE, + { ui16: command_block_base }}, + { ATA_ADAPTER_CONTROL_BLOCK_BASE, B_UINT16_TYPE, + { ui16: control_block_base }}, { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: can_dma }}, { ATA_ADAPTER_INTNUM, B_UINT8_TYPE, { ui8: intnum }}, { ATA_ADAPTER_CHANNEL_INDEX, B_UINT8_TYPE, { ui8: channel_index }}, Modified: haiku/trunk/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c =================================================================== --- haiku/trunk/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c 2011-09-08 02:30:43 UTC (rev 42723) +++ haiku/trunk/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c 2011-09-08 03:15:37 UTC (rev 42724) @@ -12,6 +12,7 @@ #include <KernelExport.h> #include <malloc.h> +#include <stdio.h> #include <string.h> #include <device_manager.h> @@ -472,14 +473,21 @@ uint8 channel_index, const char *name, const io_resource *resources, device_node **node) { + char prettyName[25]; + sprintf(prettyName, "IDE Channel %" B_PRIu8, channel_index); + device_attr attrs[] = { // info about ourself and our consumer - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "IDE PCI" }}, - { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, { string: IDE_FOR_CONTROLLER_MODULE_NAME }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, + { string: prettyName }}, + { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, + { string: IDE_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify channel - { IDE_ADAPTER_COMMAND_BLOCK_BASE, B_UINT16_TYPE, { ui16: command_block_base }}, - { IDE_ADAPTER_CONTROL_BLOCK_BASE, B_UINT16_TYPE, { ui16: control_block_base }}, + { IDE_ADAPTER_COMMAND_BLOCK_BASE, B_UINT16_TYPE, + { ui16: command_block_base }}, + { IDE_ADAPTER_CONTROL_BLOCK_BASE, B_UINT16_TYPE, + { ui16: control_block_base }}, { IDE_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: can_dma }}, { IDE_ADAPTER_INTNUM, B_UINT8_TYPE, { ui8: intnum }}, { IDE_ADAPTER_CHANNEL_INDEX, B_UINT8_TYPE, { ui8: channel_index }},