mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove newlines from BX_PANIC and similar statements. it is implied.

Browse Source
This commit is contained in:
Bryce Denney 2001-08-14 06:48:03 +00:00
parent 71e8228866
commit c2df8d4f7d
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bochs/gui/amigaos.cc
View File

@ -121,16 +121,16 @@ setup_inputhandler(void)
DoIO((struct IORequest *)inputReqBlk); DoIO((struct IORequest *)inputReqBlk);
} }
else else
BX_PANIC(("Amiga: Could not open input.device\n")); BX_PANIC(("Amiga: Could not open input.device"));
} }
else else
BX_PANIC(("Amiga: Could not create I/O request\n")); BX_PANIC(("Amiga: Could not create I/O request"));
} }
else else
BX_PANIC(("Amiga: Could not allocate interrupt struct memory\n")); BX_PANIC(("Amiga: Could not allocate interrupt struct memory"));
} }
else else
printf(("Amiga: Could not create message port\n")); printf(("Amiga: Could not create message port"));
} }
Boolean Boolean
@ -170,7 +170,7 @@ open_screen(void)
FreeAslRequest(smr); FreeAslRequest(smr);
} }
else else
BX_PANIC(("Amiga: Can't start without a screen\n")); BX_PANIC(("Amiga: Can't start without a screen"));
h = GetCyberIDAttr(CYBRIDATTR_HEIGHT, id); h = GetCyberIDAttr(CYBRIDATTR_HEIGHT, id);
w = GetCyberIDAttr(CYBRIDATTR_WIDTH, id); w = GetCyberIDAttr(CYBRIDATTR_WIDTH, id);
@ -191,7 +191,7 @@ open_screen(void)
TAG_DONE); TAG_DONE);
if(!screen) if(!screen)
BX_PANIC(("Amiga: Couldn't open screen\n")); BX_PANIC(("Amiga: Couldn't open screen"));
window = OpenWindowTags(NULL, window = OpenWindowTags(NULL,
WA_CustomScreen,(int)screen, WA_CustomScreen,(int)screen,
@ -217,7 +217,7 @@ open_screen(void)
d = GetCyberIDAttr(CYBRIDATTR_DEPTH, id); d = GetCyberIDAttr(CYBRIDATTR_DEPTH, id);
} }
else else
BX_PANIC(("Amiga: Couldn't get ScreenDrawInfo\n")); BX_PANIC(("Amiga: Couldn't get ScreenDrawInfo"));
window = OpenWindowTags(NULL, window = OpenWindowTags(NULL,
WA_Width,w, WA_Width,w,
@ -233,14 +233,14 @@ open_screen(void)
UnlockPubScreen(NULL,pub_screen); UnlockPubScreen(NULL,pub_screen);
} }
else else
BX_PANIC(("Amiga: Couldn't lock the public screen\n")); BX_PANIC(("Amiga: Couldn't lock the public screen"));
} }
if (!window) if (!window)
bx_gui_c::exit(); bx_gui_c::exit();
if ((emptypointer = (UWORD *)AllocVec (16, MEMF_CLEAR)) == NULL) if ((emptypointer = (UWORD *)AllocVec (16, MEMF_CLEAR)) == NULL)
BX_PANIC(("Amiga: Couldn't allocate memory\n")); BX_PANIC(("Amiga: Couldn't allocate memory"));
vgafont = OpenDiskFont(&vgata); vgafont = OpenDiskFont(&vgata);
@ -248,7 +248,7 @@ open_screen(void)
hide_pointer(); hide_pointer();
if(!vgafont) if(!vgafont)
BX_PANIC(("Amiga: Couldn't open the vga font\n")); BX_PANIC(("Amiga: Couldn't open the vga font"));
SetFont(window->RPort, vgafont); SetFont(window->RPort, vgafont);
@ -284,28 +284,28 @@ bx_gui_c::specific_init(bx_gui_c *th, int argc, char **argv, unsigned tilewidth,
IntuitionBase = (struct IntuitionBase *)OpenLibrary("intuition.library", 39); IntuitionBase = (struct IntuitionBase *)OpenLibrary("intuition.library", 39);
if (IntuitionBase == NULL) if (IntuitionBase == NULL)
BX_PANIC(("Amiga: Failed to open intuition.library v39 or later!\n")); BX_PANIC(("Amiga: Failed to open intuition.library v39 or later!"));
GfxBase = (struct GfxBase *)OpenLibrary("graphics.library", 39); GfxBase = (struct GfxBase *)OpenLibrary("graphics.library", 39);
if (GfxBase == NULL) if (GfxBase == NULL)
BX_PANIC(("Amiga: Failed to open graphics.library v39 or later!\n")); BX_PANIC(("Amiga: Failed to open graphics.library v39 or later!"));
GadToolsBase = OpenLibrary("gadtools.library", 37); GadToolsBase = OpenLibrary("gadtools.library", 37);
if (GadToolsBase == NULL) if (GadToolsBase == NULL)
BX_PANIC(("Amiga: Failed to open gadtools.library v37 or later!\n")); BX_PANIC(("Amiga: Failed to open gadtools.library v37 or later!"));
CyberGfxBase = OpenLibrary("cybergraphics.library", 40); CyberGfxBase = OpenLibrary("cybergraphics.library", 40);
if (CyberGfxBase == NULL) if (CyberGfxBase == NULL)
BX_PANIC(("Amiga: Failed to open cybergraphics.library v40 or later!\n")); BX_PANIC(("Amiga: Failed to open cybergraphics.library v40 or later!"));
AslBase = OpenLibrary("asl.library", 38); AslBase = OpenLibrary("asl.library", 38);
if (AslBase == NULL) if (AslBase == NULL)
BX_PANIC(("Amiga: Failed to open asl.library v38 or later!\n")); BX_PANIC(("Amiga: Failed to open asl.library v38 or later!"));
DiskfontBase = OpenLibrary("diskfont.library", 38); DiskfontBase = OpenLibrary("diskfont.library", 38);
if (DiskfontBase == NULL) if (DiskfontBase == NULL)
BX_PANIC(("Amiga: Failed to open diskfont.library v38 or later!\n")); BX_PANIC(("Amiga: Failed to open diskfont.library v38 or later!"));
open_screen(); open_screen();
setup_inputhandler(); setup_inputhandler();
@ -498,7 +498,7 @@ bx_gui_c::create_bitmap(const unsigned char *bmap, unsigned xdim, unsigned ydim)
Bit8u *a; Bit8u *a;
if (bx_image_entries >= BX_MAX_PIXMAPS) { if (bx_image_entries >= BX_MAX_PIXMAPS) {
BX_PANIC(("amiga: too many pixmaps, increase BX_MAX_PIXMAPS\n")); BX_PANIC(("amiga: too many pixmaps, increase BX_MAX_PIXMAPS"));
} }
bx_header_image[bx_headerbar_entries].LeftEdge = 0; bx_header_image[bx_headerbar_entries].LeftEdge = 0;

2
bochs/iodev/cdrom_amigaos.cc
View File

@ -210,7 +210,7 @@ cdrom_interface::capacity()
return(cap.sectors); return(cap.sectors);
else else
BX_PANIC (("Couldn't get media capacity\n")); BX_PANIC (("Couldn't get media capacity"));
} }
void void

