From 925baafa2c8676b24d4107cf022691fe4ff40f49 Mon Sep 17 00:00:00 2001 From: ftillier Date: Tue, 24 May 2005 23:10:42 +0000 Subject: [PATCH] Really merged with trunk this time, I think for sure maybe. git-svn-id: svn://openib.tc.cornell.edu/gen1@12 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/fab_cm_branch/inc/ics_ver.h | 6 +++--- branches/fab_cm_branch/tools/fwupdate/user/flint.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/branches/fab_cm_branch/inc/ics_ver.h b/branches/fab_cm_branch/inc/ics_ver.h index 416fa59f..d925eb3b 100644 --- a/branches/fab_cm_branch/inc/ics_ver.h +++ b/branches/fab_cm_branch/inc/ics_ver.h @@ -76,11 +76,11 @@ #ifdef VER_COMPANYNAME_STR #undef VER_COMPANYNAME_STR #endif -#define VER_COMPANYNAME_STR "SilverStorm Technologies, Inc." +#define VER_COMPANYNAME_STR "SilverStorm Technologies" #ifdef VER_PRODUCTNAME_STR #undef VER_PRODUCTNAME_STR #endif -#define VER_PRODUCTNAME_STR "InfiniServ 7000" +#define VER_PRODUCTNAME_STR "SilverStorm HCA 7000/9000" -#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2004 SilverStorm Technologies, Inc." +#define VER_LEGALCOPYRIGHT_STR "Copyright\xa9 2005 SilverStorm Technologies" diff --git a/branches/fab_cm_branch/tools/fwupdate/user/flint.cpp b/branches/fab_cm_branch/tools/fwupdate/user/flint.cpp index eb7b45f2..d6cd7bea 100644 --- a/branches/fab_cm_branch/tools/fwupdate/user/flint.cpp +++ b/branches/fab_cm_branch/tools/fwupdate/user/flint.cpp @@ -2079,7 +2079,7 @@ bool burnImageToFlash(FlashCommandLine cl) printf("The image on the flash device appears corrupted!\n" "Unable to determine the GUIDs from the flash device %s.\n" "Try the -n <0xGUID> option. If this fails, then contact\n" - "SilverStorm Technologies, Inc. technical support.\n", + "SilverStorm Technologies technical support.\n", cl.getDeviceName()); device.close(); return false; @@ -2296,7 +2296,7 @@ bool showInfo(FBase &device, FlashCommandLine cl) { printf("Hardware Version : 0x%"PRIX32"\n", hardwareversion); } - printf("Company : %s\n", ps.vsd[0]==0x00066A?"SilverStorm Technologies, Inc.":"Mellanox, Inc"); + printf("Company : %s\n", ps.vsd[0]==0x00066A?"SilverStorm Technologies":"Mellanox, Inc"); myTime = ps.vsd[2]; printf("%s Date : %s", (device.getClassType()==Flash::FlashDeviceType?"Burn ":"Creation"), asctime(localtime(&myTime))); -- 2.41.0