michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity
536 Commits 29 Branches 13 Tags
067f2c9b394c5dff50797bc0c17ac61a6b3c692c
Commit Graph

536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philipp Oppermann
e86c95bd24 Run cargo update 2019-07-22 10:24:54 +02:00
Philipp Oppermann
ac2b6b1307 Merge branch 'post-06' into post-07 2019-07-18 10:17:10 +02:00
Philipp Oppermann
08bf4405a9 Merge branch 'post-05' into post-06 2019-07-18 10:17:05 +02:00
Philipp Oppermann
b6683d95ec Merge branch 'post-04' into post-05 2019-07-18 10:17:05 +02:00
Philipp Oppermann
28d5eeb9c4 Run cargo update 2019-07-18 10:17:01 +02:00
Philipp Oppermann
5adfe28cf4 Merge branch 'post-03' into post-04 2019-07-18 10:16:43 +02:00
Philipp Oppermann
ff8afb814e Merge branch 'post-02' into post-03 2019-07-18 10:16:01 +02:00
Philipp Oppermann
47bcca33b3 Run cargo update 2019-07-18 10:14:57 +02:00
Philipp Oppermann
5ed27923e8 Update to bootloader 0.6.4 2019-07-18 10:14:39 +02:00
Philipp Oppermann
262f56c9e2 Merge branch 'post-06' into post-07 2019-06-23 18:07:34 +02:00
Philipp Oppermann
9d5b5f33f1 Merge branch 'post-05' into post-06 2019-06-23 18:07:34 +02:00
Philipp Oppermann
a7710b3d5c Merge branch 'post-04' into post-05 2019-06-23 18:07:34 +02:00
Philipp Oppermann
d2e0d38218 Run brew update on macOS to fix travis CI failure (#623) 2019-06-23 18:07:19 +02:00
Philipp Oppermann
061dee44eb Merge branch 'post-06' into post-07 2019-06-17 17:28:32 +02:00
Philipp Oppermann
9b4b810bd3 Merge branch 'post-05' into post-06 2019-06-17 17:28:32 +02:00
Philipp Oppermann
618d10eac8 Merge branch 'post-04' into post-05 2019-06-17 17:28:32 +02:00
Philipp Oppermann
7003268b9f Merge branch 'post-03' into post-04 2019-06-17 17:28:32 +02:00
Philipp Oppermann
fcd849f471 Fix deprecated range syntax 2019-06-17 17:28:27 +02:00
Philipp Oppermann
fe35a21965 Merge branch 'post-06' into post-07 2019-05-23 12:39:35 +02:00
Philipp Oppermann
7a45083975 Merge branch 'post-05' into post-06 2019-05-23 12:39:35 +02:00
Philipp Oppermann
2faeaa8964 Merge branch 'post-04' into post-05 2019-05-23 12:39:35 +02:00
Philipp Oppermann
c8d1bbeef8 Update code for PR #611 
PR at https://github.com/phil-opp/blog_os/pull/611
 2019-05-22 12:43:15 +02:00
Philipp Oppermann
13923c59f2 Fix: Make keyboard port mutable 
This is required because of the update to x86_64 0.7.0 (see #606).
 2019-05-09 15:38:34 +02:00
Philipp Oppermann
01040fc643 Merge branch 'post-05' into post-06 2019-05-09 14:59:55 +02:00
Philipp Oppermann
2dfc5e838a Merge branch 'post-04' into post-05 2019-05-09 14:59:55 +02:00
Philipp Oppermann
09be8647d5 Merge branch 'post-06' into post-07 2019-05-09 14:59:55 +02:00
bors[bot]
158aed0c18 Merge #604 #606 
604: Use `-serial stdio` instead of `-serial mon:stdio` r=phil-opp a=phil-opp

Fixes #602 

Post update in https://github.com/phil-opp/blog_os/pull/605

606: Update x86_64 to version 0.7.0 r=phil-opp a=phil-opp

[Changelog](https://github.com/rust-osdev/x86_64/blob/master/Changelog.md#070):

- **Breaking**: `Port::read` and `PortReadOnly::read` now take `&mut self` instead of `&self` ([#76](https://github.com/rust-osdev/x86_64/pull/76)).

Post update in https://github.com/phil-opp/blog_os/pull/607

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
 2019-05-09 12:42:42 +00:00
Philipp Oppermann
3098be9653 Update x86_64 to version 0.7.0 2019-05-09 14:37:18 +02:00
Philipp Oppermann
86b57f696f Use -serial stdio instead of -serial mon:stdio 2019-05-08 16:10:23 +02:00
Philipp Oppermann
5a68816b45 Merge branch 'post-05' into post-06 2019-05-03 18:36:45 +02:00
Philipp Oppermann
12c08d72e4 Merge branch 'post-04' into post-05 2019-05-03 18:36:45 +02:00
Philipp Oppermann
a2d36342c1 Merge branch 'post-06' into post-07 2019-05-03 18:36:45 +02:00
Philipp Oppermann
ac9b661395 Update to x86_64 0.6.0 2019-05-03 18:36:39 +02:00
Philipp Oppermann
abf640254a Merge branch 'post-06-new' into post-07-new 2019-04-26 15:49:43 +02:00
Philipp Oppermann
111c3e1029 Comment out stack_overflow() call to keep cargo xtest working 2019-04-26 15:48:59 +02:00
Philipp Oppermann
8854b6b751 Move hlt_loop up to keep cfg(test) functions together 2019-04-26 15:25:41 +02:00
Philipp Oppermann
51cdc4db8b Use hlt_loop in lib.rs too 2019-04-26 15:25:41 +02:00
Philipp Oppermann
ae93dc18c3 Fix race condition in test_println_output test 2019-04-26 15:25:41 +02:00
Philipp Oppermann
acfdf929ad Move PIC initialization and interrupt::enable to blog_os::init 2019-04-26 15:25:41 +02:00
Philipp Oppermann
3e6f242b52 Update post number for Readme badge 2019-04-26 15:24:38 +02:00
Philipp Oppermann
ad6cb02d5c Merge branch 'post-06-new' into post-07-new-rebased 2019-04-26 15:24:28 +02:00
Philipp Oppermann
70d981e179 Simplify stack_overflow test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
ee3d2219ab Disable test harness for stack_overflow test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
c5a39e0902 Add a stack overflow integration test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
4774893a93 Call gdt::init from blog_os::init 2019-04-26 15:14:38 +02:00
Philipp Oppermann
3c59321b54 Remove old bootimage test integration test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
f5345db3e6 Update post number for Readme badge 2019-04-26 15:11:49 +02:00
Philipp Oppermann
94622ebfd5 Merge branch 'post-05-new' into post-06-new-rebased 2019-04-26 15:11:24 +02:00
Philipp Oppermann
53f3236754 Update post number for Readme badge 2019-04-26 15:09:17 +02:00
Philipp Oppermann
82014268da Merge branch 'post-05-new' into post-06-new-rebased 2019-04-26 15:05:55 +02:00