From 51928f9997c3cc045eeb78041abb4e3ddd53f4c0 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 8 Sep 2011 03:15:37 +0000 Subject: [PATCH] * make ata/ide channel pretty names more descriptive * verified nothing in the source tree references "IDE PCI" * line length fixes git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42724 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/generic/ata_adapter/ata_adapter.c | 16 ++++++++++++---- .../kernel/generic/ide_adapter/ide_adapter.c | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c index 48b8365aa0..4289ed755b 100644 --- a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c +++ b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.c @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -489,14 +490,21 @@ ata_adapter_publish_channel(device_node *controller_node, 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 }}, diff --git a/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c b/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c index 80fca61bda..6770fa0ec6 100644 --- a/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c +++ b/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -472,14 +473,21 @@ ide_adapter_publish_channel(device_node *controller_node, 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 }},