dd if=/dev/zero of=$@ bs=512 count=2880
dd if=$< of=$@ conv=notrunc
+pcboot.iso: floppy.img
+ rm -rf cdrom
+ git archive --format=tar --prefix=cdrom/ HEAD | tar xf -
+ cp $< cdrom
+ mkisofs -o $@ -R -J -V pcboot -b $< cdrom
+
+
boot.img: bootldr.bin $(bin)
cat bootldr.bin $(bin) >$@
interrupt(IRQ_TO_INTR(irq), intr_handler);
+ write_dsp(CMD_ENABLE_OUTPUT);
sb_set_output_rate(rate);
start_dma_transfer(addr, size);
- write_dsp(CMD_ENABLE_OUTPUT);
}
void sb_pause(void)
dma_out(dma_chan, addr, size, DMA_SINGLE);
/* program the DSP to accept the DMA transfer */
- write_dsp(CMD_START_DMA8 | CMD_FIFO);
+ write_dsp(CMD_START_DMA8);
write_dsp(xfer_mode);
size--;
write_dsp(size & 0xff);
# pcboot - bootable PC demo/game kernel
-# Copyright (C) 2018 John Tsiombikas <nuclear@member.fsf.org>
+# Copyright (C) 2018-2019 John Tsiombikas <nuclear@member.fsf.org>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
mov %dl, drive_number
- call setup_serial
-
call get_drive_chs
mov $loading_msg, %si
print_char:
push %es
- push %ax
cmp $10, %ax
jnz 0f
mov $32, %ax
movb $7, %es:1(%di)
incw cursor_x
- pop %ax
- call ser_putchar
pop %es
ret
popa
ret
- .set UART_DATA, 0x3f8
- .set UART_DIVLO, 0x3f8
- .set UART_DIVHI, 0x3f9
- .set UART_FIFO, 0x3fa
- .set UART_LCTL, 0x3fb
- .set UART_MCTL, 0x3fc
- .set UART_LSTAT, 0x3fd
- .set DIV_9600, 115200 / 9600
- .set LCTL_8N1, 0x03
- .set LCTL_DLAB, 0x80
- .set FIFO_ENABLE_CLEAR, 0x07
- .set MCTL_DTR_RTS_OUT2, 0x0b
- .set LST_TREG_EMPTY, 0x20
-
-setup_serial:
- # set clock divisor
- mov $LCTL_DLAB, %al
- mov $UART_LCTL, %dx
- out %al, %dx
- mov $DIV_9600, %ax
- mov $UART_DIVLO, %dx
- out %al, %dx
- shr $8, %ax
- mov $UART_DIVHI, %dx
- out %al, %dx
- # set format 8n1
- mov $LCTL_8N1, %al
- mov $UART_LCTL, %dx
- out %al, %dx
- # clear and enable fifo
- mov $FIFO_ENABLE_CLEAR, %al
- mov $UART_FIFO, %dx
- out %al, %dx
- # assert RTS and DTR
- mov $MCTL_DTR_RTS_OUT2, %al
- mov $UART_MCTL, %dx
- out %al, %dx
- ret
-
- # expects a character in al
-ser_putchar:
- push %dx
-
- cmp $10, %al
- jnz 0f
- push %ax
- mov $13, %al
- call ser_putchar
- pop %ax
-
-0: mov %al, %ah
- # wait until the transmit register is empty
- mov $UART_LSTAT, %dx
-wait: in %dx, %al
- and $LST_TREG_EMPTY, %al
- jz wait
- mov $UART_DATA, %dx
- mov %ah, %al
- out %al, %dx
-
- pop %dx
- ret
-
.org 510
.byte 0x55
.byte 0xaa
# pcboot - bootable PC demo/game kernel
-# Copyright (C) 2018 John Tsiombikas <nuclear@member.fsf.org>
+# Copyright (C) 2018-2019 John Tsiombikas <nuclear@member.fsf.org>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
.section .boot2,"ax"
.set main_load_addr, 0x100000
+ .set drive_number, 0x7bec
# make sure any BIOS call didn't re-enable interrupts
cli
+ xor %eax, %eax
+ mov drive_number, %al
+ mov %eax, boot_drive_number
+
+ call setup_serial
+
# enter unreal mode
call unreal
# load the whole program into memory starting at 1MB
call load_main
- #mov $0x13, %ax
- #int $0x10
-
# load initial GDT
lgdt (gdt_lim)
# load initial IDT
# the BIOS might have enabled interrupts
cli
- # just in case we were loaded from floppy, turn all floppy motors off
+ # if we were loaded from floppy, turn all floppy motors off
+ movb drive_number, %bl
+ and $0x80, %bl
+ jnz 0f
mov $0x3f2, %dx
in %dx, %al
- and $0xf0, %al
+ and $0xf, %al
out %al, %dx
+0:
mov $10, %ax
call putchar
read_retries: .short 0
- .set drive_number, 0x7bec
read_track:
# set es to the start of the destination buffer to allow reading in
# full 64k chunks if necessary
clearscr:
mov $0xb8000, %edi
- xor %eax, %eax
+ # clear with white-on-black spaces
+ mov $0x07200720, %eax
mov $1000, %ecx
addr32 rep stosl
ret
.set UART_DATA, 0x3f8
+ .set UART_DIVLO, 0x3f8
+ .set UART_DIVHI, 0x3f9
+ .set UART_FIFO, 0x3fa
+ .set UART_LCTL, 0x3fb
+ .set UART_MCTL, 0x3fc
.set UART_LSTAT, 0x3fd
+ .set DIV_9600, 115200 / 9600
+ .set LCTL_8N1, 0x03
+ .set LCTL_DLAB, 0x80
+ .set FIFO_ENABLE_CLEAR, 0x07
+ .set MCTL_DTR_RTS_OUT2, 0x0b
.set LST_TREG_EMPTY, 0x20
+setup_serial:
+ # set clock divisor
+ mov $LCTL_DLAB, %al
+ mov $UART_LCTL, %dx
+ out %al, %dx
+ mov $DIV_9600, %ax
+ mov $UART_DIVLO, %dx
+ out %al, %dx
+ shr $8, %ax
+ mov $UART_DIVHI, %dx
+ out %al, %dx
+ # set format 8n1
+ mov $LCTL_8N1, %al
+ mov $UART_LCTL, %dx
+ out %al, %dx
+ # clear and enable fifo
+ mov $FIFO_ENABLE_CLEAR, %al
+ mov $UART_FIFO, %dx
+ out %al, %dx
+ # assert RTS and DTR
+ mov $MCTL_DTR_RTS_OUT2, %al
+ mov $UART_MCTL, %dx
+ out %al, %dx
+ ret
+
+
ser_putchar:
push %dx
saved_eax: .long 0
saved_es: .word 0
saved_ds: .word 0
+saved_flags: .word 0
+saved_pic1_mask: .byte 0
+saved_pic2_mask: .byte 0
# drop back to unreal mode to call 16bit interrupt
.global int86
sidt (saved_idtr)
lidt (rmidt)
+ # save PIC masks
+ pushl $0
+ call get_pic_mask
+ add $4, %esp
+ mov %al, saved_pic1_mask
+ pushl $1
+ call get_pic_mask
+ add $4, %esp
+ mov %al, saved_pic2_mask
+
# modify the int instruction. do this here before the
# cs-load jumps, to let them flush the instruction cache
mov $int_op, %ebx
pop %es
pop %ds
# ignore fs and gs for now, don't think I'm going to need them
- mov saved_esp, %esp
# move to the real-mode stack, accessible from ss=0
# just in case the BIOS call screws up our unreal mode
mov %eax, saved_eax
mov %ds, saved_ds
mov %es, saved_es
+ pushfw
+ popw %ax
+ mov %ax, saved_flags
# re-enable protection
mov %cr0, %eax
pushw %ax
mov saved_es, %ax
pushw %ax
+ # grab the flags and replace the carry bit from the saved flags
pushfw
+ popw %ax
+ and $0xfffe, %ax
+ or saved_flags, %ax
+ pushw %ax
mov saved_eax, %eax
pushal
mov saved_esp, %esp
# restore 32bit interrupt descriptor table
lidt (saved_idtr)
+
+ # restore PIC configuration
+ call init_pic
+
+ # restore IRQ masks
+ movzbl saved_pic1_mask, %eax
+ push %eax
+ pushl $0
+ call set_pic_mask
+ add $8, %esp
+
+ movzbl saved_pic2_mask, %eax
+ push %eax
+ pushl $1
+ call set_pic_mask
+ add $8, %esp
+
+ # keyboard voodoo: with some BIOS implementations, after returning from
+ # int13, there's (I guess) leftover data in the keyboard port and we
+ # can't receive any more keyboard interrupts afterwards. Reading from
+ # the keyboard data port (60h) once, seems to resolve this. And it's
+ # cheap enough, so why not... I give up.
+ push %eax
+ in $0x60, %al
+ pop %eax
+
sti
popal
pop %ebp
ret
+ .align 4
+ .global boot_drive_number
+boot_drive_number:
+ .long 0
+
# buffer used by the track loader ... to load tracks.
.align 16
buffer:
#define TICK_FREQ_HZ 250
#define CON_TEXTMODE
-#undef CON_SERIAL
+#define CON_SERIAL
#endif /* PCBOOT_CONFIG_H_ */
mask(chan);
outb(0, DMA_CLR_FLIPFLOP(chan));
- /* single / block / cascade */
- mode = ((flags & 3) << 6) | MODE_CHAN(chan);
+ /* first 2 bits of flags correspond to the mode bits 6,7 */
+ mode = ((flags & 3) << 6) | dir | MODE_CHAN(chan);
if(flags & DMA_DECR) mode |= MODE_DECR;
if(flags & DMA_AUTO) mode |= MODE_AUTO;
outb(mode, DMA_MODE(chan));
#define OCW2_EOI (1 << 5)
-static void init_pic(int offset);
+void init_pic(void);
static void gate_desc(desc_t *desc, uint16_t sel, uint32_t addr, int dpl, int type);
/* defined in intr_asm.S */
/* initialize the programmable interrupt controller
* setting up the maping of IRQs [0, 15] to interrupts [32, 47]
*/
- init_pic(IRQ_OFFSET);
+ init_pic();
eoi_pending = 0;
}
/* set an interrupt handler function for a particular interrupt */
void interrupt(int intr_num, intr_func_t func)
{
+ int iflag = get_intr_flag();
+ disable_intr();
intr_func[intr_num] = func;
+ set_intr_flag(iflag);
}
/* this function is called from all interrupt entry points
}
}
-static void init_pic(int offset)
+void init_pic(void)
{
/* send ICW1 saying we'll follow with ICW4 later on */
outb(ICW1_INIT | ICW1_ICW4_NEEDED, PIC1_CMD);
outb(ICW1_INIT | ICW1_ICW4_NEEDED, PIC2_CMD);
/* send ICW2 with IRQ remapping */
- outb(offset, PIC1_DATA);
- outb(offset + 8, PIC2_DATA);
+ outb(IRQ_OFFSET, PIC1_DATA);
+ outb(IRQ_OFFSET + 8, PIC2_DATA);
/* send ICW3 to setup the master/slave relationship */
/* ... set bit3 = 3rd interrupt input has a slave */
outb(4, PIC1_DATA);
gate_desc(idt + num, selector(SEGM_KCODE, 0), (uint32_t)handler, dpl, type);
}
+void set_pic_mask(int pic, unsigned char mask)
+{
+ outb(mask, pic > 0 ? PIC2_DATA : PIC1_DATA);
+}
+
+unsigned char get_pic_mask(int pic)
+{
+ return inb(pic > 0 ? PIC2_DATA : PIC1_DATA);
+}
+
+void mask_irq(int irq)
+{
+ int port;
+ unsigned char mask;
+
+ if(irq < 8) {
+ port = PIC1_DATA;
+ } else {
+ port = PIC2_DATA;
+ irq -= 8;
+ }
+
+ mask = inb(port) | (1 << irq);
+ outb(mask, port);
+}
+
+void unmask_irq(int irq)
+{
+ int port;
+ unsigned char mask;
+
+ if(irq < 8) {
+ port = PIC1_DATA;
+ } else {
+ port = PIC2_DATA;
+ irq -= 8;
+ }
+
+ mask = inb(port) & ~(1 << irq);
+ outb(mask, port);
+}
+
+
void end_of_irq(int irq)
{
int intr_state = get_intr_flag();
*/
void set_intr_entry(int num, void (*handler)(void));
+void set_pic_mask(int pic, unsigned char mask);
+unsigned char get_pic_mask(int pic);
+void mask_irq(int irq);
+void unmask_irq(int irq);
+
/* defined in intr_asm.S */
int get_intr_flag(void);
void set_intr_flag(int onoff);
}
printf("Total usable RAM: %u.%u %s\n", total, 100 * rem / 1024, suffix[i]);
- bmsize = max_pg / 8; /* size of the useful bitmap in bytes */
+ /* size of the useful part of the bitmap in bytes padded to 4-byte
+ * boundaries to allow 32bit at a time operations.
+ */
+ bmsize = (max_pg / 32 + 1) * 4;
- /* mark all pages occupied by the bitmap as usef */
+ /* mark all pages occupied by the bitmap as used */
used_end = (uint32_t)bitmap + bmsize - 1;
- printf("marking pages up to %x (page: %d) as used\n", used_end, ADDR_TO_PAGE(used_end));
-
- for(i=0; i<=used_end; i++) {
+ max_pg = ADDR_TO_PAGE(used_end);
+ printf("marking pages up to %x (page: %d) as used\n", used_end, max_pg);
+ for(i=0; i<=max_pg; i++) {
mark_page(i, USED);
}
}
if(read_dev_info(&info, busid, dev, 0) == -1) {
return 0;
}
- print_dev_info(&info, busid, dev, 0);
+ /*print_dev_info(&info, busid, dev, 0);*/
count = 1;
if(read_dev_info(&info, busid, dev, i) == -1) {
continue;
}
- print_dev_info(&info, busid, dev, i);
+ /*print_dev_info(&info, busid, dev, i);*/
count++;
}
}
}
while(!can_send(fd));
- while((inb(base + UART_MSTAT) & MST_CTS) == 0);
+ /*while((inb(base + UART_MSTAT) & MST_CTS) == 0);*/
outb(c, base + UART_DATA);
}
}
}
if(click) {
- printf("click!\n");
audio_play(22050, 1);
}
static int click_sound_callback(void *buffer, int size, void *cls)
{
if(click) {
- int i;
- signed char *ptr = buffer;
- signed char *src = snd_click;
- /*
- for(i=0; i<size; i++) {
- if((i / 32) & 1) {
- *ptr++ = -64;
- } else {
- *ptr++ = 64;
- }
- }
- */
- /*memcpy(buffer, snd_click, snd_click_size);*/
-
- for(i=0; i<snd_click_size; i++) {
- *ptr++ = *src++;
- }
-
+ memcpy(buffer, snd_click, snd_click_size);
click = 0;
return snd_click_size;
}
projects / bootcensus / commitdiff