git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
common
/
misc-common.c
diff --git
a/arch/ppc/boot/common/misc-common.c
b/arch/ppc/boot/common/misc-common.c
index
fadc771
..
7acd03b
100644
(file)
--- a/
arch/ppc/boot/common/misc-common.c
+++ b/
arch/ppc/boot/common/misc-common.c
@@
-17,7
+17,7
@@
#include <stdarg.h> /* for va_ bits */
#include <linux/config.h>
#include <linux/string.h>
#include <stdarg.h> /* for va_ bits */
#include <linux/config.h>
#include <linux/string.h>
-#include
"zlib.h"
+#include
<linux/zlib.h>
#include "nonstdio.h"
/* If we're on a PReP, assume we have a keyboard controller
#include "nonstdio.h"
/* If we're on a PReP, assume we have a keyboard controller
@@
-59,7
+59,8
@@
static int _cvt(unsigned long val, char *buf, long radix, char *digits);
void _vprintk(void(*putc)(const char), const char *fmt0, va_list ap);
unsigned char *ISA_io = NULL;
void _vprintk(void(*putc)(const char), const char *fmt0, va_list ap);
unsigned char *ISA_io = NULL;
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
+#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
+ || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
extern unsigned long com_port;
extern int serial_tstc(unsigned long com_port);
extern unsigned long com_port;
extern int serial_tstc(unsigned long com_port);
@@
-80,7
+81,8
@@
void exit(void)
int tstc(void)
{
int tstc(void)
{
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
+#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
+ || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
if(keyb_present)
return (CRT_tstc() || serial_tstc(com_port));
else
if(keyb_present)
return (CRT_tstc() || serial_tstc(com_port));
else
@@
-93,7
+95,8
@@
int tstc(void)
int getc(void)
{
while (1) {
int getc(void)
{
while (1) {
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
+#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
+ || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
if (serial_tstc(com_port))
return (serial_getc(com_port));
#endif /* serial console */
if (serial_tstc(com_port))
return (serial_getc(com_port));
#endif /* serial console */
@@
-108,7
+111,8
@@
putc(const char c)
{
int x,y;
{
int x,y;
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
+#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
+ || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
serial_putc(com_port, c);
if ( c == '\n' )
serial_putc(com_port, '\r');
serial_putc(com_port, c);
if ( c == '\n' )
serial_putc(com_port, '\r');
@@
-155,7
+159,8
@@
void puts(const char *s)
y = orig_y;
while ( ( c = *s++ ) != '\0' ) {
y = orig_y;
while ( ( c = *s++ ) != '\0' ) {
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
+#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
+ || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
serial_putc(com_port, c);
if ( c == '\n' ) serial_putc(com_port, '\r');
#endif /* serial console */
serial_putc(com_port, c);
if ( c == '\n' ) serial_putc(com_port, '\r');
#endif /* serial console */
@@
-197,11
+202,10
@@
void error(char *x)
while(1); /* Halt */
}
while(1); /* Halt */
}
-
void *zalloc(void *x, unsigned items,
unsigned size)
+
static void *zalloc(
unsigned size)
{
void *p = avail_ram;
{
void *p = avail_ram;
- size *= items;
size = (size + 7) & -8;
avail_ram += size;
if (avail_ram > end_avail) {
size = (size + 7) & -8;
avail_ram += size;
if (avail_ram > end_avail) {
@@
-211,18
+215,12
@@
void *zalloc(void *x, unsigned items, unsigned size)
return p;
}
return p;
}
-void zfree(void *x, void *addr, unsigned nb)
-{
-}
-
#define HEAD_CRC 2
#define EXTRA_FIELD 4
#define ORIG_NAME 8
#define COMMENT 0x10
#define RESERVED 0xe0
#define HEAD_CRC 2
#define EXTRA_FIELD 4
#define ORIG_NAME 8
#define COMMENT 0x10
#define RESERVED 0xe0
-#define DEFLATED 8
-
void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
{
z_stream s;
void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
{
z_stream s;
@@
-231,7
+229,7
@@
void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
/* skip header */
i = 10;
flags = src[3];
/* skip header */
i = 10;
flags = src[3];
- if (src[2] != DEFLATED || (flags & RESERVED) != 0) {
+ if (src[2] !=
Z_
DEFLATED || (flags & RESERVED) != 0) {
puts("bad gzipped data\n");
exit();
}
puts("bad gzipped data\n");
exit();
}
@@
-250,24
+248,24
@@
void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
exit();
}
exit();
}
- s.zalloc = zalloc;
- s.
zfree = zfree
;
- r = inflateInit2(&s, -MAX_WBITS);
+ /* Initialize ourself. */
+ s.
workspace = zalloc(zlib_inflate_workspacesize())
;
+ r =
zlib_
inflateInit2(&s, -MAX_WBITS);
if (r != Z_OK) {
if (r != Z_OK) {
- puts("inflateInit2 returned "); puthex(r); puts("\n");
+ puts("
zlib_
inflateInit2 returned "); puthex(r); puts("\n");
exit();
}
s.next_in = src + i;
s.avail_in = *lenp - i;
s.next_out = dst;
s.avail_out = dstlen;
exit();
}
s.next_in = src + i;
s.avail_in = *lenp - i;
s.next_out = dst;
s.avail_out = dstlen;
- r = inflate(&s, Z_FINISH);
+ r =
zlib_
inflate(&s, Z_FINISH);
if (r != Z_OK && r != Z_STREAM_END) {
puts("inflate returned "); puthex(r); puts("\n");
exit();
}
*lenp = s.next_out - (unsigned char *) dst;
if (r != Z_OK && r != Z_STREAM_END) {
puts("inflate returned "); puthex(r); puts("\n");
exit();
}
*lenp = s.next_out - (unsigned char *) dst;
- inflateEnd(&s);
+
zlib_
inflateEnd(&s);
}
void
}
void
@@
-521,6
+519,11
@@
_dump_buf(unsigned char *p, int s)
* on others it's an offset from a given location. -- Tom
*/
* on others it's an offset from a given location. -- Tom
*/
+void ISA_init(unsigned long base)
+{
+ ISA_io = (unsigned char *)base;
+}
+
void
outb(int port, unsigned char val)
{
void
outb(int port, unsigned char val)
{