From patchwork Wed Apr 24 09:22:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 239091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 0AA082C00EC for ; Wed, 24 Apr 2013 19:22:29 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UUvuF-0003Hv-Uh; Wed, 24 Apr 2013 09:22:27 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UUvuD-0003Hg-SJ for fwts-devel@lists.ubuntu.com; Wed, 24 Apr 2013 09:22:25 +0000 Received: from faun.canonical.com ([91.189.93.182] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UUvuD-0003eU-Pf for fwts-devel@lists.ubuntu.com; Wed, 24 Apr 2013 09:22:25 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 1/2] cmos: cmosdump: remove unused commented out code Date: Wed, 24 Apr 2013 10:22:24 +0100 Message-Id: <1366795345-4404-2-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1366795345-4404-1-git-send-email-colin.king@canonical.com> References: <1366795345-4404-1-git-send-email-colin.king@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King There is no need for the commented out code, so remove it. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Keng-Yu Lin --- src/cmos/cmosdump/cmosdump.c | 129 ------------------------------------------- 1 file changed, 129 deletions(-) diff --git a/src/cmos/cmosdump/cmosdump.c b/src/cmos/cmosdump/cmosdump.c index 22294c0..5cc8277 100644 --- a/src/cmos/cmosdump/cmosdump.c +++ b/src/cmos/cmosdump/cmosdump.c @@ -292,59 +292,6 @@ static int cmosdump_test1(fwts_framework *fw) data[26]); fwts_log_nl(fw); - /* - fwts_log_info_verbatum(fw, "Drive C: (CMOS 0x"); - fwts_log_info_verbatum(fw, " Number of Cylinders: 0x%2.2x%2.2x", - data[28], data[27]); - fwts_log_info_verbatum(fw, " Number of Heads: 0x%2.2x", - data[29]); - fwts_log_info_verbatum(fw, " Number of Sectors: 0x%2.2x", - data[35]); - fwts_log_info_verbatum(fw, " Write precomp cylinder: 0x%2.2x%2.2x", - data[31], data[30]); - fwts_log_info_verbatum(fw, " Control Byte: 0x%2.2x", - data[32]); - fwts_log_info_verbatum(fw, " Landing Zone 0x%2.2x%2.2x", - data[34], data[33]); - fwts_log_nl(fw); - - fwts_log_info_verbatum(fw, "Drive D:"); - fwts_log_info_verbatum(fw, " Number of Cylinders: 0x%2.2x%2.2x", - data[37], data[36]); - fwts_log_info_verbatum(fw, " Number of Heads: 0x%2.2x", - data[38]); - fwts_log_info_verbatum(fw, " Number of Sectors: 0x%2.2x", - data[39]); - fwts_log_info_verbatum(fw, " Write precomp cylinder: 0x%2.2x%2.2x", - data[41], data[40]); - fwts_log_info_verbatum(fw, " Control Byte: 0x%2.2x", - data[41]); - fwts_log_info_verbatum(fw, " Landing Zone 0x%2.2x%2.2x", - data[44], data[43]); - fwts_log_nl(fw); - */ - - /* AMI only - fwts_log_info_verbatum(fw, "System Operational Flags:"); - fwts_log_info_verbatum(" Turbo switch: 0x%1.1x (%s)", - (data[45] >> 0) & 1, (data[45] >> 0) & 1 ? "Yes" : "No"); - fwts_log_info_verbatum(fw, " Fast gate A20 operation 0x%1.1x (%s)", - (data[45] >> 1) & 1, (data[45] >> 1) & 1 ? "Yes" : "No"); - fwts_log_info_verbatum(fw, " Internal Cache: 0x%1.1x (%s)", - (data[45] >> 2) & 1, (data[45] >> 2) & 1 ? "Yes" : "No"); - fwts_log_info_verbatum(fw, " External Cache: 0x%1.1x (%s)", - (data[45] >> 3) & 1, (data[45] >> 3) & 1 ? "Yes" : "No"); - fwts_log_info_verbatum(fw, " Boot CPU speed: 0x%1.1x (%s)", - (data[45] >> 4) & 1, (data[45] >> 4) & 1 ? "Yes" : "No"); - fwts_log_info_verbatum(fw, " Boot Sequence: 0x%1.1x (%s)", - (data[45] >> 5) & 1, (data[45] >> 5) & 1 ? "Yes" : "No"); - fwts_log_info_verbatum(fw, " Floppy boot seek: 0x%1.1x (%s)", - (data[45] >> 6) & 1, (data[45] >> 6) & 1 ? "Yes" : "No"); - fwts_log_info_verbatum(fw, " Weitek CPU: 0x%1.1x (%s)", - (data[45] >> 7) & 1, (data[45] >> 7) & 1 ? "Yes" : "No"); - fwts_log_nl(fw); - */ - fwts_log_info_verbatum(fw, "CMOS Checksum:(CMOS 0x2e):0x%2.2x%2.2x", data[47], data[46]); fwts_log_nl(fw); @@ -362,82 +309,6 @@ static int cmosdump_test1(fwts_framework *fw) (data[51] >> 7) & 1, (data[51] >> 7) & 1 ? "128KB" : "64KB"); fwts_log_nl(fw); - /* - fwts_log_info_verbatum(fw, "BIOS and Shadow Option flags:"); - fwts_log_info_verbatum(fw, " Password checking: 0x%1.1x %s", - (data[52] >> 6) & 1, - (data[52] >> 6) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " Boot sector virus prot: 0x%1.1x %s", - (data[52] >> 7) & 1, - (data[52] >> 7) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " Numeric CPU test: 0x%1.1x %s", - (data[53] >> 0) & 1, - (data[53] >> 0) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xC000: 0x%1.1x %s", - (data[53] >> 2) & 1, - (data[53] >> 2) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xC400: 0x%1.1x %s", - (data[53] >> 1) & 1, - (data[53] >> 1) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xC800: 0x%1.1x %s", - (data[52] >> 5) & 1, - (data[52] >> 5) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xCC00: 0x%1.1x %s", - (data[52] >> 4) & 1, - (data[52] >> 4) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xD000: 0x%1.1x %s", - (data[52] >> 3) & 1, - (data[52] >> 3) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xD400: 0x%1.1x %s", - (data[52] >> 2) & 1, - (data[52] >> 2) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xD800: 0x%1.1x %s", - (data[52] >> 1) & 1, - (data[52] >> 1) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xDC00: 0x%1.1x %s", - (data[52] >> 0) & 1, - (data[52] >> 0) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xE000: 0x%1.1x %s", - (data[53] >> 7) & 1, - (data[53] >> 7) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xE400: 0x%1.1x %s", - (data[53] >> 6) & 1, - (data[53] >> 6) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xE800: 0x%1.1x %s", - (data[53] >> 5) & 1, - (data[53] >> 5) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xEC00: 0x%1.1x %s", - (data[53] >> 4) & 1, - (data[53] >> 4) & 1 ? "Enabled" : "Disabled"); - fwts_log_info_verbatum(fw, " ROM shadow 0xF000: 0x%1.1x %s", - (data[53] >> 3) & 1, - (data[53] >> 3) & 1 ? "Enabled" : "Disabled"); - fwts_log_nl(fw); - */ - - /* AMI - fwts_log_info_verbatum(fw, "Encrypted Password: 0x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x", - data[56], data[57], data[58], data[59], data[60], data[61]); - fwts_log_info_verbatum(fw, "Extended CMOS checksum: 0x%2.2x%2.2x", - data[62], data[63]); - - fwts_log_info_verbatum(fw, "Model Number: 0x%2.2x", - data[64]); - fwts_log_info_verbatum(fw, "Serial Number: 0x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x", - data[65], data[66], data[67], data[68], data[69], data[70]); - fwts_log_info_verbatum(fw, "CRC byte: 0x%2.2x", - data[71]); - fwts_log_info_verbatum(fw, "Century Byte: 0x%2.2x", - data[72]); - fwts_log_info_verbatum(fw, "Date Alarm: 0x%2.2x", - data[73]); - fwts_log_info_verbatum(fw, "RTC Address: 0x%2.2x%2.2x", - data[79], data[78]); - fwts_log_info_verbatum(fw, "Extended RAM address: 0x%2.2x%2.2x", - data[81], data[80]); - fwts_log_nl(fw); - */ - fwts_infoonly(fw); return FWTS_OK;