From 92b5a97a90183ac05ac521442891b0e4036e430e Mon Sep 17 00:00:00 2001 From: ftillier Date: Mon, 3 Apr 2006 21:27:57 +0000 Subject: [PATCH] [IBBUS] Fix device strings for consistency - I/O Unit device ID comes from NodeInfo, which is 16-bits. git-svn-id: svn://openib.tc.cornell.edu/gen1@275 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/core/bus/kernel/bus_iou_mgr.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/trunk/core/bus/kernel/bus_iou_mgr.c b/trunk/core/bus/kernel/bus_iou_mgr.c index 3d78de22..808c83e1 100644 --- a/trunk/core/bus/kernel/bus_iou_mgr.c +++ b/trunk/core/bus/kernel/bus_iou_mgr.c @@ -52,9 +52,11 @@ DEFINE_GUID(GUID_BUS_TYPE_IBA, * Size of device descriptions, in the format: * IBA\VxxxxxxPxxxxxxxxvxxxxxxxx */ -#define IOU_DEV_ID_SIZE sizeof(L"IBA\\VxxxxxxPxxxxxxxxvxxxxxxxx") +#define IOU_DEV_ID_SIZE sizeof(L"IBA\\VxxxxxxPxxxxvxxxxxxxx") +#define IOU_DEV_ID_STRING1 L"IBA\\V%06xP%04hxv%08x" +#define IOU_DEV_ID_STRING2 L"IBA\\V%06xP%04hx" #define IOU_HW_ID_SIZE \ - sizeof(L"IBA\\VxxxxxxPxxxxxxxxvxxxxxxxx\0IBA\\VxxxxxxPxxxxxxxx\0\0") + sizeof(L"IBA\\VxxxxxxPxxxxvxxxxxxxx\0IBA\\VxxxxxxPxxxx\0\0") #define IOU_COMPAT_ID L"IBA\\IB_IOU\0\0" #define IOU_LOCATION_SIZE \ sizeof(L"Chassis 0xxxxxxxxxxxxxxxxx, Slot xx") @@ -873,7 +875,7 @@ iou_query_device_id( } status = - RtlStringCbPrintfW( p_string, IOU_DEV_ID_SIZE, L"IBA\\V%06xP%08xv%08x", + RtlStringCbPrintfW( p_string, IOU_DEV_ID_SIZE, IOU_DEV_ID_STRING1, p_ext->vend_id, p_ext->dev_id, p_ext->revision ); if( !NT_SUCCESS( status ) ) { @@ -921,7 +923,7 @@ iou_query_hardware_ids( size = IOU_HW_ID_SIZE; /* Fill in the first HW ID. */ status = RtlStringCbPrintfExW( p_start, size, &p_start, &size, - STRSAFE_FILL_BEHIND_NULL, L"IBA\\V%06xP%04xv%08x", + STRSAFE_FILL_BEHIND_NULL | STRSAFE_NO_TRUNCATION, IOU_DEV_ID_STRING1, p_ext->vend_id, p_ext->dev_id, p_ext->revision ); if( !NT_SUCCESS( status ) ) { @@ -935,7 +937,7 @@ iou_query_hardware_ids( p_start++; size -= sizeof(WCHAR); status = RtlStringCbPrintfExW( p_start, size, NULL, NULL, - STRSAFE_FILL_BEHIND_NULL, L"IBA\\V%06xP%04x", + STRSAFE_FILL_BEHIND_NULL | STRSAFE_NO_TRUNCATION, IOU_DEV_ID_STRING2, p_ext->vend_id, p_ext->dev_id ); if( !NT_SUCCESS( status ) ) { -- 2.41.0