mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-05 20:54:31 +00:00
709ea543b9
At present stdio device functions do not get any clue as to which stdio
device is being acted on. Some implementations go to great lengths to work
around this, such as defining a whole separate set of functions for each
possible device.
For driver model we need to associate a stdio_dev with a device. It doesn't
seem possible to continue with this work-around approach.
Instead, add a stdio_dev pointer to each of the stdio member functions.
Note: The serial drivers have the same problem, but it is not strictly
necessary to fix that to get driver model running. Also, if we convert
serial over to driver model the problem will go away.
Code size increases by 244 bytes for Thumb2 and 428 for PowerPC.
22: stdio: Pass device pointer to stdio methods
arm: (for 2/2 boards) all +244.0 bss -4.0 text +248.0
powerpc: (for 1/1 boards) all +428.0 text +428.0
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Marek Vasut <marex@denx.de>
Reviewed-by: Marek Vasut <marex@denx.de>
67 lines
1.7 KiB
C
67 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
|
|
*/
|
|
|
|
#include <common.h>
|
|
|
|
#ifndef CONFIG_SYS_COREBOOT
|
|
#error This driver requires coreboot
|
|
#endif
|
|
|
|
#include <asm/arch/sysinfo.h>
|
|
|
|
struct cbmem_console {
|
|
u32 buffer_size;
|
|
u32 buffer_cursor;
|
|
u8 buffer_body[0];
|
|
} __attribute__ ((__packed__));
|
|
|
|
static struct cbmem_console *cbmem_console_p;
|
|
|
|
void cbmemc_putc(struct stdio_dev *dev, char data)
|
|
{
|
|
int cursor;
|
|
|
|
cursor = cbmem_console_p->buffer_cursor++;
|
|
if (cursor < cbmem_console_p->buffer_size)
|
|
cbmem_console_p->buffer_body[cursor] = data;
|
|
}
|
|
|
|
void cbmemc_puts(struct stdio_dev *dev, const char *str)
|
|
{
|
|
char c;
|
|
|
|
while ((c = *str++) != 0)
|
|
cbmemc_putc(dev, c);
|
|
}
|
|
|
|
int cbmemc_init(void)
|
|
{
|
|
int rc;
|
|
struct stdio_dev cons_dev;
|
|
cbmem_console_p = lib_sysinfo.cbmem_cons;
|
|
|
|
memset(&cons_dev, 0, sizeof(cons_dev));
|
|
|
|
strcpy(cons_dev.name, "cbmem");
|
|
cons_dev.flags = DEV_FLAGS_OUTPUT; /* Output only */
|
|
cons_dev.putc = cbmemc_putc;
|
|
cons_dev.puts = cbmemc_puts;
|
|
|
|
rc = stdio_register(&cons_dev);
|
|
|
|
return (rc == 0) ? 1 : rc;
|
|
}
|