From f7092040fd4aba081aad75116c2b9594149d5c66 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Fri, 13 Jun 2003 22:07:53 +0000 Subject: More FB2 stuff git-svn-id: svn://svn.coreboot.org/coreboot/trunk@877 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/motorola/sandpoint/flash.h | 2 +- src/mainboard/motorola/sandpoint/flash/amd800.c | 5 ++--- src/mainboard/motorola/sandpoint/flash/flash.c | 1 - src/mainboard/motorola/sandpoint/nvram/bsp_nvram.c | 2 +- src/mainboard/motorola/sandpoint/nvram/nvram.c | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src/mainboard/motorola') diff --git a/src/mainboard/motorola/sandpoint/flash.h b/src/mainboard/motorola/sandpoint/flash.h index 5ef1c6e19a..bd104a529c 100644 --- a/src/mainboard/motorola/sandpoint/flash.h +++ b/src/mainboard/motorola/sandpoint/flash.h @@ -14,7 +14,7 @@ typedef struct flash_fn int (* erase_all)(void *data); int (* erase)(void *data, unsigned offset, unsigned length); int (* program)(void *data, unsigned offset, const void *source, unsigned length); - u8 ( *read_byte)(void *data, unsigned offset); + uint8_t ( *read_byte)(void *data, unsigned offset); } flash_fn; typedef struct flash_device diff --git a/src/mainboard/motorola/sandpoint/flash/amd800.c b/src/mainboard/motorola/sandpoint/flash/amd800.c index a9064a3aba..607f3d7635 100644 --- a/src/mainboard/motorola/sandpoint/flash/amd800.c +++ b/src/mainboard/motorola/sandpoint/flash/amd800.c @@ -2,7 +2,6 @@ /* Copyright 2000 AG Electronics Ltd. */ /* This code is distributed without warranty under the GPL v2 (see COPYING) */ -#include #include #include #include "../flash.h" @@ -19,7 +18,7 @@ static const char *identify_amd (struct flash_device *flash_device); static int erase_flash_amd800 (void *data, unsigned offset, unsigned length); static int program_flash_amd800 (void *data, unsigned offset, const void *source, unsigned length); -static u8 read_byte_amd800(void *data, unsigned offset); +static uint8_t read_byte_amd800(void *data, unsigned offset); static flash_fn fn_amd800 = { identify_amd, @@ -221,7 +220,7 @@ int program_flash_amd800 (void *data, unsigned offset, const void *source, return 0; } -u8 read_byte_amd800 (void *data, unsigned offset) +uint8_t read_byte_amd800 (void *data, unsigned offset) { struct data_amd800 *d800 = data; volatile unsigned char *flash = (volatile unsigned char *) d800->base; diff --git a/src/mainboard/motorola/sandpoint/flash/flash.c b/src/mainboard/motorola/sandpoint/flash/flash.c index be0d40cefe..8db0f6aa57 100644 --- a/src/mainboard/motorola/sandpoint/flash/flash.c +++ b/src/mainboard/motorola/sandpoint/flash/flash.c @@ -2,7 +2,6 @@ /* Copyright 2000 AG Electronics Ltd. */ /* This code is distributed without warranty under the GPL v2 (see COPYING) */ -#include #include #include #include diff --git a/src/mainboard/motorola/sandpoint/nvram/bsp_nvram.c b/src/mainboard/motorola/sandpoint/nvram/bsp_nvram.c index bf5a81c812..7208b18d55 100644 --- a/src/mainboard/motorola/sandpoint/nvram/bsp_nvram.c +++ b/src/mainboard/motorola/sandpoint/nvram/bsp_nvram.c @@ -49,6 +49,6 @@ static int bsp_write_byte(struct nvram_device *data, unsigned offset, unsigned c } nvram_device bsp_nvram = { - bsp_size, bsp_read_block, bsp_write_byte, NULL, NULL + bsp_size, bsp_read_block, bsp_write_byte, 0, 0 }; diff --git a/src/mainboard/motorola/sandpoint/nvram/nvram.c b/src/mainboard/motorola/sandpoint/nvram/nvram.c index 13735748b7..45ca3f26e9 100644 --- a/src/mainboard/motorola/sandpoint/nvram/nvram.c +++ b/src/mainboard/motorola/sandpoint/nvram/nvram.c @@ -2,7 +2,6 @@ /* Copyright 2000 AG Electronics Ltd. */ /* This code is distributed without warranty under the GPL v2 (see COPYING) */ -#include #include #include #include "../nvram.h" @@ -20,7 +19,7 @@ static nvram_device *nvram_dev = 0; static unsigned char *nvram_buffer = 0; static unsigned nvram_size = 0; -static u8 nvram_csum = 0; +static uint8_t nvram_csum = 0; #define NVRAM_INVALID (! nvram_dev) static void update_device(unsigned i, unsigned char data) -- cgit v1.2.3