Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
fb58fa34
Commit
fb58fa34
authored
May 26, 2002
by
Paul Mackerras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PPC32: remove some compile warnings in the CHRP and powermac boot
wrappers by prototyping the function pointers we use.
parent
c39143b5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
+13
-7
arch/ppc/boot/chrp/main.c
arch/ppc/boot/chrp/main.c
+4
-2
arch/ppc/boot/pmac/chrpmain.c
arch/ppc/boot/pmac/chrpmain.c
+3
-1
arch/ppc/boot/pmac/coffmain.c
arch/ppc/boot/pmac/coffmain.c
+3
-1
arch/ppc/boot/pmac/start.c
arch/ppc/boot/pmac/start.c
+3
-3
No files found.
arch/ppc/boot/chrp/main.c
View file @
fb58fa34
...
@@ -46,6 +46,8 @@ char *avail_high;
...
@@ -46,6 +46,8 @@ char *avail_high;
static
char
scratch
[
SCRATCH_SIZE
];
/* 1MB of scratch space for gunzip */
static
char
scratch
[
SCRATCH_SIZE
];
/* 1MB of scratch space for gunzip */
typedef
void
(
*
kernel_start_t
)(
int
,
int
,
void
*
,
unsigned
int
,
unsigned
int
);
void
void
chrpboot
(
int
a1
,
int
a2
,
void
*
prom
)
chrpboot
(
int
a1
,
int
a2
,
void
*
prom
)
{
{
...
@@ -93,10 +95,10 @@ chrpboot(int a1, int a2, void *prom)
...
@@ -93,10 +95,10 @@ chrpboot(int a1, int a2, void *prom)
make_bi_recs
(((
unsigned
long
)
dst
+
len
),
"chrpboot"
,
_MACH_chrp
,
make_bi_recs
(((
unsigned
long
)
dst
+
len
),
"chrpboot"
,
_MACH_chrp
,
(
PROG_START
+
PROG_SIZE
));
(
PROG_START
+
PROG_SIZE
));
sa
=
(
unsigned
long
)
PROG_START
;
sa
=
PROG_START
;
printf
(
"start address = 0x%x
\n\r
"
,
sa
);
printf
(
"start address = 0x%x
\n\r
"
,
sa
);
(
*
(
void
(
*
)()
)
sa
)(
a1
,
a2
,
prom
,
initrd_start
,
initrd_size
);
(
*
(
kernel_start_t
)
sa
)(
a1
,
a2
,
prom
,
initrd_start
,
initrd_size
);
printf
(
"returned?
\n\r
"
);
printf
(
"returned?
\n\r
"
);
...
...
arch/ppc/boot/pmac/chrpmain.c
View file @
fb58fa34
...
@@ -41,6 +41,8 @@ char *avail_high;
...
@@ -41,6 +41,8 @@ char *avail_high;
#define SCRATCH_SIZE (128 << 10)
#define SCRATCH_SIZE (128 << 10)
typedef
void
(
*
kernel_start_t
)(
int
,
int
,
void
*
);
void
boot
(
int
a1
,
int
a2
,
void
*
prom
)
void
boot
(
int
a1
,
int
a2
,
void
*
prom
)
{
{
unsigned
sa
,
len
;
unsigned
sa
,
len
;
...
@@ -90,7 +92,7 @@ void boot(int a1, int a2, void *prom)
...
@@ -90,7 +92,7 @@ void boot(int a1, int a2, void *prom)
sa
=
(
unsigned
long
)
PROG_START
;
sa
=
(
unsigned
long
)
PROG_START
;
printf
(
"start address = 0x%x
\n
"
,
sa
);
printf
(
"start address = 0x%x
\n
"
,
sa
);
(
*
(
void
(
*
)()
)
sa
)(
a1
,
a2
,
prom
);
(
*
(
kernel_start_t
)
sa
)(
a1
,
a2
,
prom
);
printf
(
"returned?
\n
"
);
printf
(
"returned?
\n
"
);
...
...
arch/ppc/boot/pmac/coffmain.c
View file @
fb58fa34
...
@@ -47,6 +47,8 @@ char *avail_high;
...
@@ -47,6 +47,8 @@ char *avail_high;
static
char
heap
[
SCRATCH_SIZE
];
static
char
heap
[
SCRATCH_SIZE
];
typedef
void
(
*
kernel_start_t
)(
int
,
int
,
void
*
);
void
boot
(
int
a1
,
int
a2
,
void
*
prom
)
void
boot
(
int
a1
,
int
a2
,
void
*
prom
)
{
{
unsigned
sa
,
len
;
unsigned
sa
,
len
;
...
@@ -95,7 +97,7 @@ void boot(int a1, int a2, void *prom)
...
@@ -95,7 +97,7 @@ void boot(int a1, int a2, void *prom)
sa
=
(
unsigned
long
)
PROG_START
;
sa
=
(
unsigned
long
)
PROG_START
;
printf
(
"start address = 0x%x
\n
"
,
sa
);
printf
(
"start address = 0x%x
\n
"
,
sa
);
(
*
(
void
(
*
)()
)
sa
)(
a1
,
a2
,
prom
);
(
*
(
kernel_start_t
)
sa
)(
a1
,
a2
,
prom
);
printf
(
"returned?
\n
"
);
printf
(
"returned?
\n
"
);
...
...
arch/ppc/boot/pmac/start.c
View file @
fb58fa34
/*
/*
* BK Id:
SCCS/s.start.c 1.10 07/25/01 18:13:07 trini
* BK Id:
%F% %I% %G% %U% %#%
*/
*/
/*
/*
* Copyright (C) Paul Mackerras 1997.
* Copyright (C) Paul Mackerras 1997.
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
extern
int
strlen
(
const
char
*
s
);
extern
int
strlen
(
const
char
*
s
);
extern
void
boot
(
int
a1
,
int
a2
,
void
*
prom
);
extern
void
boot
(
int
a1
,
int
a2
,
void
*
prom
);
int
(
*
prom
)();
int
(
*
prom
)(
void
*
);
void
*
chosen_handle
;
void
*
chosen_handle
;
void
*
stdin
;
void
*
stdin
;
...
@@ -29,7 +29,7 @@ void printk(char *fmt, ...);
...
@@ -29,7 +29,7 @@ void printk(char *fmt, ...);
void
void
start
(
int
a1
,
int
a2
,
void
*
promptr
)
start
(
int
a1
,
int
a2
,
void
*
promptr
)
{
{
prom
=
(
int
(
*
)())
promptr
;
prom
=
(
int
(
*
)(
void
*
))
promptr
;
chosen_handle
=
finddevice
(
"/chosen"
);
chosen_handle
=
finddevice
(
"/chosen"
);
if
(
chosen_handle
==
(
void
*
)
-
1
)
if
(
chosen_handle
==
(
void
*
)
-
1
)
exit
();
exit
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment