Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct example in 1201 #1627

Merged
merged 1 commit into from
Jun 2, 2016
Merged

Correct example in 1201 #1627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions text/1201-naked-fns.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ use std::sync::atomic::{self, AtomicUsize, Ordering};

#[naked]
#[cfg(target_arch="x86")]
unsafe fn isr_3() {
unsafe extern "C" fn isr_3() {
asm!("pushad
call increment_breakpoint_count
popad
Expand All @@ -159,7 +159,7 @@ pub fn increment_breakpoint_count() {
bp_count.fetch_add(1, Ordering::Relaxed);
}

fn register_isr(vector: u8, handler: fn() -> ()) { /* ... */ }
fn register_isr(vector: u8, handler: unsafe extern "C" fn() -> ()) { /* ... */ }

fn main() {
register_isr(3, isr_3);
Expand Down