jcs.org / pce
fork of PCE focusing on macplus, supporting DaynaPort SCSI network emulation
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

ibmpc: Clean up dependencies

Hampa Hug dd3beb13 5efaae16

+248 -396
+6 -280
Makefile.dep
··· 4 4 5 5 src/arch/ibmpc/cassette.o: src/arch/ibmpc/cassette.c \ 6 6 src/arch/ibmpc/cassette.h \ 7 - src/arch/ibmpc/ems.h \ 8 - src/arch/ibmpc/hook.h \ 9 - src/arch/ibmpc/ibmpc.h \ 10 - src/arch/ibmpc/int13.h \ 11 - src/arch/ibmpc/keyboard.h \ 12 7 src/arch/ibmpc/main.h \ 13 - src/arch/ibmpc/mouse.h \ 14 - src/arch/ibmpc/msg.h \ 15 - src/arch/ibmpc/speaker.h \ 16 - src/arch/ibmpc/util.h \ 17 - src/arch/ibmpc/xms.h \ 18 - src/chipset/82xx/e8237.h \ 19 - src/chipset/82xx/e8250.h \ 20 - src/chipset/82xx/e8253.h \ 21 - src/chipset/82xx/e8255.h \ 22 - src/chipset/82xx/e8259.h \ 23 - src/chipset/82xx/e8272.h \ 24 8 src/config.h \ 25 - src/cpu/e8086/e8086.h \ 26 - src/devices/block/block.h \ 27 - src/devices/device.h \ 28 - src/devices/fdc.h \ 29 - src/devices/memory.h \ 30 - src/devices/nvram.h \ 31 - src/devices/parport.h \ 32 - src/devices/serport.h \ 33 - src/devices/video/video.h \ 34 - src/drivers/char/char.h \ 35 - src/drivers/sound/sound.h \ 36 - src/lib/brkpt.h \ 37 - src/lib/cmd.h \ 38 - src/lib/console.h \ 39 - src/lib/log.h \ 40 - src/lib/monitor.h \ 41 - src/lib/msg.h \ 42 - src/lib/sysdep.h \ 43 - src/libini/libini.h \ 44 - src/terminal/keys.h \ 45 - src/terminal/terminal.h 9 + src/lib/console.h 46 10 47 11 src/arch/ibmpc/cmd.o: src/arch/ibmpc/cmd.c \ 48 12 src/arch/ibmpc/cassette.h \ 49 13 src/arch/ibmpc/ems.h \ 50 - src/arch/ibmpc/hook.h \ 51 14 src/arch/ibmpc/ibmpc.h \ 52 - src/arch/ibmpc/int13.h \ 53 15 src/arch/ibmpc/keyboard.h \ 54 16 src/arch/ibmpc/main.h \ 55 17 src/arch/ibmpc/mouse.h \ 56 - src/arch/ibmpc/msg.h \ 57 18 src/arch/ibmpc/speaker.h \ 58 - src/arch/ibmpc/util.h \ 59 19 src/arch/ibmpc/xms.h \ 60 20 src/chipset/82xx/e8237.h \ 61 21 src/chipset/82xx/e8250.h \ ··· 79 39 src/lib/cmd.h \ 80 40 src/lib/console.h \ 81 41 src/lib/log.h \ 82 - src/lib/monitor.h \ 83 - src/lib/msg.h \ 84 42 src/lib/sysdep.h \ 85 43 src/libini/libini.h \ 86 44 src/terminal/keys.h \ 87 45 src/terminal/terminal.h 88 46 89 47 src/arch/ibmpc/ems.o: src/arch/ibmpc/ems.c \ 90 - src/arch/ibmpc/cassette.h \ 91 48 src/arch/ibmpc/ems.h \ 92 - src/arch/ibmpc/hook.h \ 93 - src/arch/ibmpc/ibmpc.h \ 94 - src/arch/ibmpc/int13.h \ 95 - src/arch/ibmpc/keyboard.h \ 96 49 src/arch/ibmpc/main.h \ 97 - src/arch/ibmpc/mouse.h \ 98 - src/arch/ibmpc/msg.h \ 99 - src/arch/ibmpc/speaker.h \ 100 - src/arch/ibmpc/util.h \ 101 - src/arch/ibmpc/xms.h \ 102 - src/chipset/82xx/e8237.h \ 103 - src/chipset/82xx/e8250.h \ 104 - src/chipset/82xx/e8253.h \ 105 - src/chipset/82xx/e8255.h \ 106 - src/chipset/82xx/e8259.h \ 107 - src/chipset/82xx/e8272.h \ 108 50 src/config.h \ 109 51 src/cpu/e8086/e8086.h \ 110 - src/devices/block/block.h \ 111 - src/devices/device.h \ 112 - src/devices/fdc.h \ 113 52 src/devices/memory.h \ 114 - src/devices/nvram.h \ 115 - src/devices/parport.h \ 116 - src/devices/serport.h \ 117 - src/devices/video/video.h \ 118 - src/drivers/char/char.h \ 119 - src/drivers/sound/sound.h \ 120 - src/lib/brkpt.h \ 121 - src/lib/cmd.h \ 122 53 src/lib/console.h \ 123 54 src/lib/log.h \ 124 - src/lib/monitor.h \ 125 - src/lib/msg.h \ 126 - src/lib/sysdep.h \ 127 - src/libini/libini.h \ 128 - src/terminal/keys.h \ 129 - src/terminal/terminal.h 55 + src/libini/libini.h 130 56 131 57 src/arch/ibmpc/hook.o: src/arch/ibmpc/hook.c \ 132 58 src/arch/ibmpc/cassette.h \ ··· 139 65 src/arch/ibmpc/mouse.h \ 140 66 src/arch/ibmpc/msg.h \ 141 67 src/arch/ibmpc/speaker.h \ 142 - src/arch/ibmpc/util.h \ 143 68 src/arch/ibmpc/xms.h \ 144 69 src/chipset/82xx/e8237.h \ 145 70 src/chipset/82xx/e8250.h \ ··· 161 86 src/drivers/sound/sound.h \ 162 87 src/lib/brkpt.h \ 163 88 src/lib/cmd.h \ 164 - src/lib/console.h \ 165 89 src/lib/log.h \ 166 - src/lib/monitor.h \ 167 - src/lib/msg.h \ 168 - src/lib/sysdep.h \ 169 90 src/libini/libini.h \ 170 91 src/terminal/keys.h \ 171 92 src/terminal/terminal.h ··· 173 94 src/arch/ibmpc/ibmpc.o: src/arch/ibmpc/ibmpc.c \ 174 95 src/arch/ibmpc/cassette.h \ 175 96 src/arch/ibmpc/ems.h \ 176 - src/arch/ibmpc/hook.h \ 177 97 src/arch/ibmpc/ibmpc.h \ 178 - src/arch/ibmpc/int13.h \ 179 98 src/arch/ibmpc/keyboard.h \ 180 99 src/arch/ibmpc/main.h \ 181 100 src/arch/ibmpc/mouse.h \ 182 101 src/arch/ibmpc/msg.h \ 183 102 src/arch/ibmpc/speaker.h \ 184 - src/arch/ibmpc/util.h \ 185 103 src/arch/ibmpc/xms.h \ 186 104 src/chipset/82xx/e8237.h \ 187 105 src/chipset/82xx/e8250.h \ ··· 210 128 src/drivers/sound/sound.h \ 211 129 src/lib/brkpt.h \ 212 130 src/lib/cmd.h \ 213 - src/lib/console.h \ 214 131 src/lib/inidsk.h \ 215 132 src/lib/iniram.h \ 216 133 src/lib/initerm.h \ 217 134 src/lib/load.h \ 218 135 src/lib/log.h \ 219 - src/lib/monitor.h \ 220 - src/lib/msg.h \ 221 136 src/lib/string.h \ 222 137 src/lib/sysdep.h \ 223 138 src/libini/libini.h \ ··· 227 142 src/arch/ibmpc/int13.o: src/arch/ibmpc/int13.c \ 228 143 src/arch/ibmpc/cassette.h \ 229 144 src/arch/ibmpc/ems.h \ 230 - src/arch/ibmpc/hook.h \ 231 145 src/arch/ibmpc/ibmpc.h \ 232 146 src/arch/ibmpc/int13.h \ 233 147 src/arch/ibmpc/keyboard.h \ 234 148 src/arch/ibmpc/main.h \ 235 149 src/arch/ibmpc/mouse.h \ 236 - src/arch/ibmpc/msg.h \ 237 150 src/arch/ibmpc/speaker.h \ 238 - src/arch/ibmpc/util.h \ 239 151 src/arch/ibmpc/xms.h \ 240 152 src/chipset/82xx/e8237.h \ 241 153 src/chipset/82xx/e8250.h \ ··· 257 169 src/drivers/sound/sound.h \ 258 170 src/lib/brkpt.h \ 259 171 src/lib/cmd.h \ 260 - src/lib/console.h \ 261 - src/lib/log.h \ 262 - src/lib/monitor.h \ 263 - src/lib/msg.h \ 264 - src/lib/sysdep.h \ 265 172 src/libini/libini.h \ 266 173 src/terminal/keys.h \ 267 174 src/terminal/terminal.h 268 175 269 176 src/arch/ibmpc/keyboard.o: src/arch/ibmpc/keyboard.c \ 270 - src/arch/ibmpc/cassette.h \ 271 - src/arch/ibmpc/ems.h \ 272 - src/arch/ibmpc/hook.h \ 273 - src/arch/ibmpc/ibmpc.h \ 274 - src/arch/ibmpc/int13.h \ 275 177 src/arch/ibmpc/keyboard.h \ 276 178 src/arch/ibmpc/main.h \ 277 - src/arch/ibmpc/mouse.h \ 278 - src/arch/ibmpc/msg.h \ 279 - src/arch/ibmpc/speaker.h \ 280 - src/arch/ibmpc/util.h \ 281 - src/arch/ibmpc/xms.h \ 282 - src/chipset/82xx/e8237.h \ 283 - src/chipset/82xx/e8250.h \ 284 - src/chipset/82xx/e8253.h \ 285 - src/chipset/82xx/e8255.h \ 286 - src/chipset/82xx/e8259.h \ 287 - src/chipset/82xx/e8272.h \ 288 179 src/config.h \ 289 - src/cpu/e8086/e8086.h \ 290 - src/devices/block/block.h \ 291 - src/devices/device.h \ 292 - src/devices/fdc.h \ 293 - src/devices/memory.h \ 294 - src/devices/nvram.h \ 295 - src/devices/parport.h \ 296 - src/devices/serport.h \ 297 - src/devices/video/video.h \ 298 - src/drivers/char/char.h \ 299 - src/drivers/sound/sound.h \ 300 - src/lib/brkpt.h \ 301 - src/lib/cmd.h \ 302 - src/lib/console.h \ 303 180 src/lib/log.h \ 304 - src/lib/monitor.h \ 305 - src/lib/msg.h \ 306 - src/lib/sysdep.h \ 307 181 src/libini/libini.h \ 308 182 src/terminal/keys.h \ 309 183 src/terminal/terminal.h ··· 312 186 src/arch/ibmpc/cassette.h \ 313 187 src/arch/ibmpc/cmd.h \ 314 188 src/arch/ibmpc/ems.h \ 315 - src/arch/ibmpc/hook.h \ 316 189 src/arch/ibmpc/ibmpc.h \ 317 - src/arch/ibmpc/int13.h \ 318 190 src/arch/ibmpc/keyboard.h \ 319 191 src/arch/ibmpc/main.h \ 320 192 src/arch/ibmpc/mouse.h \ ··· 346 218 src/lib/getopt.h \ 347 219 src/lib/log.h \ 348 220 src/lib/monitor.h \ 349 - src/lib/msg.h \ 350 221 src/lib/path.h \ 351 222 src/lib/sysdep.h \ 352 223 src/libini/libini.h \ ··· 354 225 src/terminal/terminal.h 355 226 356 227 src/arch/ibmpc/mouse.o: src/arch/ibmpc/mouse.c \ 357 - src/arch/ibmpc/cassette.h \ 358 - src/arch/ibmpc/ems.h \ 359 - src/arch/ibmpc/hook.h \ 360 - src/arch/ibmpc/ibmpc.h \ 361 - src/arch/ibmpc/int13.h \ 362 - src/arch/ibmpc/keyboard.h \ 363 228 src/arch/ibmpc/main.h \ 364 229 src/arch/ibmpc/mouse.h \ 365 - src/arch/ibmpc/msg.h \ 366 - src/arch/ibmpc/speaker.h \ 367 - src/arch/ibmpc/util.h \ 368 - src/arch/ibmpc/xms.h \ 369 - src/chipset/82xx/e8237.h \ 370 230 src/chipset/82xx/e8250.h \ 371 - src/chipset/82xx/e8253.h \ 372 - src/chipset/82xx/e8255.h \ 373 - src/chipset/82xx/e8259.h \ 374 - src/chipset/82xx/e8272.h \ 375 231 src/config.h \ 376 - src/cpu/e8086/e8086.h \ 377 - src/devices/block/block.h \ 378 - src/devices/device.h \ 379 - src/devices/fdc.h \ 380 232 src/devices/memory.h \ 381 - src/devices/nvram.h \ 382 - src/devices/parport.h \ 383 - src/devices/serport.h \ 384 - src/devices/video/video.h \ 385 - src/drivers/char/char.h \ 386 - src/drivers/sound/sound.h \ 387 - src/lib/brkpt.h \ 388 - src/lib/cmd.h \ 389 - src/lib/console.h \ 390 - src/lib/log.h \ 391 - src/lib/monitor.h \ 392 - src/lib/msg.h \ 393 - src/lib/sysdep.h \ 394 - src/libini/libini.h \ 395 - src/terminal/keys.h \ 396 - src/terminal/terminal.h 233 + src/libini/libini.h 397 234 398 235 src/arch/ibmpc/msg.o: src/arch/ibmpc/msg.c \ 399 236 src/arch/ibmpc/cassette.h \ 400 237 src/arch/ibmpc/ems.h \ 401 - src/arch/ibmpc/hook.h \ 402 238 src/arch/ibmpc/ibmpc.h \ 403 - src/arch/ibmpc/int13.h \ 404 239 src/arch/ibmpc/keyboard.h \ 405 240 src/arch/ibmpc/main.h \ 406 241 src/arch/ibmpc/mouse.h \ 407 - src/arch/ibmpc/msg.h \ 408 242 src/arch/ibmpc/speaker.h \ 409 - src/arch/ibmpc/util.h \ 410 243 src/arch/ibmpc/xms.h \ 411 244 src/chipset/82xx/e8237.h \ 412 245 src/chipset/82xx/e8250.h \ ··· 428 261 src/drivers/sound/sound.h \ 429 262 src/lib/brkpt.h \ 430 263 src/lib/cmd.h \ 431 - src/lib/console.h \ 432 264 src/lib/inidsk.h \ 433 265 src/lib/log.h \ 434 266 src/lib/monitor.h \ ··· 439 271 src/terminal/terminal.h 440 272 441 273 src/arch/ibmpc/speaker.o: src/arch/ibmpc/speaker.c \ 442 - src/arch/ibmpc/cassette.h \ 443 - src/arch/ibmpc/ems.h \ 444 - src/arch/ibmpc/hook.h \ 445 - src/arch/ibmpc/ibmpc.h \ 446 - src/arch/ibmpc/int13.h \ 447 - src/arch/ibmpc/keyboard.h \ 448 274 src/arch/ibmpc/main.h \ 449 - src/arch/ibmpc/mouse.h \ 450 - src/arch/ibmpc/msg.h \ 451 275 src/arch/ibmpc/speaker.h \ 452 - src/arch/ibmpc/util.h \ 453 - src/arch/ibmpc/xms.h \ 454 - src/chipset/82xx/e8237.h \ 455 - src/chipset/82xx/e8250.h \ 456 - src/chipset/82xx/e8253.h \ 457 - src/chipset/82xx/e8255.h \ 458 - src/chipset/82xx/e8259.h \ 459 - src/chipset/82xx/e8272.h \ 460 276 src/config.h \ 461 - src/cpu/e8086/e8086.h \ 462 - src/devices/block/block.h \ 463 - src/devices/device.h \ 464 - src/devices/fdc.h \ 465 - src/devices/memory.h \ 466 - src/devices/nvram.h \ 467 - src/devices/parport.h \ 468 - src/devices/serport.h \ 469 - src/devices/video/video.h \ 470 - src/drivers/char/char.h \ 471 - src/drivers/sound/sound.h \ 472 - src/lib/brkpt.h \ 473 - src/lib/cmd.h \ 474 - src/lib/console.h \ 475 - src/lib/log.h \ 476 - src/lib/monitor.h \ 477 - src/lib/msg.h \ 478 - src/lib/sysdep.h \ 479 - src/libini/libini.h \ 480 - src/terminal/keys.h \ 481 - src/terminal/terminal.h 277 + src/drivers/sound/sound.h 482 278 483 279 src/arch/ibmpc/util.o: src/arch/ibmpc/util.c \ 484 - src/arch/ibmpc/cassette.h \ 485 - src/arch/ibmpc/ems.h \ 486 - src/arch/ibmpc/hook.h \ 487 - src/arch/ibmpc/ibmpc.h \ 488 - src/arch/ibmpc/int13.h \ 489 - src/arch/ibmpc/keyboard.h \ 490 280 src/arch/ibmpc/main.h \ 491 - src/arch/ibmpc/mouse.h \ 492 - src/arch/ibmpc/msg.h \ 493 - src/arch/ibmpc/speaker.h \ 494 - src/arch/ibmpc/util.h \ 495 - src/arch/ibmpc/xms.h \ 496 - src/chipset/82xx/e8237.h \ 497 - src/chipset/82xx/e8250.h \ 498 - src/chipset/82xx/e8253.h \ 499 - src/chipset/82xx/e8255.h \ 500 - src/chipset/82xx/e8259.h \ 501 - src/chipset/82xx/e8272.h \ 502 - src/config.h \ 503 - src/cpu/e8086/e8086.h \ 504 - src/devices/block/block.h \ 505 - src/devices/device.h \ 506 - src/devices/fdc.h \ 507 - src/devices/memory.h \ 508 - src/devices/nvram.h \ 509 - src/devices/parport.h \ 510 - src/devices/serport.h \ 511 - src/devices/video/video.h \ 512 - src/drivers/char/char.h \ 513 - src/drivers/sound/sound.h \ 514 - src/lib/brkpt.h \ 515 - src/lib/cmd.h \ 516 - src/lib/console.h \ 517 - src/lib/log.h \ 518 - src/lib/monitor.h \ 519 - src/lib/msg.h \ 520 - src/lib/sysdep.h \ 521 - src/libini/libini.h \ 522 - src/terminal/keys.h \ 523 - src/terminal/terminal.h 281 + src/config.h 524 282 525 283 src/arch/ibmpc/xms.o: src/arch/ibmpc/xms.c \ 526 - src/arch/ibmpc/cassette.h \ 527 - src/arch/ibmpc/ems.h \ 528 - src/arch/ibmpc/hook.h \ 529 - src/arch/ibmpc/ibmpc.h \ 530 - src/arch/ibmpc/int13.h \ 531 - src/arch/ibmpc/keyboard.h \ 532 284 src/arch/ibmpc/main.h \ 533 - src/arch/ibmpc/mouse.h \ 534 - src/arch/ibmpc/msg.h \ 535 - src/arch/ibmpc/speaker.h \ 536 - src/arch/ibmpc/util.h \ 537 285 src/arch/ibmpc/xms.h \ 538 - src/chipset/82xx/e8237.h \ 539 - src/chipset/82xx/e8250.h \ 540 - src/chipset/82xx/e8253.h \ 541 - src/chipset/82xx/e8255.h \ 542 - src/chipset/82xx/e8259.h \ 543 - src/chipset/82xx/e8272.h \ 544 286 src/config.h \ 545 287 src/cpu/e8086/e8086.h \ 546 - src/devices/block/block.h \ 547 - src/devices/device.h \ 548 - src/devices/fdc.h \ 549 288 src/devices/memory.h \ 550 - src/devices/nvram.h \ 551 - src/devices/parport.h \ 552 - src/devices/serport.h \ 553 - src/devices/video/video.h \ 554 - src/drivers/char/char.h \ 555 - src/drivers/sound/sound.h \ 556 - src/lib/brkpt.h \ 557 - src/lib/cmd.h \ 558 289 src/lib/console.h \ 559 290 src/lib/log.h \ 560 - src/lib/monitor.h \ 561 - src/lib/msg.h \ 562 - src/lib/sysdep.h \ 563 - src/libini/libini.h \ 564 - src/terminal/keys.h \ 565 - src/terminal/terminal.h 291 + src/libini/libini.h 566 292 567 293 src/arch/macplus/cmd_68k.o: src/arch/macplus/cmd_68k.c \ 568 294 src/arch/macplus/cmd_68k.h \
+6 -1
src/arch/ibmpc/cassette.c
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/cassette.c * 7 7 * Created: 2008-11-25 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2008-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2008-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 21 21 22 22 23 23 #include "main.h" 24 + #include "cassette.h" 24 25 26 + #include <stdlib.h> 27 + #include <string.h> 25 28 #include <math.h> 29 + 30 + #include <lib/console.h> 26 31 27 32 28 33 #define CAS_CLK 1193182
+4 -1
src/arch/ibmpc/cassette.h
··· 5 5 /***************************************************************************** 6 6 * File name: src/ibmpc/cassette.h * 7 7 * Created: 2008-11-25 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2008-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2008-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 22 22 23 23 #ifndef PCE_IBMPC_CASSETTE_H 24 24 #define PCE_IBMPC_CASSETTE_H 1 25 + 26 + 27 + #include <stdio.h> 25 28 26 29 27 30 typedef struct {
+11 -1
src/arch/ibmpc/cmd.c
··· 21 21 22 22 23 23 #include "main.h" 24 + #include "ibmpc.h" 25 + 26 + #include <stdio.h> 27 + #include <string.h> 28 + 29 + #include <lib/brkpt.h> 30 + #include <lib/cmd.h> 31 + #include <lib/console.h> 32 + #include <lib/log.h> 33 + #include <lib/sysdep.h> 24 34 25 35 26 36 static ··· 522 532 return; 523 533 } 524 534 525 - pc_log_deb (NULL, "patching int 19 (0x%04x)\n", seg); 535 + pc_log_deb ("patching int 19 (0x%04x)\n", seg); 526 536 527 537 e86_set_mem16 (pc->cpu, 0, 4 * 0x19 + 0, 0x0010); 528 538 e86_set_mem16 (pc->cpu, 0, 4 * 0x19 + 2, seg);
+7
src/arch/ibmpc/cmd.h
··· 24 24 #define PCE_IBMPC_CMD_H 1 25 25 26 26 27 + #include "ibmpc.h" 28 + 29 + #include <cpu/e8086/e8086.h> 30 + 31 + #include <lib/cmd.h> 32 + 33 + 27 34 void prt_state_cpu (e8086_t *c); 28 35 29 36 void pc_run (ibmpc_t *pc);
+8 -2
src/arch/ibmpc/ems.c
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/ems.c * 7 7 * Created: 2003-10-18 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 21 21 22 22 23 23 #include "main.h" 24 + #include "ems.h" 25 + 26 + #include <stdlib.h> 27 + 28 + #include <lib/console.h> 29 + #include <lib/log.h> 24 30 25 31 26 32 /* ··· 140 146 { 141 147 unsigned i; 142 148 143 - pc_log_deb (NULL, "reset ems\n"); 149 + pc_log_deb ("reset ems\n"); 144 150 145 151 for (i = 1; i < 256; i++) { 146 152 ems_blk_del (ems->blk[i]);
+6 -1
src/arch/ibmpc/ems.h
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/ems.h * 7 7 * Created: 2003-10-18 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 22 22 23 23 #ifndef PCE_IBMPC_EMS_H 24 24 #define PCE_IBMPC_EMS_H 1 25 + 26 + 27 + #include <cpu/e8086/e8086.h> 28 + #include <devices/memory.h> 29 + #include <libini/libini.h> 25 30 26 31 27 32 typedef struct ems_block_t {
+13 -1
src/arch/ibmpc/hook.c
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/hook.c * 7 7 * Created: 2003-09-02 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 21 21 22 22 23 23 #include "main.h" 24 + #include "ems.h" 25 + #include "hook.h" 26 + #include "ibmpc.h" 27 + #include "int13.h" 28 + #include "msg.h" 29 + #include "xms.h" 30 + 31 + #include <time.h> 32 + 33 + #include <cpu/e8086/e8086.h> 34 + 35 + #include <lib/log.h> 24 36 25 37 26 38 static
+4 -1
src/arch/ibmpc/hook.h
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/hook.h * 7 7 * Created: 2003-09-02 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 22 22 23 23 #ifndef PCE_HOOK_H 24 24 #define PCE_HOOK_H 1 25 + 26 + 27 + #include "ibmpc.h" 25 28 26 29 27 30 #define PCEH_STOP 0x0000
+37 -29
src/arch/ibmpc/ibmpc.c
··· 21 21 22 22 23 23 #include "main.h" 24 + #include "ibmpc.h" 25 + #include "msg.h" 24 26 25 - #include <lib/iniram.h> 26 - #include <lib/initerm.h> 27 + #include <stdlib.h> 28 + #include <string.h> 27 29 28 30 #ifdef HAVE_SYS_TIME_H 29 31 #include <sys/time.h> 30 32 #endif 31 33 34 + #include <lib/brkpt.h> 35 + #include <lib/inidsk.h> 36 + #include <lib/iniram.h> 37 + #include <lib/initerm.h> 38 + #include <lib/load.h> 39 + #include <lib/log.h> 40 + #include <lib/string.h> 41 + #include <lib/sysdep.h> 42 + 43 + #include <chipset/82xx/e8237.h> 44 + #include <chipset/82xx/e8250.h> 45 + #include <chipset/82xx/e8253.h> 46 + #include <chipset/82xx/e8255.h> 47 + #include <chipset/82xx/e8259.h> 48 + #include <chipset/82xx/e8272.h> 49 + 50 + #include <cpu/e8086/e8086.h> 51 + 52 + #include <devices/block/block.h> 53 + #include <devices/fdc.h> 54 + #include <devices/memory.h> 55 + #include <devices/nvram.h> 56 + #include <devices/parport.h> 57 + #include <devices/serport.h> 32 58 #include <devices/video/mda.h> 33 59 #include <devices/video/hgc.h> 34 60 #include <devices/video/cga.h> ··· 37 63 #include <devices/video/plantronics.h> 38 64 #include <devices/video/wy700.h> 39 65 40 - #include <lib/inidsk.h> 41 - #include <lib/iniram.h> 42 - #include <lib/load.h> 43 - #include <lib/string.h> 66 + #include <libini/libini.h> 67 + 68 + #include <terminal/terminal.h> 44 69 45 70 46 71 #ifdef PCE_HOST_WINDOWS ··· 57 82 unsigned char pc_get_port8 (ibmpc_t *pc, unsigned long addr) 58 83 { 59 84 #ifdef DEBUG_PORTS 60 - pc_log_deb (pc, "get port 8 %04lX\n", addr); 85 + pc_log_deb ("get port 8 %04lX\n", addr); 61 86 #endif 62 87 63 88 return (0xff); ··· 67 92 unsigned short pc_get_port16 (ibmpc_t *pc, unsigned long addr) 68 93 { 69 94 #ifdef DEBUG_PORTS 70 - pc_log_deb (pc, "get port 16 %04lX\n", addr); 95 + pc_log_deb ("get port 16 %04lX\n", addr); 71 96 #endif 72 97 73 98 return (0xffff); ··· 77 102 void pc_set_port8 (ibmpc_t *pc, unsigned long addr, unsigned char val) 78 103 { 79 104 #ifdef DEBUG_PORTS 80 - pc_log_deb (pc, "set port 8 %04lX <- %02X\n", addr, val); 105 + pc_log_deb ("set port 8 %04lX <- %02X\n", addr, val); 81 106 #endif 82 107 83 108 switch (addr) { ··· 99 124 void pc_set_port16 (ibmpc_t *pc, unsigned long addr, unsigned short val) 100 125 { 101 126 #ifdef DEBUG_PORTS 102 - pc_log_deb (pc, "set port 16 %04lX <- %04X\n", addr, val); 127 + pc_log_deb ("set port 16 %04lX <- %04X\n", addr, val); 103 128 #endif 104 129 } 105 130 ··· 1452 1477 free (pc); 1453 1478 } 1454 1479 1455 - void pc_log_deb (ibmpc_t *pc, const char *msg, ...) 1456 - { 1457 - va_list va; 1458 - 1459 - if (pc == NULL) { 1460 - pc = par_pc; 1461 - } 1462 - 1463 - pce_log (MSG_DEB, "[%04X:%04X] ", 1464 - e86_get_cs (pc->cpu), e86_get_ip (pc->cpu) 1465 - ); 1466 - 1467 - va_start (va, msg); 1468 - pce_log_va (MSG_DEB, msg, va); 1469 - va_end (va); 1470 - } 1471 - 1472 1480 int pc_set_serport_driver (ibmpc_t *pc, unsigned port, const char *driver) 1473 1481 { 1474 1482 if ((port >= 4) || (pc->serport[port] == NULL)) { ··· 1568 1576 return; 1569 1577 } 1570 1578 1571 - pc_log_deb (pc, "patching the bios (0x%04x)\n", seg); 1579 + pc_log_deb ("patching the bios (0x%04x)\n", seg); 1572 1580 1573 1581 mem_set_uint8_rw (pc->mem, 0xffff1, 0x0c); 1574 1582 mem_set_uint8_rw (pc->mem, 0xffff2, 0x00); ··· 1578 1586 1579 1587 void pc_reset (ibmpc_t *pc) 1580 1588 { 1581 - pc_log_deb (pc, "reset pc\n"); 1589 + pc_log_deb ("reset pc\n"); 1582 1590 1583 1591 pc_patch_bios (pc); 1584 1592
+33 -7
src/arch/ibmpc/ibmpc.h
··· 24 24 #define PCE_IBMPC_H 1 25 25 26 26 27 - #define PCE_IBMPC_CLK0 14318184 28 - #define PCE_IBMPC_CLK1 (PCE_IBMPC_CLK0 / 3) 29 - #define PCE_IBMPC_CLK2 (PCE_IBMPC_CLK0 / 12) 27 + #include "cassette.h" 28 + #include "ems.h" 29 + #include "keyboard.h" 30 + #include "mouse.h" 31 + #include "speaker.h" 32 + #include "xms.h" 33 + 34 + #include <chipset/82xx/e8237.h> 35 + #include <chipset/82xx/e8250.h> 36 + #include <chipset/82xx/e8253.h> 37 + #include <chipset/82xx/e8255.h> 38 + #include <chipset/82xx/e8259.h> 39 + #include <chipset/82xx/e8272.h> 40 + 41 + #include <cpu/e8086/e8086.h> 42 + 43 + #include <devices/block/block.h> 44 + #include <devices/fdc.h> 45 + #include <devices/memory.h> 46 + #include <devices/nvram.h> 47 + #include <devices/parport.h> 48 + #include <devices/serport.h> 49 + #include <devices/video/video.h> 50 + 51 + #include <lib/brkpt.h> 52 + 53 + #include <libini/libini.h> 30 54 31 - #define PCE_IBMPC_5150 0 32 - #define PCE_IBMPC_5160 1 55 + #include <terminal/terminal.h> 56 + 57 + 33 58 34 59 35 60 typedef struct ibmpc_t { ··· 109 134 } ibmpc_t; 110 135 111 136 137 + extern ibmpc_t *par_pc; 138 + 139 + 112 140 ibmpc_t *pc_new (ini_sct_t *ini); 113 141 114 142 void pc_del (ibmpc_t *pc); 115 - 116 - void pc_log_deb (ibmpc_t *pc, const char *msg, ...); 117 143 118 144 int pc_set_serport_driver (ibmpc_t *pc, unsigned port, const char *driver); 119 145 int pc_set_serport_file (ibmpc_t *pc, unsigned port, const char *fname);
+8 -1
src/arch/ibmpc/int13.c
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/int13.c * 7 7 * Created: 2003-04-14 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 21 21 22 22 23 23 #include "main.h" 24 + #include "ibmpc.h" 25 + #include "int13.h" 26 + 27 + #include <string.h> 28 + 29 + #include <cpu/e8086/e8086.h> 30 + #include <devices/block/block.h> 24 31 25 32 26 33 void dsk_int_13_check (ibmpc_t *pc)
+7 -1
src/arch/ibmpc/int13.h
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/int13.h * 7 7 * Created: 2003-04-14 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 22 22 23 23 #ifndef PCE_INT13_H 24 24 #define PCE_INT13_H 1 25 + 26 + 27 + #include "ibmpc.h" 28 + 29 + #include <cpu/e8086/e8086.h> 30 + #include <devices/block/block.h> 25 31 26 32 27 33 void dsk_int_13_check (ibmpc_t *pc);
+7 -2
src/arch/ibmpc/keyboard.c
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/keyboard.c * 7 7 * Created: 2007-11-26 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2007-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2007-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 21 21 22 22 23 23 #include "main.h" 24 + #include "keyboard.h" 25 + 26 + #include <lib/log.h> 27 + 28 + #include <terminal/terminal.h> 24 29 25 30 26 31 /* 10 bits at 31250 bps */ ··· 178 183 { 179 184 pc_keymap_t *map; 180 185 181 - pc_log_deb (NULL, "reset keyboard\n"); 186 + pc_log_deb ("reset keyboard\n"); 182 187 183 188 map = keymap; 184 189
+29 -1
src/arch/ibmpc/main.c
··· 21 21 22 22 23 23 #include "main.h" 24 + #include "cmd.h" 25 + #include "msg.h" 26 + #include "util.h" 24 27 25 - #include "cmd.h" 28 + #include <stdarg.h> 26 29 27 30 #include <signal.h> 28 31 ··· 30 33 #include <SDL.h> 31 34 #endif 32 35 36 + #include <lib/console.h> 33 37 #include <lib/getopt.h> 38 + #include <lib/log.h> 39 + #include <lib/monitor.h> 34 40 #include <lib/path.h> 41 + #include <lib/sysdep.h> 35 42 36 43 37 44 const char *par_terminal = NULL; ··· 163 170 } 164 171 165 172 return (1); 173 + } 174 + 175 + void pc_log_deb (const char *msg, ...) 176 + { 177 + va_list va; 178 + unsigned short cs, ip; 179 + 180 + if (par_pc == NULL) { 181 + cs = 0; 182 + ip = 0; 183 + } 184 + else { 185 + cs = e86_get_cs (par_pc->cpu); 186 + ip = e86_get_ip (par_pc->cpu); 187 + } 188 + 189 + pce_log (MSG_DEB, "[%04X:%04X] ", cs, ip); 190 + 191 + va_start (va, msg); 192 + pce_log_va (MSG_DEB, msg, va); 193 + va_end (va); 166 194 } 167 195 168 196 static
+6 -59
src/arch/ibmpc/main.h
··· 26 26 27 27 #include <config.h> 28 28 29 - #include <stdlib.h> 30 - #include <stdio.h> 31 - #include <string.h> 32 - #include <stdarg.h> 33 - #include <time.h> 34 29 35 - #ifdef HAVE_LIMITS_H 36 - #include <limits.h> 37 - #endif 30 + #define PCE_IBMPC_CLK0 14318184 31 + #define PCE_IBMPC_CLK1 (PCE_IBMPC_CLK0 / 3) 32 + #define PCE_IBMPC_CLK2 (PCE_IBMPC_CLK0 / 12) 38 33 39 - #ifdef HAVE_UNISTD_H 40 - #include <unistd.h> 41 - #endif 42 - 43 - 44 - struct ibmpc_t; 34 + #define PCE_IBMPC_5150 0 35 + #define PCE_IBMPC_5160 1 45 36 46 37 47 38 extern const char *par_terminal; 48 39 extern const char *par_video; 49 40 50 41 51 - #include <lib/brkpt.h> 52 - #include <lib/cmd.h> 53 - #include <lib/console.h> 54 - #include <lib/log.h> 55 - #include <lib/monitor.h> 56 - #include <lib/msg.h> 57 - #include <lib/sysdep.h> 58 - 59 - #include <cpu/e8086/e8086.h> 60 - #include <chipset/82xx/e8237.h> 61 - #include <chipset/82xx/e8250.h> 62 - #include <chipset/82xx/e8253.h> 63 - #include <chipset/82xx/e8255.h> 64 - #include <chipset/82xx/e8259.h> 65 - #include <chipset/82xx/e8272.h> 66 - 67 - #include <libini/libini.h> 68 - 69 - #include <terminal/terminal.h> 70 - 71 - #include <devices/memory.h> 72 - #include <devices/fdc.h> 73 - #include <devices/nvram.h> 74 - #include <devices/parport.h> 75 - #include <devices/serport.h> 76 - 77 - #include <devices/video/video.h> 78 - 79 - #include <devices/block/block.h> 80 - 81 - #include "util.h" 82 - #include "cassette.h" 83 - #include "keyboard.h" 84 - #include "mouse.h" 85 - #include "ems.h" 86 - #include "speaker.h" 87 - #include "xms.h" 88 - #include "ibmpc.h" 89 - #include "hook.h" 90 - #include "int13.h" 91 - #include "msg.h" 92 - 93 - 94 - extern monitor_t par_mon; 95 - extern ibmpc_t *par_pc; 42 + void pc_log_deb (const char *msg, ...); 96 43 97 44 98 45 #endif
+9 -2
src/arch/ibmpc/mouse.c
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/mouse.c * 7 7 * Created: 2003-08-25 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 21 21 22 22 23 23 #include "main.h" 24 + #include "mouse.h" 25 + 26 + #include <stdlib.h> 27 + 28 + #include <chipset/82xx/e8250.h> 29 + #include <devices/memory.h> 30 + #include <libini/libini.h> 24 31 25 32 26 33 void mse_init (mouse_t *mse, unsigned long base, ini_sct_t *sct) ··· 251 258 if (cnt >= mse->reset_cntr) { 252 259 mse->reset_cntr = 0; 253 260 mse_receive (mse, 'M'); 254 - pc_log_deb (NULL, "reset mouse\n"); 261 + pc_log_deb ("reset mouse\n"); 255 262 } 256 263 else { 257 264 mse->reset_cntr -= cnt;
+6 -1
src/arch/ibmpc/mouse.h
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/mouse.h * 7 7 * Created: 2003-08-25 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 22 22 23 23 #ifndef PCE_MOUSE_H 24 24 #define PCE_MOUSE_H 1 25 + 26 + 27 + #include <chipset/82xx/e8250.h> 28 + #include <devices/memory.h> 29 + #include <libini/libini.h> 25 30 26 31 27 32 typedef struct {
+13
src/arch/ibmpc/msg.c
··· 21 21 22 22 23 23 #include "main.h" 24 + #include "cassette.h" 25 + #include "ibmpc.h" 26 + 27 + #include <string.h> 28 + 29 + #include <devices/block/block.h> 24 30 25 31 #include <lib/inidsk.h> 32 + #include <lib/log.h> 33 + #include <lib/monitor.h> 34 + #include <lib/msg.h> 35 + #include <lib/sysdep.h> 36 + 37 + 38 + extern monitor_t par_mon; 26 39 27 40 28 41 typedef struct {
+4 -1
src/arch/ibmpc/msg.h
··· 5 5 /***************************************************************************** 6 6 * File name: src/arch/ibmpc/msg.h * 7 7 * Created: 2004-09-25 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2004-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2004-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 22 22 23 23 #ifndef PCE_MSG_H 24 24 #define PCE_MSG_H 1 25 + 26 + 27 + #include "ibmpc.h" 25 28 26 29 27 30 int pc_set_msg (ibmpc_t *pc, const char *msg, const char *val);
+7 -2
src/arch/ibmpc/speaker.c
··· 21 21 22 22 23 23 #include "main.h" 24 + #include "speaker.h" 25 + 26 + #include <stdlib.h> 27 + 28 + #include <drivers/sound/sound.h> 24 29 25 30 26 31 #ifndef DEBUG_SPEAKER ··· 82 87 void pc_speaker_on (pc_speaker_t *spk) 83 88 { 84 89 #if DEBUG_SPEAKER >= 1 85 - pc_log_deb (NULL, "speaker on\n"); 90 + pc_log_deb ("speaker on\n"); 86 91 #endif 87 92 88 93 spk->playing = 1; ··· 102 107 void pc_speaker_off (pc_speaker_t *spk) 103 108 { 104 109 #if DEBUG_SPEAKER >= 1 105 - pc_log_deb (NULL, "speaker off\n"); 110 + pc_log_deb ("speaker off\n"); 106 111 #endif 107 112 108 113 spk->playing = 0;
+10 -1
src/arch/ibmpc/xms.c
··· 21 21 22 22 23 23 #include "main.h" 24 + #include "xms.h" 25 + 26 + #include <stdlib.h> 27 + #include <string.h> 28 + 29 + #include <lib/console.h> 30 + #include <lib/log.h> 31 + 32 + #include <libini/libini.h> 24 33 25 34 26 35 xms_emb_t *emb_new (unsigned long size) ··· 162 171 { 163 172 unsigned i; 164 173 165 - pc_log_deb (NULL, "reset xms\n"); 174 + pc_log_deb ("reset xms\n"); 166 175 167 176 for (i = 0; i < xms->emb_cnt; i++) { 168 177 emb_del (xms->emb[i]);
+5
src/arch/ibmpc/xms.h
··· 24 24 #define PCE_XMS_H 1 25 25 26 26 27 + #include <cpu/e8086/e8086.h> 28 + #include <devices/memory.h> 29 + #include <libini/libini.h> 30 + 31 + 27 32 #define PCE_XMS_UMB_MAX 256 28 33 29 34
+2 -1
src/lib/log.h
··· 5 5 /***************************************************************************** 6 6 * File name: src/lib/log.h * 7 7 * Created: 2003-02-02 by Hampa Hug <hampa@hampa.ch> * 8 - * Copyright: (C) 2003-2009 Hampa Hug <hampa@hampa.ch> * 8 + * Copyright: (C) 2003-2010 Hampa Hug <hampa@hampa.ch> * 9 9 *****************************************************************************/ 10 10 11 11 /***************************************************************************** ··· 25 25 26 26 27 27 #include <stdarg.h> 28 + #include <stdio.h> 28 29 29 30 30 31 #define PCE_LOG_MAX 16