Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/u_intN_t/uintN_t/

This commit is contained in:
uwe 2006-03-05 04:05:39 +00:00
parent de58f0245a
commit 24c8a90269
36 changed files with 163 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/hpc/stand/hpcboot/arch.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: arch.cpp,v 1.13 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: arch.cpp,v 1.14 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@ -127,7 +127,7 @@ Architecture::_load_func(const TCHAR * name)
void
Architecture::systemInfo(void)
{
u_int32_t val = 0;
uint32_t val = 0;
SYSTEM_INFO si;
DPRINTF((TEXT("_WIN32_WCE = %d\n"), _WIN32_WCE));

4
sys/arch/hpc/stand/hpcboot/arm/arm.asm
View File

@ -1,4 +1,4 @@
; $NetBSD: arm.asm,v 1.5 2005/12/11 12:17:28 christos Exp $
; $NetBSD: arm.asm,v 1.6 2006/03/05 04:05:39 uwe Exp $
;
; Copyright (c) 2001 The NetBSD Foundation, Inc.
; All rights reserved.
@ -317,7 +317,7 @@
;
; UART test
;
; boot_func (u_int32_t mapaddr, u_int32_t bootinfo, u_int32_t flags)
; boot_func (uint32_t mapaddr, uint32_t bootinfo, uint32_t flags)
;
EXPORT |boot_func|
|boot_func| PROC

22
sys/arch/hpc/stand/hpcboot/arm/arm_arch.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: arm_arch.h,v 1.3 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: arm_arch.h,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -63,14 +63,14 @@ public:
__BEGIN_DECLS
// Coprocessor 15
u_int32_t GetCop15Reg0(void);
u_int32_t GetCop15Reg1(void); void SetCop15Reg1(u_int32_t);
u_int32_t GetCop15Reg2(void); void SetCop15Reg2(u_int32_t);
u_int32_t GetCop15Reg3(void); void SetCop15Reg3(u_int32_t);
u_int32_t GetCop15Reg5(void);
u_int32_t GetCop15Reg6(void);
u_int32_t GetCop15Reg13(void); void SetCop15Reg13(u_int32_t);
u_int32_t GetCop15Reg14(void);
uint32_t GetCop15Reg0(void);
uint32_t GetCop15Reg1(void); void SetCop15Reg1(uint32_t);
uint32_t GetCop15Reg2(void); void SetCop15Reg2(uint32_t);
uint32_t GetCop15Reg3(void); void SetCop15Reg3(uint32_t);
uint32_t GetCop15Reg5(void);
uint32_t GetCop15Reg6(void);
uint32_t GetCop15Reg13(void); void SetCop15Reg13(uint32_t);
uint32_t GetCop15Reg14(void);
// Interrupt
void EI(void);
@ -88,8 +88,8 @@ void FlushITLB(void);
void FlushDTLB(void);
void FlushDTLBS(vaddr_t);
u_int32_t GetCPSR(void);
void SetCPSR(u_int32_t);
uint32_t GetCPSR(void);
void SetCPSR(uint32_t);
void SetSVCMode(void);
void SetSystemMode(void);

6
sys/arch/hpc/stand/hpcboot/arm/arm_console.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: arm_console.h,v 1.5 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: arm_console.h,v 1.6 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -61,7 +61,7 @@ private:
}
void __tx_busy(void) {
u_int8_t reg;
uint8_t reg;
do
reg = VOLATILE_REF8(_uart_busy);
while ((reg & 0x1) == 0x1 ||(reg & 0x4) == 0);
@ -70,7 +70,7 @@ private:
void __putc(const char s) {
__tx_busy(); // wait until previous transmit done.
VOLATILE_REF8(_uart_transmit) =
static_cast <u_int8_t>(0xff & s);
static_cast <uint8_t>(0xff & s);
}
public:

6
sys/arch/hpc/stand/hpcboot/arm/arm_mmu.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: arm_mmu.cpp,v 1.4 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: arm_mmu.cpp,v 1.5 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -54,7 +54,7 @@ MemoryManager_ArmMMU::~MemoryManager_ArmMMU(void)
BOOL
MemoryManager_ArmMMU::init(void)
{
u_int32_t reg;
uint32_t reg;
_kmode = SetKMode(1);
// Check system mode
@ -78,7 +78,7 @@ paddr_t
MemoryManager_ArmMMU::searchPage(vaddr_t vaddr)
{
paddr_t daddr, paddr = ~0;
u_int32_t desc1, desc2;
uint32_t desc1, desc2;
// set marker.
memset(LPVOID(vaddr), 0xa5, _page_size);

4
sys/arch/hpc/stand/hpcboot/console.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: console.h,v 1.11 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: console.h,v 1.12 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@ public:
BOOL &on(void) { return _on; }
static void changeConsole(Console &console) { _instance = &console; }
void setBootConsole(u_int16_t cnuse) { _boot_console = cnuse; }
void setBootConsole(uint16_t cnuse) { _boot_console = cnuse; }
int16_t getBootConsole(void) const { return _boot_console; }
};

12
sys/arch/hpc/stand/hpcboot/file.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: file.h,v 1.4 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: file.h,v 1.5 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 1996, 2001 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@ public:
BOOL &setDebug(void) { return _debug; }
virtual BOOL setRoot(TCHAR *) = 0;
virtual BOOL open(const TCHAR *, u_int32_t = OPEN_EXISTING) = 0;
virtual BOOL open(const TCHAR *, uint32_t = OPEN_EXISTING) = 0;
virtual size_t size(void) = 0;
virtual size_t realsize(void) { return size(); };
virtual BOOL close(void) = 0;
@ -83,13 +83,13 @@ private:
int _gz_magic[2];
int _z_err; /* error code for last stream operation */
int _z_eof; /* set if end of input file */
u_int8_t _inbuf[Z_BUFSIZE]; /* input buffer */
u_int32_t _crc; /* crc32 of uncompressed data */
uint8_t _inbuf[Z_BUFSIZE]; /* input buffer */
uint32_t _crc; /* crc32 of uncompressed data */
BOOL _compressed;
void _reset(void);
int _get_byte(void);
u_int32_t _get_long(void);
uint32_t _get_long(void);
void _check_header(void);
size_t _skip_compressed(off_t);
@ -103,7 +103,7 @@ public:
virtual ~FileManager(void);
BOOL setRoot(TCHAR *);
BOOL open(const TCHAR *, u_int32_t);
BOOL open(const TCHAR *, uint32_t);
size_t size(void);
size_t realsize(void);
BOOL close(void);

4
sys/arch/hpc/stand/hpcboot/file_fat.cpp
View File

@ -1,4 +1,4 @@
/* $NetBSD: file_fat.cpp,v 1.3 2002/02/04 17:31:05 uch Exp $ */
/* $NetBSD: file_fat.cpp,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@ FatFile::setRoot(TCHAR *drive)
}
BOOL
FatFile::open(const TCHAR *name, u_int32_t flags)
FatFile::open(const TCHAR *name, uint32_t flags)
{
// drive + filename
wsprintf(_filename, TEXT("%s%s"), _drive, name);

4
sys/arch/hpc/stand/hpcboot/file_fat.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: file_fat.h,v 1.3 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: file_fat.h,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@ public:
virtual ~FatFile(void);
BOOL setRoot(TCHAR *);
BOOL open(const TCHAR *, u_int32_t);
BOOL open(const TCHAR *, uint32_t);
size_t size(void) { return GetFileSize(_handle, 0); }
BOOL close(void) { return CloseHandle(_handle); }
size_t read(void *, size_t, off_t = -1);

10
sys/arch/hpc/stand/hpcboot/file_http.cpp
View File

@ -1,4 +1,4 @@
/* $NetBSD: file_http.cpp,v 1.10 2005/12/11 12:17:28 christos Exp $ */
/* $NetBSD: file_http.cpp,v 1.11 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@ -188,15 +188,15 @@ HttpFile::setRoot(TCHAR *server)
DPRINTF((TEXT("can't get host by name.\n")));
return FALSE;
}
u_int8_t *b = &_sockaddr.sin_addr.S_un.S_un_b.s_b1;
uint8_t *b = &_sockaddr.sin_addr.S_un.S_un_b.s_b1;
DPRINTF((TEXT("%d.%d.%d.%d "), b[0], b[1], b[2], b[3]));
if (connect(h,(const struct sockaddr *)&_sockaddr,
sizeof(struct sockaddr_in)) == 0)
goto connected;
} else {
for (u_int8_t **addr_list =(u_int8_t **)entry->h_addr_list;
for (uint8_t **addr_list =(uint8_t **)entry->h_addr_list;
*addr_list; addr_list++) {
u_int8_t *b = &_sockaddr.sin_addr.S_un.S_un_b.s_b1;
uint8_t *b = &_sockaddr.sin_addr.S_un.S_un_b.s_b1;
for (int i = 0; i < 4; i++)
b[i] = addr_list[0][i];
@ -217,7 +217,7 @@ HttpFile::setRoot(TCHAR *server)
}
BOOL
HttpFile::open(const TCHAR *name, u_int32_t flag)
HttpFile::open(const TCHAR *name, uint32_t flag)
{
_reset_state();

4
sys/arch/hpc/stand/hpcboot/file_http.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: file_http.h,v 1.4 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: file_http.h,v 1.5 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -101,7 +101,7 @@ public:
virtual ~HttpFile(void);
BOOL setRoot(TCHAR *);
BOOL open(const TCHAR *, u_int32_t);
BOOL open(const TCHAR *, uint32_t);
size_t size(void) { size_t hsz; return _parse_header(hsz); }
BOOL close(void) { return TRUE; }
size_t read(void *, size_t, off_t = -1);

20
sys/arch/hpc/stand/hpcboot/file_manager.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: file_manager.cpp,v 1.6 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: file_manager.cpp,v 1.7 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright(c) 1996, 2001, 2004 The NetBSD Foundation, Inc.
@ -70,7 +70,7 @@ FileManager::setRoot(TCHAR *drive)
}
BOOL
FileManager::open(const TCHAR *name, u_int32_t flags)
FileManager::open(const TCHAR *name, uint32_t flags)
{
if (!_file->open(name, flags))
return FALSE;
@ -102,7 +102,7 @@ size_t
FileManager::_read(void *buf, size_t len)
{
// starting point for crc computation
u_int8_t *start = reinterpret_cast<u_int8_t *>(buf);
uint8_t *start = reinterpret_cast<uint8_t *>(buf);
if (_z_err == Z_DATA_ERROR || _z_err == Z_ERRNO) {
return -1;
@ -110,14 +110,14 @@ FileManager::_read(void *buf, size_t len)
if (_z_err == Z_STREAM_END) {
return 0; // EOF
}
_stream->next_out = reinterpret_cast<u_int8_t *>(buf);
_stream->next_out = reinterpret_cast<uint8_t *>(buf);
_stream->avail_out = len;
int got;
while (_stream->avail_out != 0) {
if (!_compressed) {
// Copy first the lookahead bytes
u_int32_t n = _stream->avail_in;
uint32_t n = _stream->avail_in;
if (n > _stream->avail_out)
n = _stream->avail_out;
if (n > 0) {
@ -295,18 +295,18 @@ FileManager::_get_byte()
return *(_stream->next_in)++;
}
u_int32_t
uint32_t
FileManager::_get_long()
{
u_int32_t x = static_cast<u_int32_t>(_get_byte());
uint32_t x = static_cast<uint32_t>(_get_byte());
int c;
x +=(static_cast<u_int32_t>(_get_byte())) << 8;
x +=(static_cast<u_int32_t>(_get_byte())) << 16;
x +=(static_cast<uint32_t>(_get_byte())) << 8;
x +=(static_cast<uint32_t>(_get_byte())) << 16;
c = _get_byte();
if (c == EOF)
_z_err = Z_DATA_ERROR;
x +=(static_cast<u_int32_t>(c)) << 24;
x +=(static_cast<uint32_t>(c)) << 24;
return x;
}

4
sys/arch/hpc/stand/hpcboot/file_ufs.cpp
View File

@ -1,4 +1,4 @@
/* $NetBSD: file_ufs.cpp,v 1.2 2002/02/04 17:32:02 uch Exp $ */
/* $NetBSD: file_ufs.cpp,v 1.3 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@ UfsFile::setRoot(TCHAR *drive)
}
BOOL
UfsFile::open(const TCHAR *name, u_int32_t flags)
UfsFile::open(const TCHAR *name, uint32_t flags)
{
int error;

4
sys/arch/hpc/stand/hpcboot/file_ufs.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: file_ufs.h,v 1.3 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: file_ufs.h,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -53,7 +53,7 @@ public:
virtual ~UfsFile(void);
BOOL setRoot(TCHAR *);
BOOL open(const TCHAR *, u_int32_t);
BOOL open(const TCHAR *, uint32_t);
size_t size(void);
BOOL close(void);
size_t read(void *, size_t, off_t = -1);

4
sys/arch/hpc/stand/hpcboot/framebuffer.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: framebuffer.cpp,v 1.10 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: framebuffer.cpp,v 1.11 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -47,7 +47,7 @@
// framebuffer configuration table can be found in machine_config.cpp
//
FrameBufferInfo::FrameBufferInfo(u_int32_t cpu, u_int32_t machine)
FrameBufferInfo::FrameBufferInfo(uint32_t cpu, uint32_t machine)
{
struct framebuffer_info *tab = _table;
platid_mask_t target, entry;

8
sys/arch/hpc/stand/hpcboot/framebuffer.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: framebuffer.h,v 1.1 2001/02/09 18:34:40 uch Exp $ */
/* -*-C++-*- $NetBSD: framebuffer.h,v 1.2 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -39,9 +39,9 @@
class FrameBufferInfo {
public:
struct framebuffer_info {
u_int32_t cpu, machine;
uint32_t cpu, machine;
int bpp, width, height, linebytes;
u_int32_t addr;
uint32_t addr;
};
private:
@ -51,7 +51,7 @@ private:
public:
static struct framebuffer_info _table[];
FrameBufferInfo(u_int32_t, u_int32_t);
FrameBufferInfo(uint32_t, uint32_t);
virtual ~FrameBufferInfo(void);
void *addr(void) { return reinterpret_cast <void *>(_fb->addr); }

8
sys/arch/hpc/stand/hpcboot/hpcboot.cpp
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpcboot.cpp,v 1.18 2005/12/11 12:17:28 christos Exp $ */
/* $NetBSD: hpcboot.cpp,v 1.19 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@ -302,9 +302,9 @@ HpcBootApp::registerClass(WNDPROC proc)
// Debug support.
//
void
_bitdisp(u_int32_t a, int s, int e, int m, int c)
_bitdisp(uint32_t a, int s, int e, int m, int c)
{
u_int32_t j, j1;
uint32_t j, j1;
int i, n;
DPRINTF_SETUP();
@ -337,7 +337,7 @@ _bitdisp(u_int32_t a, int s, int e, int m, int c)
}
void
_dbg_bit_print(u_int32_t reg, u_int32_t mask, const char *name)
_dbg_bit_print(uint32_t reg, uint32_t mask, const char *name)
{
static const char onoff[3] = "_x";

32
sys/arch/hpc/stand/hpcboot/hpcboot.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpcboot.h,v 1.8 2005/12/11 12:17:28 christos Exp $ */
/* $NetBSD: hpcboot.h,v 1.9 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@ -109,10 +109,10 @@ struct BootSetupArgs {
};
struct PageTag {
u_int32_t next; /* next tagged page kernel virtual address; */
u_int32_t src; /* kernel virtual or physical address */
u_int32_t dst; /* kernel virtual or physical address */
u_int32_t sz; /* copy size or zero-clear size; */
uint32_t next; /* next tagged page kernel virtual address; */
uint32_t src; /* kernel virtual or physical address */
uint32_t dst; /* kernel virtual or physical address */
uint32_t sz; /* copy size or zero-clear size; */
};
struct BootArgs {
@ -123,15 +123,15 @@ struct BootArgs {
struct bootinfo bi;
};
#define VOLATILE_REF(x) (*(volatile u_int32_t *)(x))
#define VOLATILE_REF16(x) (*(volatile u_int16_t *)(x))
#define VOLATILE_REF8(x) (*(volatile u_int8_t *)(x))
#define _reg_read_1(a) (*(volatile u_int8_t *)(a))
#define _reg_read_2(a) (*(volatile u_int16_t *)(a))
#define _reg_read_4(a) (*(volatile u_int32_t *)(a))
#define _reg_write_1(a, v) (*(volatile u_int8_t *)(a) = (v))
#define _reg_write_2(a, v) (*(volatile u_int16_t *)(a) = (v))
#define _reg_write_4(a, v) (*(volatile u_int32_t *)(a) = (v))
#define VOLATILE_REF(x) (*(volatile uint32_t *)(x))
#define VOLATILE_REF16(x) (*(volatile uint16_t *)(x))
#define VOLATILE_REF8(x) (*(volatile uint8_t *)(x))
#define _reg_read_1(a) (*(volatile uint8_t *)(a))
#define _reg_read_2(a) (*(volatile uint16_t *)(a))
#define _reg_read_4(a) (*(volatile uint32_t *)(a))
#define _reg_write_1(a, v) (*(volatile uint8_t *)(a) = (v))
#define _reg_write_2(a, v) (*(volatile uint16_t *)(a) = (v))
#define _reg_write_4(a, v) (*(volatile uint32_t *)(a) = (v))
#ifdef ARM
#define ptokv(x) (x) /* UNCACHED FLAT */
@ -157,8 +157,8 @@ void CacheSync(int);
#define GETVFRAMELEN 6145
/* debug utility */
void _bitdisp(u_int32_t, int, int, int, int);
void _dbg_bit_print(u_int32_t, u_int32_t, const char *);
void _bitdisp(uint32_t, int, int, int, int);
void _dbg_bit_print(uint32_t, uint32_t, const char *);
#define bitdisp(a) _bitdisp((a), 0, 0, 0, 1)
__END_DECLS

6
sys/arch/hpc/stand/hpcboot/hpcmenu.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: hpcmenu.cpp,v 1.16 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: hpcmenu.cpp,v 1.17 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@ -365,8 +365,8 @@ void
HpcMenuInterface::boot()
{
struct support_status *tab = _unsupported;
u_int32_t cpu = _pref.platid_hi;
u_int32_t machine = _pref.platid_lo;
uint32_t cpu = _pref.platid_hi;
uint32_t machine = _pref.platid_lo;
if (_pref.safety_message)
for (; tab->cpu; tab++) {

4
sys/arch/hpc/stand/hpcboot/hpcmenu.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: hpcmenu.h,v 1.12 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: hpcmenu.h,v 1.13 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@ -122,7 +122,7 @@ public:
TCHAR boot_extra[MAX_BOOT_STR];
};
struct support_status {
u_int32_t cpu, machine;
uint32_t cpu, machine;
const TCHAR *cause;
};
static struct support_status _unsupported[];

8
sys/arch/hpc/stand/hpcboot/memory.cpp
View File

@ -1,4 +1,4 @@
/* $NetBSD: memory.cpp,v 1.8 2006/02/20 03:07:33 uwe Exp $ */
/* $NetBSD: memory.cpp,v 1.9 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -210,7 +210,7 @@ MemoryManager::getTaggedPage(vaddr_t &v, paddr_t &p,
}
vaddr_t
MemoryManager::mapPhysicalPage(paddr_t paddr, psize_t size, u_int32_t flags)
MemoryManager::mapPhysicalPage(paddr_t paddr, psize_t size, uint32_t flags)
{
paddr_t pstart = truncPage(paddr);
paddr_t pend = roundPage(paddr + size);
@ -239,11 +239,11 @@ MemoryManager::unmapPhysicalPage(vaddr_t vaddr)
DPRINTF((TEXT("can't release memory\n")));
}
u_int32_t
uint32_t
MemoryManager::readPhysical4(paddr_t paddr)
{
vaddr_t v = mapPhysicalPage(paddr, 4, PAGE_READONLY);
u_int32_t val = *(u_int32_t *)v;
uint32_t val = *(uint32_t *)v;
unmapPhysicalPage(v);
return val;
}

26
sys/arch/hpc/stand/hpcboot/memory.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: memory.h,v 1.6 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: memory.h,v 1.7 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -103,17 +103,17 @@ public:
vsize_t tsz = getTaggedPageSize();
return ((sz + tsz - 1) / tsz) * _page_size;
}
u_int32_t roundPage(u_int32_t v) { return ROUND(v, _page_size); }
u_int32_t truncPage(u_int32_t v) { return TRUNC(v, _page_size); }
u_int32_t roundRegion(u_int32_t v)
{ return ROUND(v, u_int32_t(WCE_REGION_SIZE)); }
u_int32_t truncRegion(u_int32_t v)
{ return TRUNC(v, u_int32_t(WCE_REGION_SIZE)); }
uint32_t roundPage(uint32_t v) { return ROUND(v, _page_size); }
uint32_t truncPage(uint32_t v) { return TRUNC(v, _page_size); }
uint32_t roundRegion(uint32_t v)
{ return ROUND(v, uint32_t(WCE_REGION_SIZE)); }
uint32_t truncRegion(uint32_t v)
{ return TRUNC(v, uint32_t(WCE_REGION_SIZE)); }
// Physical address ops.
vaddr_t mapPhysicalPage(paddr_t paddr, psize_t size, u_int32_t flags);
vaddr_t mapPhysicalPage(paddr_t paddr, psize_t size, uint32_t flags);
void unmapPhysicalPage(vaddr_t vaddr);
u_int32_t readPhysical4(paddr_t paddr);
uint32_t readPhysical4(paddr_t paddr);
// return physical address of coresspoing virtual address.
virtual paddr_t searchPage(vaddr_t vaddr) = 0;
@ -159,14 +159,14 @@ private:
paddr_t _search_guess;
// Memory marker
u_int32_t _magic0, _magic1;
volatile u_int32_t *_magic_addr;
uint32_t _magic0, _magic1;
volatile uint32_t *_magic_addr;
enum {
MAGIC_CHECK_DONE = 0xac1dcafe,
MAGIC_CHECK_DUMMY = 0xa5a5a5a5
};
void setMagic(vaddr_t v) {
_magic_addr =(u_int32_t *)v;
_magic_addr =(uint32_t *)v;
while ((_magic0 = Random()) == MAGIC_CHECK_DONE)
;
while ((_magic1 = Random()) == MAGIC_CHECK_DONE)
@ -175,7 +175,7 @@ private:
_magic_addr[1] = _magic1;
}
BOOL checkMagic(vaddr_t v) {
volatile u_int32_t *marker =(u_int32_t *)v;
volatile uint32_t *marker =(uint32_t *)v;
return (marker[0] == _magic0) && (marker[1] == _magic1);
}
void clearMagic(void) {

6
sys/arch/hpc/stand/hpcboot/mips/mips_arch.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: mips_arch.cpp,v 1.5 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: mips_arch.cpp,v 1.6 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@ MIPSArchitecture::~MIPSArchitecture(void)
void
MIPSArchitecture::systemInfo()
{
u_int32_t r0, r1;
uint32_t r0, r1;
Architecture::systemInfo();
r0 = r1 = 0;
@ -96,7 +96,7 @@ MIPSArchitecture::setupLoader()
#ifdef DEBUG_KERNADDR_ACCESS // kernel address access test
#define TEST_MAGIC 0xac1dcafe
paddr_t p;
u_int32_t r0;
uint32_t r0;
_kmode = SetKMode(1);
_mem->getPage(v, p);

4
sys/arch/hpc/stand/hpcboot/sh3/cpu/7707.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: 7707.h,v 1.4 2005/12/11 12:17:28 christos Exp $ */
/* $NetBSD: 7707.h,v 1.5 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@
#define SH7707_CACHE_FLUSH() \
__BEGIN_MACRO \
u_int32_t __e, __w, __wa, __a; \
uint32_t __e, __w, __wa, __a; \
\
for (__w = 0; __w < SH7707_CACHE_WAY; __w++) { \
__wa = SH3_CCA | __w << SH7707_CACHE_WAY_SHIFT; \

4
sys/arch/hpc/stand/hpcboot/sh3/cpu/7709.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: 7709.h,v 1.3 2005/12/11 12:17:28 christos Exp $ */
/* $NetBSD: 7709.h,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@
#define SH7709_CACHE_FLUSH() \
__BEGIN_MACRO \
u_int32_t __e, __w, __wa, __a; \
uint32_t __e, __w, __wa, __a; \
\
for (__w = 0; __w < SH7709_CACHE_WAY; __w++) { \
__wa = SH3_CCA | __w << SH7709_CACHE_WAY_SHIFT; \

4
sys/arch/hpc/stand/hpcboot/sh3/cpu/7709a.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: 7709a.h,v 1.3 2005/12/11 12:17:28 christos Exp $ */
/* $NetBSD: 7709a.h,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@
#define SH7709A_CACHE_FLUSH() \
__BEGIN_MACRO \
u_int32_t __e, __w, __wa, __a; \
uint32_t __e, __w, __wa, __a; \
\
for (__w = 0; __w < SH7709A_CACHE_WAY; __w++) { \
__wa = SH3_CCA | __w << SH7709A_CACHE_WAY_SHIFT; \

4
sys/arch/hpc/stand/hpcboot/sh3/cpu/7750.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: 7750.h,v 1.3 2005/12/11 12:17:28 christos Exp $ */
/* $NetBSD: 7750.h,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
#define SH7750_CACHE_FLUSH() \
__BEGIN_MACRO \
u_int32_t __e, __a; \
uint32_t __e, __a; \
\
/* D-cache */ \
for (__e = 0; __e < (SH4_DCACHE_SIZE / SH4_CACHE_LINESZ); __e++) {\

4
sys/arch/hpc/stand/hpcboot/sh3/dev/sh.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: sh.h,v 1.3 2005/12/11 12:17:29 christos Exp $ */
/* -*-C++-*- $NetBSD: sh.h,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -367,7 +367,7 @@ __END_MACRO
#define SH3_SCIF_PRINT_HEX(h) \
__BEGIN_MACRO \
u_int32_t __h =(u_int32_t)(h); \
uint32_t __h =(uint32_t)(h); \
int __i; \
SH3_SCIF_PUTC('0'); SH3_SCIF_PUTC('x'); \
for (__i = 0; __i < 8; __i++, __h <<= 4) { \

22
sys/arch/hpc/stand/hpcboot/sh3/dev/sh3_dev.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: sh3_dev.cpp,v 1.4 2005/12/11 12:17:29 christos Exp $ */
/* -*-C++-*- $NetBSD: sh3_dev.cpp,v 1.5 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@ struct SH3dev::intr_priority SH3dev::_ipr_table[] = {
};
void
SH3dev::dump(u_int8_t bit)
SH3dev::dump(uint8_t bit)
{
int kmode;
@ -134,7 +134,7 @@ SH3dev::icu_control()
"low level",
"reserved",
};
u_int16_t r;
uint16_t r;
// PINT0-15
DPRINTF((TEXT("PINT enable(on |) :")));
@ -236,7 +236,7 @@ SH3dev::pfc_dump()
void
SH3dev::tmu_dump()
{
u_int8_t r8;
uint8_t r8;
DPRINTF((TEXT("<<<TMU>>>\n")));
/* Common */
@ -266,8 +266,8 @@ void
SH3dev::tmu_channel_dump(int unit, paddr_t tcor, paddr_t tcnt,
paddr_t tcr)
{
u_int32_t r32;
u_int16_t r16;
uint32_t r32;
uint16_t r16;
DPRINTF((TEXT("TMU#%d:"), unit));
#define DBG_BIT_PRINT(r, m) _dbg_bit_print(r, SH3_TCR_##m, #m)
@ -303,8 +303,8 @@ SH3dev::tmu_channel_dump(int unit, paddr_t tcor, paddr_t tcnt,
void
SH3dev::hd64461_dump(platid_t &platform)
{
u_int16_t r16;
u_int8_t r8;
uint16_t r16;
uint8_t r8;
#define MATCH(p) \
platid_match(&platform, &platid_mask_MACH_##p)
@ -319,7 +319,7 @@ SH3dev::hd64461_dump(platid_t &platform)
#if 0
DPRINTF((TEXT("frame buffer test start\n")));
u_int8_t *fb = reinterpret_cast<u_int8_t *>(HD64461_FBBASE);
uint8_t *fb = reinterpret_cast<uint8_t *>(HD64461_FBBASE);
for (int i = 0; i < 320 * 240 * 2 / 8; i++)
*fb++ = 0xff;
@ -613,8 +613,8 @@ SH3dev::hd64461_dump(platid_t &platform)
}
#ifdef SH7709TEST
u_int32_t sh7707_fb_dma_addr;
u_int16_t val;
uint32_t sh7707_fb_dma_addr;
uint16_t val;
int s;
s = suspendIntr();

12
sys/arch/hpc/stand/hpcboot/sh3/dev/sh4_dev.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: sh4_dev.cpp,v 1.3 2005/12/11 12:17:29 christos Exp $ */
/* -*-C++-*- $NetBSD: sh4_dev.cpp,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@ struct SH4dev::intr_priority SH4dev::_ipr_table[] = {
};
void
SH4dev::dump(u_int8_t bit)
SH4dev::dump(uint8_t bit)
{
int kmode;
@ -105,7 +105,7 @@ SH4dev::icu_dump()
#define ON(x, c) ((x) & (c) ? check[1] : check[0])
#define _(n) DPRINTF((TEXT("%S %S "), #n, ON(r, SH4_ICR_ ## n)))
static const char *check[] = { "[_]", "[x]" };
u_int16_t r;
uint16_t r;
super::icu_dump_priority(_ipr_table);
@ -165,15 +165,15 @@ SH4dev::hd64465_dump()
void
SH4dev::mq100_dump()
{
u_int32_t a, e;
uint32_t a, e;
int i;
// This is HPW650PA test. 640 * 480 linebytes 1280.
DPRINTF((TEXT("<<<MQ100/HD64464>>>\n")));
a = MQ100_FB_BASE + 0x4b000;
e = a + 640 * 480 * sizeof(u_int16_t);
e = a + 640 * 480 * sizeof(uint16_t);
while (a < e) {
for (i = 0; i < 640; i++, a += sizeof(u_int16_t))
for (i = 0; i < 640; i++, a += sizeof(uint16_t))
_reg_write_2(a, ~_reg_read_2(a) & 0xffff);
}
}

10
sys/arch/hpc/stand/hpcboot/sh3/dev/sh_dev.cpp
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: sh_dev.cpp,v 1.3 2005/12/11 12:17:29 christos Exp $ */
/* -*-C++-*- $NetBSD: sh_dev.cpp,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -53,9 +53,9 @@ SHdev::SHdev()
}
void
SHdev::dump(u_int8_t bit)
SHdev::dump(uint8_t bit)
{
u_int32_t reg = 0;
uint32_t reg = 0;
int kmode;
DPRINTF((TEXT("DEBUG BIT: ")));
@ -101,8 +101,8 @@ SHdev::print_stack_pointer(void)
void
SHdev::scif_dump(int bps)
{
u_int16_t r16;
u_int32_t r;
uint16_t r16;
uint32_t r;
int n;
print_stack_pointer();

18
sys/arch/hpc/stand/hpcboot/sh3/dev/sh_dev.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: sh_dev.h,v 1.3 2005/12/11 12:17:29 christos Exp $ */
/* -*-C++-*- $NetBSD: sh_dev.h,v 1.4 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -52,14 +52,14 @@ protected:
};
SHdev(void);
virtual u_int32_t _scif_reg_read(vaddr_t) = 0;
virtual uint32_t _scif_reg_read(vaddr_t) = 0;
void scif_dump(int);
void icu_dump_priority(struct intr_priority *);
public:
virtual ~SHdev(void) { /* NO-OP */ }
virtual void dump(u_int8_t);
virtual void dump(uint8_t);
#define DUMP_CPU 0x01
#define DUMP_DEV 0x02
#define DUMP_COMPANION 0x04
@ -80,15 +80,15 @@ private:
void icu_control(void);
static struct intr_priority _ipr_table[];
virtual u_int32_t _scif_reg_read(vaddr_t va) {
return (u_int32_t)_reg_read_1(va);
virtual uint32_t _scif_reg_read(vaddr_t va) {
return (uint32_t)_reg_read_1(va);
}
public:
SH3dev(void) { /* NO-OP */ }
virtual ~SH3dev(void) { /* NO-OP */ }
virtual void dump(u_int8_t);
virtual void dump(uint8_t);
};
class SH4dev : public SHdev {
@ -97,15 +97,15 @@ private:
static struct intr_priority _ipr_table[];
virtual u_int32_t _scif_reg_read(vaddr_t va) {
return (u_int32_t)_reg_read_2(va);
virtual uint32_t _scif_reg_read(vaddr_t va) {
return (uint32_t)_reg_read_2(va);
}
public:
SH4dev(void) { /* NO-OP */ }
virtual ~SH4dev(void) { /* NO-OP */ }
virtual void dump(u_int8_t);
virtual void dump(uint8_t);
void icu_dump(void);
void hd64465_dump(void);
void mq100_dump(void);

8
sys/arch/hpc/stand/hpcboot/sh3/sh_arch.cpp
View File

@ -1,4 +1,4 @@
/* $NetBSD: sh_arch.cpp,v 1.13 2006/02/25 02:28:56 wiz Exp $ */
/* $NetBSD: sh_arch.cpp,v 1.14 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@ -146,10 +146,10 @@ SHArchitecture::jump(paddr_t info, paddr_t pvec)
}
// disable external interrupt and save its priority.
u_int32_t
uint32_t
suspendIntr()
{
u_int32_t sr;
uint32_t sr;
__asm(
"stc sr, r0\n"
@ -161,7 +161,7 @@ suspendIntr()
// resume external interrupt priority.
void
resumeIntr(u_int32_t s)
resumeIntr(uint32_t s)
{
__asm(

14
sys/arch/hpc/stand/hpcboot/sh3/sh_arch.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: sh_arch.h,v 1.9 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: sh_arch.h,v 1.10 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@ -161,7 +161,7 @@ public:
// 2nd boot loader access cache address array. run on P2.
//
if (super::setupLoader()) {
(u_int32_t)_loader_addr |= 0x20000000;
(uint32_t)_loader_addr |= 0x20000000;
DPRINTF
((TEXT("loader address moved to P2-area 0x%08x\n"),
(unsigned)_loader_addr));
@ -191,9 +191,9 @@ SH##x##::boot_func(struct BootArgs *bi, struct PageTag *p) \
\
SH ## x ## _MMU_DISABLE(); \
do { \
u_int32_t *dst =(u_int32_t *)p->dst; \
u_int32_t *src =(u_int32_t *)p->src; \
u_int32_t sz = p->sz / sizeof (int); \
uint32_t *dst =(uint32_t *)p->dst; \
uint32_t *src =(uint32_t *)p->src; \
uint32_t sz = p->sz / sizeof (int); \
if (p->src == ~0) \
while (sz--) \
*dst++ = 0; \
@ -214,8 +214,8 @@ SH##x##::boot_func(struct BootArgs *bi, struct PageTag *p) \
// (don't block) use under privilege mode.
//
__BEGIN_DECLS
u_int32_t suspendIntr(void);
void resumeIntr(u_int32_t);
uint32_t suspendIntr(void);
void resumeIntr(uint32_t);
__END_DECLS
#endif // _HPCBOOT_SH_ARCH_H_

4
sys/arch/hpc/stand/hpcboot/sh3/sh_console.h
View File

@ -1,4 +1,4 @@
/* -*-C++-*- $NetBSD: sh_console.h,v 1.10 2005/12/11 12:17:28 christos Exp $ */
/* -*-C++-*- $NetBSD: sh_console.h,v 1.11 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -51,7 +51,7 @@ private:
public:
enum consoleSelect { VIDEO, SERIAL };
struct console_info {
u_int32_t cpu, machine;
uint32_t cpu, machine;
print_func_t print;
int16_t serial_console;
int16_t video_console;

8
sys/arch/hpc/stand/hpcboot/sh3/sh_mmu.cpp
View File

@ -1,4 +1,4 @@
/* $NetBSD: sh_mmu.cpp,v 1.5 2005/12/11 12:17:28 christos Exp $ */
/* $NetBSD: sh_mmu.cpp,v 1.6 2006/03/05 04:05:39 uwe Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -50,7 +50,7 @@
paddr_t
MemoryManager_SHMMU::searchPage(vaddr_t vaddr)
{
u_int32_t vpn, idx, s, dum, aae, dae, entry_idx, asid;
uint32_t vpn, idx, s, dum, aae, dae, entry_idx, asid;
paddr_t paddr = ~0;
int way, kmode;
@ -100,7 +100,7 @@ MemoryManager_SHMMU::CacheDump()
static const char *able[] = {"dis", "en" };
int write_through_p0_u0_p3;
int write_through_p1;
u_int32_t r;
uint32_t r;
int kmode;
DPRINTF_SETUP();
@ -152,7 +152,7 @@ void
MemoryManager_SHMMU::MMUDump()
{
#define ON(x, c) ((x) & (c) ? '|' : '.')
u_int32_t r, e, a;
uint32_t r, e, a;
int i, kmode;
DPRINTF_SETUP();