diff --git a/.program2.asm.swp b/.program2.asm.swp deleted file mode 100644 index 6621a76..0000000 Binary files a/.program2.asm.swp and /dev/null differ diff --git a/boot.asm b/boot.asm index 10ba484..445415a 100755 --- a/boot.asm +++ b/boot.asm @@ -48,77 +48,23 @@ welcome: call wolf_print - mov ah, 06h; bottom bar, make background - mov cx, 0x1800 - mov dx, 0x184F - mov bh, 30h - int 10h - - - mov ah, 02h ;bottom bar setting the position and then write title $ - mov bh, 0h - mov dh, 18h - mov dl, 20h - int 10h - - mov si, title - call wolf_print - - mov ah, 02h ;sets cursor to top to write mov bh, 0h mov dh, 2h - mov dl, 2h + mov dl, 1h int 10h mov si, wolf_wel_msg call wolf_print -; mov si, xpub -; call wolf_print + mov si, xpub + call wolf_print start: mov ah, 0x00 int 0x16 cmp al, "0" - je load_it_all_0 - cmp al, "1" - je load_it_all_1 - jmp over - -load_it_all_0: - - mov si, wolf_kernel_load - call wolf_print - - pushf - stc - - mov ah,00 - int 13h - -.read_sector: - mov ax, 0x0 - mov es, ax ; ES = 0 - mov bx, 0x2000 ; BX = 0x1000. ES:BX=0x0:0x1000 - ; ES:BX = starting address to read sector(s) into - mov ah, 02 ; Int 13h/AH=2 = Read Sectors From Drive - mov al, 01 ; Sectors to read = 1 - mov ch, 00 ; CH=Cylinder. Second sector of disk - ; is at Cylinder 0 not 1 - mov cl, 03 ; Sector to read = 2 - mov dh, 00 ; Head to read = 0 - ; DL hasn't been destroyed by our bootloader code and still - ; contains boot drive # passed to our bootloader by the BIOS - mov dl, [bootdev] - int 13h - - jc wolf_error - popf - jmp 0x0:0x2000 - cli - hlt - + jmp load_it_all_1 load_it_all_1: @@ -184,7 +130,7 @@ wolf_wel_msg db 'Welcome to this publication..., press a key to ENTER',0x0D,0x0A wolf_kernel_load db 'Loading program',0x0D,0x0A,0 wolf_error_msg db 'Program not found!',0x0D,0x0A,0 wolf_error_msg1 db 'Press any key to restart..',0 -;xpub db 0x0D, 0x0A, 0x20, 0xB1, 0x20, 0x20, 0x20, 0xB1, 0x20, 0xB1, 0xB1, 0xB1, 0x20, 0x20, 0xB1, 0x20, 0x20, 0x20, 0xB1,0x20,0xB1,0xB1,0xB1, 0x20, 0x0D, 0x0A,0x20,0x20,0xB1,0x20,0xB1,0x20,0x20,0xB1,0x20,0x20,0xB1, 0x20,0xB1,0x20,0x20,0x20,0xB1,0x20,0xB1,0x20,0x20, 0xB1, 0x0D,0x0A,0x20,0x20,0x20,0xB1, 0x20,0x20,0x20,0xB1,0xB1, 0xB1,0x20,0x20,0xB1,0x20,0x20,0x20,0xB1,0x20,0xB1,0xB1,0xB1,0x20,0x0D,0x0A,0x20,0x20,0xB1,0x20,0xB1, 0x20,0x20,0xB1,0x20,0x20,0x20,0x20,0xB1,0x20,0x20,0x20,0xB1,0x20,0xB1,0x20,0x20,0xB1,0x0D,0x0A,0x20,0xB1, 0x20,0x20,0x20,0xB1,0x20,0xB1,0x20,0x20,0x20,0x20,0x20,0xB1,0xB1,0xB1,0x20,0x20,0xB1,0xB1,0xB1, 0x20, 0 +xpub db 0x0D, 0x0A, 0x20, 0xB1, 0x20, 0x20, 0x20, 0xB1, 0x20, 0xB1, 0xB1, 0xB1, 0x20, 0x20, 0xB1, 0x20, 0x20, 0x20, 0xB1,0x20,0xB1,0xB1,0xB1, 0x20, 0x0D, 0x0A,0x20,0x20,0xB1,0x20,0xB1,0x20,0x20,0xB1,0x20,0x20,0xB1, 0x20,0xB1,0x20,0x20,0x20,0xB1,0x20,0xB1,0x20,0x20, 0xB1, 0x0D,0x0A,0x20,0x20,0x20,0xB1, 0x20,0x20,0x20,0xB1,0xB1, 0xB1,0x20,0x20,0xB1,0x20,0x20,0x20,0xB1,0x20,0xB1,0xB1,0xB1,0x20,0x0D,0x0A,0x20,0x20,0xB1,0x20,0xB1, 0x20,0x20,0xB1,0x20,0x20,0x20,0x20,0xB1,0x20,0x20,0x20,0xB1,0x20,0xB1,0x20,0x20,0xB1,0x0D,0x0A,0x20,0xB1, 0x20,0x20,0x20,0xB1,0x20,0xB1,0x20,0x20,0x20,0x20,0x20,0xB1,0xB1,0xB1,0x20,0x20,0xB1,0xB1,0xB1, 0x20, 0 title db 'NOT MY DEFAULT',0 bootdev db 0x80 ; Boot device number diff --git a/boot.bin b/boot.bin index 748faff..781a960 100644 Binary files a/boot.bin and b/boot.bin differ diff --git a/disk.img b/disk.img index 1915991..fef0d73 100755 Binary files a/disk.img and b/disk.img differ diff --git a/program2.asm b/program2.asm index befce53..fc8dc98 100755 --- a/program2.asm +++ b/program2.asm @@ -56,10 +56,6 @@ start: mov si, msg2 call print - - - - call wait_for_key wait_for_key: @@ -90,5 +86,12 @@ over: jmp wait_for_key -msg1 db "POETIC SOFTWARE",0x0A,0 -msg2 db "testasdfjah lksjdhflkajshd lkjahs lkdjfhals khfdas ohne dieses wort und noch mehr whaaat",0x0D,0x0A,0 +msg1 db "PROJECTS",0x0D, 0x0A,0 +msg2 db "PROJECTS",0x0D, 0x0A,0 + +;project1 db "Alex / Poetic Software", 0x0A,0 +;project2 db "Tash / Silence Making", 0x0A,0 +;project3 db "Alice / F00d", 0x0A,0 +;project4 db "Joca / The ghost in the speaker", 0x0A,0 +;project5 db "Angeliki / Voices", 0x0A,0 +;project6 db "Zalan / Phantasmagoria", 0x0A,0 diff --git a/program2.bin b/program2.bin index 266d452..5d4abfd 100644 Binary files a/program2.bin and b/program2.bin differ