@@ -205,7 +205,7 @@ print_avail_channels(HANDLE BoardHandle)
205205 for (ULONG i = 0 ; i < NbOfChn; i++) {
206206 VHD_GetChannelProperty (BoardHandle, VHD_RX_CHANNEL, i,
207207 VHD_CORE_CP_TYPE, &ChnType);
208- printf (" RX%d =%s / " , i,
208+ printf (" RX%" PRIu_ULONG " =%s / " , i,
209209 VHD_CHANNELTYPE_ToPrettyString (
210210 ((VHD_CHANNELTYPE) ChnType)));
211211 }
@@ -214,7 +214,7 @@ print_avail_channels(HANDLE BoardHandle)
214214 for (ULONG i = 0 ; i < NbOfChn; i++) {
215215 VHD_GetChannelProperty (BoardHandle, VHD_TX_CHANNEL, i,
216216 VHD_CORE_CP_TYPE, &ChnType);
217- printf (" TX%d =%s / " , i,
217+ printf (" TX%" PRIu_ULONG " =%s / " , i,
218218 VHD_CHANNELTYPE_ToPrettyString (
219219 ((VHD_CHANNELTYPE) ChnType)));
220220 }
@@ -337,15 +337,17 @@ print_board_info(int BoardIndex, ULONG DllVersion, bool full)
337337 printf (" \t - PCIe Id string : %s\n " , pIdString_c);
338338 printf (" \t - Driver %s\n " ,
339339 delta_format_version (DriverVersion, false ).c_str ());
340- printf (" \t - Board fpga firmware v%02X (%02X-%02X-%02X)\n " ,
340+ printf (" \t - Board fpga firmware v%02" PRIX_ULONG " (%02" PRIX_ULONG
341+ " -%02" PRIX_ULONG " -%02" PRIX_ULONG " )\n " ,
341342 FirmwareVersion & 0xFF , (FirmwareVersion >> 24 ) & 0xFF ,
342343 (FirmwareVersion >> 16 ) & 0xFF , (FirmwareVersion >> 8 ) & 0xFF );
343344 if (BoardType == VHD_BOARDTYPE_3G || BoardType == VHD_BOARDTYPE_3GKEY ||
344345 (BoardType == VHD_BOARDTYPE_HD && NbTxChannels == 4 )) {
345346 VHD_GetBoardProperty (BoardHandle, VHD_CORE_BP_FIRMWARE3_VERSION,
346347 &Firmware3Version);
347- printf (" \t - Board micro-controller firmware v%02X "
348- " (%02X-%02X-%02X)\n " ,
348+ printf (" \t - Board micro-controller firmware v%02" PRIX_ULONG
349+ " (%02" PRIX_ULONG " -%02" PRIX_ULONG " -%02" PRIX_ULONG
350+ " )\n " ,
349351 Firmware3Version & 0xFF , (Firmware3Version >> 24 ) & 0xFF ,
350352 (Firmware3Version >> 16 ) & 0xFF ,
351353 (Firmware3Version >> 8 ) & 0xFF );
@@ -355,18 +357,23 @@ print_board_info(int BoardIndex, ULONG DllVersion, bool full)
355357 if (BoardType == VHD_BOARDTYPE_IP) {
356358 VHD_GetBoardProperty (BoardHandle, VHD_CORE_BP_FIRMWARE4_VERSION,
357359 &Firmware4Version);
358- printf (
359- " \t - Board microcode firmware v%02X (%02X-%02X-%02X)\n " ,
360- Firmware4Version & 0xFF , (Firmware4Version >> 24 ) & 0xFF ,
361- (Firmware4Version >> 16 ) & 0xFF ,
362- (Firmware4Version >> 8 ) & 0xFF );
360+ printf (" \t - Board microcode firmware v%02" PRIX_ULONG
361+ " (%02" PRIX_ULONG " -%02" PRIX_ULONG " -%02" PRIX_ULONG
362+ " )\n " ,
363+ Firmware4Version & 0xFF , (Firmware4Version >> 24 ) & 0xFF ,
364+ (Firmware4Version >> 16 ) & 0xFF ,
365+ (Firmware4Version >> 8 ) & 0xFF );
363366 }
364367#endif
365- printf (" \t - Board serial# : 0x%08X%08X%08X%08X\n " , SerialNumber_UL[3 ],
366- SerialNumber_UL[2 ], SerialNumber_UL[1 ], SerialNumber_UL[0 ]);
368+ printf (" \t - Board serial# : 0x%08" PRIX_ULONG " %08" PRIX_ULONG
369+ " %08" PRIX_ULONG " %08" PRIX_ULONG " \n " ,
370+ SerialNumber_UL[3 ], SerialNumber_UL[2 ], SerialNumber_UL[1 ],
371+ SerialNumber_UL[0 ]);
367372
368- if (ProductVersion != 0 )
369- printf (" \t - Board product v%04X\n " , ProductVersion);
373+ if (ProductVersion != 0 ) {
374+ printf (" \t - Board product v%04" PRIX_ULONG " \n " ,
375+ ProductVersion);
376+ }
370377
371378#ifdef HAVE_VHD_STRING
372379#define bus_type_to_str (x ) VHD_BUSTYPE_ToPrettyString((VHD_BUSTYPE) x)
@@ -377,11 +384,13 @@ print_board_info(int BoardIndex, ULONG DllVersion, bool full)
377384 bus_type_to_str (BusType));
378385#undef bus_type_to_str
379386 if (NbOfLane)
380- printf (" (%d lane%s)\n " , NbOfLane, (NbOfLane > 1 ) ? " s" : " " );
387+ printf (" (%" PRIu_ULONG " lane%s)\n " , NbOfLane,
388+ (NbOfLane > 1 ) ? " s" : " " );
381389 else
382390 printf (" \n " );
383391 printf (" \t - %s\n " , LowProfile ? " Low profile" : " Full height" );
384- printf (" \t - %d In / %d Out\n " , NbRxChannels, NbTxChannels);
392+ printf (" \t - %" PRIu_ULONG " In / %" PRIu_ULONG " Out\n " , NbRxChannels,
393+ NbTxChannels);
385394
386395 print_avail_channels (BoardHandle);
387396 const char *bidir_status = " ERROR" ;
0 commit comments