mirror of
https://gitlab.com/qemu-project/openbios.git
synced 2024-02-13 08:34:06 +08:00
merge more sparc32 code from: Blue Swirl <blueswir1@hotmail.com>
git-svn-id: svn://coreboot.org/openbios/openbios-devel@16 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
committed by
Stefan Reinauer
parent
d421756207
commit
db8e7fe92a
@@ -431,7 +431,7 @@ call1_func( void )
|
||||
|
||||
|
||||
static void
|
||||
add_methods( int flags, int size, method_t *methods, int nmet )
|
||||
add_methods( int flags, int size, const method_t *methods, int nmet )
|
||||
{
|
||||
xt_t xt=0;
|
||||
int i;
|
||||
@@ -470,14 +470,14 @@ add_methods( int flags, int size, method_t *methods, int nmet )
|
||||
}
|
||||
|
||||
void
|
||||
bind_node( int flags, int size, char **paths, int npaths,
|
||||
method_t *methods, int nmet )
|
||||
bind_node( int flags, int size, const char * const *paths, int npaths,
|
||||
const method_t *methods, int nmet )
|
||||
{
|
||||
phandle_t save_ph = get_cur_dev();
|
||||
int i;
|
||||
|
||||
for( i=0; i<npaths; i++ ) {
|
||||
char *name = paths[i];
|
||||
const char *name = paths[i];
|
||||
|
||||
/* type matching? */
|
||||
if( *name == 'T' ) {
|
||||
@@ -506,8 +506,8 @@ bind_node( int flags, int size, char **paths, int npaths,
|
||||
}
|
||||
|
||||
void
|
||||
bind_new_node( int flags, int size, char *name,
|
||||
method_t *methods, int nmet )
|
||||
bind_new_node( int flags, int size, const char *name,
|
||||
const method_t *methods, int nmet )
|
||||
{
|
||||
phandle_t save_ph = get_cur_dev();
|
||||
|
||||
|
||||
@@ -17,6 +17,13 @@
|
||||
#include "libc/byteorder.h"
|
||||
#include "modules.h"
|
||||
|
||||
#ifdef CONFIG_DEBUG_SUN_PARTS
|
||||
#define DPRINTF(fmt, args...) \
|
||||
do { printk(fmt , ##args); } while (0)
|
||||
#else
|
||||
#define DPRINTF(fmt, args...)
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
ullong offs;
|
||||
ullong size;
|
||||
@@ -88,7 +95,7 @@ sunparts_open( sunparts_info_t *di )
|
||||
struct sun_disklabel *p;
|
||||
unsigned int i;
|
||||
|
||||
printk("sunparts_open '%s'\n", str );
|
||||
DPRINTF("sunparts_open '%s'\n", str );
|
||||
|
||||
if( str ) {
|
||||
parnum = atol(str);
|
||||
@@ -103,7 +110,7 @@ sunparts_open( sunparts_info_t *di )
|
||||
|
||||
/* Check Magic */
|
||||
if (!has_sun_part_magic(buf)) {
|
||||
printk("sun partition magic not found.\n");
|
||||
DPRINTF("sun partition magic not found.\n");
|
||||
RET(0);
|
||||
}
|
||||
|
||||
@@ -111,7 +118,7 @@ sunparts_open( sunparts_info_t *di )
|
||||
p = (struct sun_disklabel *)buf;
|
||||
|
||||
for (i = 0; i < 8; i++) {
|
||||
printk("%c: %d + %d, id %x, flags %x\n", 'a' + i, p->partitions[i].start_cylinder,
|
||||
DPRINTF("%c: %d + %d, id %x, flags %x\n", 'a' + i, p->partitions[i].start_cylinder,
|
||||
p->partitions[i].num_sectors, p->infos[i].id, p->infos[i].flags);
|
||||
if (parnum < 0) {
|
||||
if (p->partitions[i].num_sectors != 0 && p->infos[i].id != 0)
|
||||
@@ -122,7 +129,7 @@ sunparts_open( sunparts_info_t *di )
|
||||
__be16_to_cpu(p->ntrks) * __be16_to_cpu(p->nsect);
|
||||
|
||||
di->size = (llong)__be32_to_cpu(p->partitions[parnum].num_sectors) ;
|
||||
printk("Found Sun partition table, offs %d size %d\n", (int)di->offs, (int)di->size);
|
||||
DPRINTF("Found Sun partition table, offs %d size %d\n", (int)di->offs, (int)di->size);
|
||||
|
||||
RET( -1 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user