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
359 Commits 29 Branches 13 Tags
c2431ecf6362bb6c19d9fe76922f107b2dadabbf
Commit Graph

359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
aa084dd539 Merge branch 'post-04' into post-05 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
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
0d87aa7e98 Merge branch 'post-04' into post-05 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
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
6797b2b70e Merge branch 'post-04' into post-05 2019-08-07 12:40:04 +02:00
Philipp Oppermann
d3e4c55fc5 Merge pull request #651 from phil-opp/post-04-update 
Update post_04 branch for new should_panic test
 2019-08-07 12:39:19 +02:00
Philipp Oppermann
f1ae82b220 Disable the test harness for the should_panic test 2019-08-07 11:02:19 +02:00
Philipp Oppermann
aad98c0611 Add a should_panic test 2019-08-07 11:00:01 +02:00
Philipp Oppermann
f98145d556 Delete panic handler test 2019-08-07 10:38:46 +02:00
Philipp Oppermann
05248fe322 Merge branch 'post-06' into post-07 2019-07-22 10:36:37 +02:00
Philipp Oppermann
7baa3b0155 Merge branch 'post-05' into post-06 2019-07-22 10:36:23 +02:00
Philipp Oppermann
752a65e4da Merge branch 'post-04' into post-05 2019-07-22 10:36:23 +02:00
Philipp Oppermann
99ea302aaa Regenerate Cargo.lock 2019-07-22 10:36:11 +02:00
Philipp Oppermann
133f73ab0b Merge branch 'post-03' into post-04 2019-07-22 10:34:02 +02:00
Philipp Oppermann
298ec5f4b6 Merge branch 'post-02' into post-03 2019-07-22 10:33:24 +02:00
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