From f36c0f150f7606fa2233b484e2b9294ac709025a Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Mon, 15 Dec 2014 11:42:40 +0100 Subject: [PATCH] demo: support launchpad entries with mem >= 2048M Fixes #1325 --- repos/demo/src/app/launchpad/launch_entry.h | 8 ++++---- repos/demo/src/lib/launchpad/launchpad.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repos/demo/src/app/launchpad/launch_entry.h b/repos/demo/src/app/launchpad/launch_entry.h index 8e0ef5f83..94f8cd572 100644 --- a/repos/demo/src/app/launchpad/launch_entry.h +++ b/repos/demo/src/app/launchpad/launch_entry.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2013 Genode Labs GmbH + * Copyright (C) 2006-2014 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU General Public License version 2. @@ -37,13 +37,13 @@ class Launch_entry : public Scout::Parent_element, public Loadbar_listener /** * Constructor */ - Launch_entry(const char *prg_name, int initial_quota, int max_quota, - Launchpad *launchpad, + Launch_entry(const char *prg_name, unsigned long initial_quota, + unsigned long max_quota, Launchpad *launchpad, Genode::Dataspace_capability config_ds) : _block(Scout::Block::RIGHT), _loadbar(this, &Scout::label_font), _config(config_ds), - _launcher(prg_name, launchpad, 1024 * initial_quota, &_config) + _launcher(prg_name, launchpad, initial_quota * 1024UL, &_config) { _block.append_launchertext(prg_name, &Scout::link_style, &_launcher); diff --git a/repos/demo/src/lib/launchpad/launchpad.cc b/repos/demo/src/lib/launchpad/launchpad.cc index 0c91fe904..3a90b4009 100644 --- a/repos/demo/src/lib/launchpad/launchpad.cc +++ b/repos/demo/src/lib/launchpad/launchpad.cc @@ -188,7 +188,7 @@ Launchpad_child *Launchpad::start_child(const char *filename, unsigned long ram_quota, Genode::Dataspace_capability config_ds) { - printf("starting %s with quota %ld\n", filename, ram_quota); + printf("starting %s with quota %lu\n", filename, ram_quota); /* find unique name for new child */ char unique_name[64];