michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity
1,270 Commits 29 Branches 13 Tags
4101a0bd2e30fce8dbec67f0bded39f2760a7f0b
Commit Graph

184 Commits

Author SHA1 Message Date
Philipp Oppermann
881ad152a0 Merge branch 'post-06' into post-07 2019-09-11 10:58:19 +02:00
Philipp Oppermann
cb77074476 Merge branch 'post-05' into post-06 2019-09-11 10:58:02 +02:00
Philipp Oppermann
6771c2cc7f Merge branch 'post-03' into post-04 2019-09-11 10:57:21 +02:00
Philipp Oppermann
fe5e1fd92c Merge branch 'post-02' into post-03 2019-09-11 10:56:41 +02:00
Philipp Oppermann
ffd1bda509 Update bootloader to version 0.8.0 2019-09-11 10:55:49 +02:00
Philipp Oppermann
a7ef4012d0 Merge branch 'post-09' into post-10 2019-09-10 11:12:54 +02:00
Philipp Oppermann
cabbbec72f Merge branch 'post-08' into post-09 2019-09-10 11:12:54 +02:00
Philipp Oppermann
c2431ecf63 Merge branch 'post-06' into post-07 2019-09-10 11:12:54 +02:00
Philipp Oppermann
38cfb5e324 Merge branch 'post-05' into post-06 2019-09-10 11:12:54 +02:00
Philipp Oppermann
20ef920fc6 Add [package.metadata.bootimage] again 
Was accidentally removed when resolving a merge conflict.
 2019-09-10 11:12:47 +02:00
Philipp Oppermann
6f07c2b666 Merge branch 'post-09' into post-10 2019-09-10 10:21:14 +02:00
Philipp Oppermann
1dd7f03a7a Merge branch 'post-08' into post-09 2019-09-10 10:21:14 +02:00
Philipp Oppermann
c87b221f5e Merge branch 'post-06' into post-07 2019-09-10 10:21:14 +02:00
Philipp Oppermann
a9921e9448 Merge branch 'post-05' into post-06 2019-09-10 10:21:14 +02:00
Philipp Oppermann
9602f4e16d Merge branch 'post-03' into post-04 2019-09-10 10:21:08 +02:00
Philipp Oppermann
bfde53de79 Merge branch 'post-02' into post-03 2019-09-10 10:20:47 +02:00
Philipp Oppermann
7197d8b18a Remove old package.metadata.bootimage configuration key 2019-09-10 10:20:42 +02:00
Philipp Oppermann
e89c77398d Merge branch 'post-09' into post-10 2019-08-07 12:40:04 +02:00
Philipp Oppermann
66c4eae9cf Merge branch 'post-08' into post-09 2019-08-07 12:40:04 +02:00
Philipp Oppermann
6ab4b0170f Merge branch 'post-06' into post-07 2019-08-07 12:40:04 +02:00
Philipp Oppermann
9770d481f2 Merge branch 'post-05' into post-06 2019-08-07 12:40:04 +02:00
Philipp Oppermann
f1ae82b220 Disable the test harness for the should_panic test 2019-08-07 11:02:19 +02:00
Philipp Oppermann
f98145d556 Delete panic handler test 2019-08-07 10:38:46 +02:00
Philipp Oppermann
9651eb7a3b Merge branch 'post-09' into post-10 2019-07-18 10:17:50 +02:00
Philipp Oppermann
bc4ddcef05 Merge branch 'post-08' into post-09 2019-07-18 10:17:37 +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
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
5ed27923e8 Update to bootloader 0.6.4 2019-07-18 10:14:39 +02:00
Philipp Oppermann
d7484ab48b Use linked_list_allocator crate instead of dummy allocator 2019-06-26 15:05:57 +02:00
Philipp Oppermann
01040fc643 Merge branch 'post-05' into post-06 2019-05-09 14:59:55 +02:00
Philipp Oppermann
fbe279831e Merge branch 'post-08' into post-09 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
a2d36342c1 Merge branch 'post-06' into post-07 2019-05-03 18:36:45 +02:00
Philipp Oppermann
78e4b22a2f Merge branch 'post-08' into post-09 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
65dbb5ac48 Merge branch 'post-08-new' into post-09-new 2019-04-26 15:28:56 +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
ee3d2219ab Disable test harness for stack_overflow test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
ccb8b79ef8 Add a panic handler test 2019-04-26 13:42:20 +02:00
Philipp Oppermann
d4ebbc291a Hide QEMU in test mode 2019-04-26 13:41:19 +02:00
Philipp Oppermann
1559493802 Print test results over serial port 2019-04-26 13:41:19 +02:00
Philipp Oppermann
98a0e605be Interpret exit code 33 as test success 2019-04-26 13:41:19 +02:00
Philipp Oppermann
dbdd46da9a Exit qemu after running tests 2019-04-26 13:41:17 +02:00
Philipp Oppermann
16a314ab8d Merge branch 'post-02' into post-03 2019-04-26 11:24:17 +02:00