6
bochs/iodev/eth_linux.cc
View File

@ -140,9 +140,9 @@ bx_linux_pktmover_c::bx_linux_pktmover_c(const char *netif,
// //
if ((this->fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) == -1) { if ((this->fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) == -1) {
if (errno == EACCES) if (errno == EACCES)
BX_INFO(("eth_linux: must be root or have CAP_NET_RAW capability to open socket\n")); BX_INFO(("eth_linux: must be root or have CAP_NET_RAW capability to open socket"));
else else
BX_INFO(("eth_linux: could not open socket\n")); BX_INFO(("eth_linux: could not open socket"));
this->fd = -1; this->fd = -1;
return; return;
} }
@ -186,7 +186,7 @@ bx_linux_pktmover_c::bx_linux_pktmover_c(const char *netif,
// Set up non-blocking i/o // Set up non-blocking i/o
if (fcntl(this->fd, F_SETFL, O_NONBLOCK) == -1) { if (fcntl(this->fd, F_SETFL, O_NONBLOCK) == -1) {
BX_INFO(("eth_linux: could not set non-blocking i/o on socket\n")); BX_INFO(("eth_linux: could not set non-blocking i/o on socket"));
close(this->fd); close(this->fd);
this->fd = -1; this->fd = -1;
return; return;