From patchwork Thu Jan 19 10:32:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 136811 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D4E0E1007D7 for ; Thu, 19 Jan 2012 21:33:45 +1100 (EST) Received: from localhost ([::1]:58205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnpJD-0003aC-AJ for incoming@patchwork.ozlabs.org; Thu, 19 Jan 2012 05:33:31 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnpIS-0001OY-I3 for qemu-devel@nongnu.org; Thu, 19 Jan 2012 05:32:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RnpIL-00071P-4z for qemu-devel@nongnu.org; Thu, 19 Jan 2012 05:32:44 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:36226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnpIK-00070y-UK for qemu-devel@nongnu.org; Thu, 19 Jan 2012 05:32:37 -0500 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 19 Jan 2012 10:32:35 -0000 Received: from d06nrmr1307.portsmouth.uk.ibm.com (9.149.38.129) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 19 Jan 2012 10:32:32 -0000 Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0JAWWPf2568244 for ; Thu, 19 Jan 2012 10:32:32 GMT Received: from d06av01.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0IKWWJ3014333 for ; Wed, 18 Jan 2012 13:32:32 -0700 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.31]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q0IKWWQV014322; Wed, 18 Jan 2012 13:32:32 -0700 From: Stefan Hajnoczi To: Anthony Liguori Date: Thu, 19 Jan 2012 10:32:05 +0000 Message-Id: <1326969127-22458-4-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1326969127-22458-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1326969127-22458-1-git-send-email-stefanha@linux.vnet.ibm.com> MIME-Version: 1.0 x-cbid: 12011910-3548-0000-0000-000000C8945E X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.112 Cc: Peter Maydell , qemu-devel@nongnu.org, Stefan Hajnoczi , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 3/5] lm32: Fix mixup of uint32 and uint32_t X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andreas Färber Commit d23948b15a9920fb7f6374b55a6db1ecff81f3ee (lm32: add Milkymist VGAFB support) introduced a stray usage of the softfloat uint32 type. Use uint32_t instead. Signed-off-by: Andreas Färber Acked-by: Michael Walle Cc: Peter Maydell Signed-off-by: Stefan Hajnoczi --- hw/milkymist-vgafb_template.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/milkymist-vgafb_template.h b/hw/milkymist-vgafb_template.h index 69af9ef..1d33ee8 100644 --- a/hw/milkymist-vgafb_template.h +++ b/hw/milkymist-vgafb_template.h @@ -39,7 +39,7 @@ #elif BITS == 24 #define COPY_PIXEL(to, r, g, b) \ do { \ - uint32 tmp = rgb_to_pixel24(r, g, b); \ + uint32_t tmp = rgb_to_pixel24(r, g, b); \ *(to++) = tmp & 0xff; \ *(to++) = (tmp >> 8) & 0xff; \ *(to++) = (tmp >> 16) & 0xff; \