fmt

4 files changed, 12 insertions, 9 deletions

diff --git a/kernel/drivers/ata.c b/kernel/drivers/ata.c
index 022ec81..6c8de86 100644
--- a/kernel/drivers/ata.c
+++ b/kernel/drivers/ata.c
@@ -569,8 +569,7 @@ static enum ide_error ide_device_ata_access(struct ide_device *dev,
 		ide_channel_write(chan, ATA_REG_HDDEVSEL,
 						  0xE0 | (dev->drive_idx << 4) | head);
 	} else {
-		ide_channel_write(chan, ATA_REG_HDDEVSEL,
-						  0x40 | (dev->drive_idx << 4));
+		ide_channel_write(chan, ATA_REG_HDDEVSEL, 0x40 | (dev->drive_idx << 4));
 	}
 
 	// write Parameters
diff --git a/kernel/include/comus/asm.h b/kernel/include/comus/asm.h
index a6a8a45..4f376b1 100644
--- a/kernel/include/comus/asm.h
+++ b/kernel/include/comus/asm.h
@@ -36,7 +36,10 @@ static inline uint16_t inw(uint16_t port)
 
 static inline void rep_inw(uint16_t port, uint16_t *buffer, size_t count)
 {
-	__asm__ volatile("rep insw" : "+D"(buffer), "+c"(count) : "d"(port) : "memory");
+	__asm__ volatile("rep insw"
+					 : "+D"(buffer), "+c"(count)
+					 : "d"(port)
+					 : "memory");
 }
 
 static inline void outw(uint16_t port, uint16_t val)
diff --git a/kernel/syscall.c b/kernel/syscall.c
index 7a57353..11db5e5 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -13,8 +13,7 @@
 #define ARG3(type, name) type name = (type)(current_pcb->regs->rdx)
 #define ARG4(type, name) type name = (type)(current_pcb->regs->rcx)
 
-__attribute__((noreturn))
-static int sys_exit(void)
+__attribute__((noreturn)) static int sys_exit(void)
 {
 	ARG1(int, status);
 
@@ -57,8 +56,7 @@ static int sys_write(void)
 	return nbytes;
 }
 
-__attribute__((noreturn))
-static int sys_poweroff(void)
+__attribute__((noreturn)) static int sys_poweroff(void)
 {
 	// TODO: we should probably
 	// kill all user processes
diff --git a/user/apple.c b/user/apple.c
index d0a5cc4..000718c 100644
--- a/user/apple.c
+++ b/user/apple.c
@@ -8,7 +8,7 @@ INCBIN(APPLE, "data/apple.bin");
 #define APPLE_WIDTH 256
 #define APPLE_HEIGHT 144
 #define APPLE_FPS 12
-#define APPLE_FRAMES 5259
+#define APPLE_FRAMES 2630
 
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 
@@ -33,7 +33,10 @@ static void draw_frame(void)
 		}
 	}
 
-	frame = ((ticks() - ticks_off) / (1000 / APPLE_FPS)) % APPLE_FRAMES;
+	frame = ((ticks() - ticks_off) / (1000 / APPLE_FPS));
+
+	if (frame >= APPLE_FRAMES)
+		exit(0);
 }
 
 int main(void)