Virtualization
/
SLOF
mirror of https://gitlab.com/qemu-project/SLOF.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

net-snk: Remoe some now unused "kernel" functions 

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2014-07-15 10:12:40 +10:00 committed by Nikunj A Dadhania
parent 1c17c13a57
commit 00446893c3
2 changed files with 1 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clients/net-snk/include/netdriver_int.h
View File

@ -86,10 +86,6 @@ extern snk_module_t *snk_modules[MODULES_MAX];
typedef int (*print_t) (const char *, ...);
typedef void (*us_delay_t) (unsigned int);
typedef void (*ms_delay_t) (unsigned int);
typedef int (*pci_config_read_t) (long long puid, int size,
int bus, int devfn, int offset);
typedef int (*pci_config_write_t) (long long puid, int size,
int bus, int devfn, int offset, int value);
typedef void *(*malloc_aligned_t) (size_t, int);
typedef void *(*malloc_t) (size_t);
typedef void (*free_t) (void *);
@ -97,8 +93,6 @@ typedef int (*strcmp_t) (const char *, const char *);
typedef int (*snk_call_t) (int, char **);
typedef unsigned int (*io_read_t) (void *, size_t);
typedef int (*io_write_t) (void *, unsigned int, size_t);
typedef unsigned int (*romfs_lookup_t) (const char *name, void **addr);
typedef void (*translate_addr_t) (unsigned long *);
typedef int (*k_open_t) (const char *, int);
typedef int (*k_close_t) (int);
@ -109,16 +103,11 @@ typedef int (*k_ioctl_t) (int, int, void *);
typedef void (*modules_remove_t) (int);
typedef snk_module_t *(*modules_load_t) (int);
typedef long (*dma_map_in_t)(void *address, long size, int cachable);
typedef void (*dma_map_out_t)(void *address, long devaddr, long size);
typedef struct {
int version;
print_t print;
us_delay_t us_delay;
ms_delay_t ms_delay;
pci_config_read_t pci_config_read;
pci_config_write_t pci_config_write;
malloc_t k_malloc;
malloc_aligned_t k_malloc_aligned;
free_t k_free;
@ -126,8 +115,6 @@ typedef struct {
snk_call_t snk_call;
io_read_t io_read;
io_write_t io_write;
romfs_lookup_t k_romfs_lookup;
translate_addr_t translate_addr;
union {
pci_config_t pci_conf;
vio_config_t vio_conf;
@ -139,8 +126,6 @@ typedef struct {
k_ioctl_t k_ioctl;
modules_remove_t modules_remove;
modules_load_t modules_load;
dma_map_in_t dma_map_in;
dma_map_out_t dma_map_out;
} snk_kernel_t;
/* Entry of module */

50
clients/net-snk/oflib/of.c
View File

@ -307,16 +307,6 @@ of_release(void *start, unsigned int size)
(void) of_2_0("release", p32cast start, size);
}
unsigned int
romfs_lookup(const char *name, void **addr)
{
unsigned int high, low;
unsigned int i = of_2_3("ibm,romfs-lookup", p32cast name, strlen(name),
(int *) &high, (int *) &low);
*addr = (void*)(((unsigned long) high << 32) | (unsigned long) low);
return i;
}
void *
of_call_method_3(const char *name, ihandle_t ihandle, int arg0)
{
@ -423,35 +413,6 @@ of_fileio_close(snk_fileio_t *fileio)
return 0;
}
static long
dma_map_in(void *address, long size, int cachable)
{
unsigned int ret;
/* Is dma-map-in available? */
if (of_test("dma-map-in") != 0) {
/* No dma-map-in available ==> Assume we can use 1:1 addresses */
return (long)address;
}
ret = of_3_1("dma-map-in", p32cast address, (int)size, cachable);
return ret;
}
static void
dma_map_out(void *address, long devaddr, long size)
{
/* Is dma-map-out available? */
if (of_test("dma-map-out") != 0) {
/* No dma-map-out available */
return;
}
of_3_0("dma-map-out", p32cast address, (int)devaddr, (int)size);
}
#define CONFIG_SPACE 0
#define IO_SPACE 1
#define MEM_SPACE 2
@ -837,9 +798,7 @@ get_timebase(unsigned int *timebase)
of_getprop(cpu, "timebase-frequency", timebase, 4);
}
int
glue_init(snk_kernel_t * snk_kernel_interface, unsigned int * timebase,
int glue_init(snk_kernel_t * snk_kernel_interface, unsigned int * timebase,
size_t _client_start, size_t _client_size)
{
phandle_t chosen = of_finddevice("/chosen");
@ -877,13 +836,6 @@ glue_init(snk_kernel_t * snk_kernel_interface, unsigned int * timebase,
get_timebase(timebase);
rtas_init();
snk_kernel_interface->k_romfs_lookup = romfs_lookup;
snk_kernel_interface->translate_addr = translate_address;
snk_kernel_interface->pci_config_read = rtas_pci_config_read;
snk_kernel_interface->pci_config_write = rtas_pci_config_write;
snk_kernel_interface->dma_map_in = dma_map_in;
snk_kernel_interface->dma_map_out = dma_map_out;
claim_rc=(int)(long)of_claim(client_start, client_size, 0);
return 0;