fixed weird merge issues

2025-02-22 03:29:33 +00:00
parent ae82e9c24b
commit bb5bf9115b
3 changed files with 3 additions and 14 deletions
@@ -18,8 +18,7 @@ static IDT: Lazy<InterruptDescriptorTable> = Lazy::new(|| {
    idt
 });

-<<<<<<< Updated upstream
-=======
+
 pub const PIC_1_OFFSET: u8 = 32;
 pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;

@@ -43,7 +42,7 @@ impl InterruptIndex {
    }
 }

->>>>>>> Stashed changes
+
 pub fn init_idt() {
    IDT.load();
    unsafe {
@@ -53,10 +52,6 @@ pub fn init_idt() {
 }

 extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
-<<<<<<< Updated upstream
-    println_log!("Exception: Breakpoint\n{:#?}", stack_frame);
-}
-=======
    serial_println!("Exception: Breakpoint\n{:#?}", stack_frame);
    println_log!("Exception: Breakpoint\n{:#?}", stack_frame);
 }
@@ -92,4 +87,4 @@ extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFr
            .notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
    }
 }
->>>>>>> Stashed changes
+