From patchwork Mon May 9 21:34:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 94884 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 47C5CB6F1B for ; Tue, 10 May 2011 07:45:29 +1000 (EST) Received: from localhost ([::1]:48510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJYGc-0004JC-NL for incoming@patchwork.ozlabs.org; Mon, 09 May 2011 17:45:26 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY70-000455-BL for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJY6z-0006Ps-4P for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:30 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:48729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6y-0006A3-SO for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:29 -0400 Received: by mail-iy0-f173.google.com with SMTP id 10so5564538iym.4 for ; Mon, 09 May 2011 14:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=Gd4v2NUzd/Y87PW/2ch6kNSQaa/tlqoXx/AvsL7MUeA=; b=Rr6ERzg+9wBsCkCQdBrbvnLZ1/vhJLR7WABc1yFuMfyS7ryG4tbHT7zwA3tO4OsRFb vCaA3aU7oac29Pae+kVh7xUyXJdQdIApMocmDWpI18dEtMGQm4jD/HZiISHvRufC+6s9 HCrNPj2F6aDIcFgwrO/0RXmZ/V6R05dvOo04o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=Lb9XMjgZGgB1DwiS11YYtovBByQ2vSmeU53rOf+5owAwsH3eKrYaSqu/xUbnFmG+/C PMepETMnue9whvxsifYz4ImTSpQk5H8ODRuEg1AIxwOzIHihGPpPpa3mY+uFt+MJkJX+ Zz6eeyUZTfg6+DM0gv3/rL0f9wrtBq5z3ySB0= Received: by 10.42.158.66 with SMTP id g2mr94429icx.125.1304976928598; Mon, 09 May 2011 14:35:28 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id ui7sm2549819icb.14.2011.05.09.14.35.27 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 May 2011 14:35:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 9 May 2011 14:34:49 -0700 Message-Id: <1304976889-29675-36-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304976889-29675-1-git-send-email-rth@twiddle.net> References: <1304976889-29675-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Subject: [Qemu-devel] [PATCH 35/35] target-alpha: Add ps2 keyboard. 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 Signed-off-by: Richard Henderson --- default-configs/alpha-softmmu.mak | 1 + hw/alpha_dp264.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index 32167cd..be86d0c 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -3,6 +3,7 @@ include pci.mak CONFIG_SERIAL=y CONFIG_I8254=y +CONFIG_PCKBD=y CONFIG_VGA_PCI=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c index 30ae567..73a88fa 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha_dp264.c @@ -83,6 +83,7 @@ static void clipper_init(ram_addr_t ram_size, rtc_init(1980, rtc_irq); pit_init(0x40, 0); + isa_create_simple("i8042"); /* VGA setup. Don't bother loading the bios. */ alpha_pci_vga_setup(pci_bus);