From 44d2f5f53ecdbd030882fca45e40d53ea38801af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Fri, 26 Apr 2013 20:10:51 +0200 Subject: [PATCH] scsi bus manager: casts path_id to uint8. * added a TODO about create_id() generating int32 ids when we need uint8. * GCC 4.7 warning fixed: narrowing conversion. --- src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp b/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp index bb4fa08c83..30b3fcc7fd 100644 --- a/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp +++ b/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp @@ -27,7 +27,7 @@ static status_t scsi_controller_added(device_node *parent) { const char *controller_name; - int pathID; + int32 pathID; SHOW_FLOW0(4, ""); @@ -48,7 +48,8 @@ scsi_controller_added(device_node *parent) device_attr attrs[] = { // remember who we are // (could use the controller name, but probably some software would choke) - { SCSI_BUS_PATH_ID_ITEM, B_UINT8_TYPE, { ui8: pathID }}, + // TODO create_id() generates a 32 bit ranged integer but we need only 8 bits + { SCSI_BUS_PATH_ID_ITEM, B_UINT8_TYPE, { ui8: (uint8)pathID }}, // tell PnP manager to clean up ID // { PNP_MANAGER_ID_GENERATOR, B_STRING_TYPE, { string: SCSI_PATHID_GENERATOR }},