Misc minor improvements.

[seabios.git] / src / ioport.h

diff --git a/src/ioport.h b/src/ioport.h
index d756e34072c25e457fd762ff71ca9cee09aec137..0db987ce8f843f35dfaba017aa5e195a818eb6ea 100644 (file)
--- a/src/ioport.h
+++ b/src/ioport.h
@@ -14,7 +14,7 @@
 #define PORT_DMA1_MODE_REG     0x000b
 #define PORT_DMA1_CLEAR_FF_REG 0x000c
 #define PORT_DMA1_MASTER_CLEAR 0x000d
-#define PORT_PIC1              0x0020
+#define PORT_PIC1_CMD          0x0020
 #define PORT_PIC1_DATA         0x0021
 #define PORT_PIT_COUNTER0      0x0040
 #define PORT_PIT_COUNTER1      0x0041
@@ -28,7 +28,7 @@
 #define PORT_DIAG              0x0080
 #define PORT_DMA_PAGE_2        0x0081
 #define PORT_A20               0x0092
-#define PORT_PIC2              0x00a0
+#define PORT_PIC2_CMD          0x00a0
 #define PORT_PIC2_DATA         0x00a1
 #define PORT_DMA2_MASK_REG     0x00d4
 #define PORT_DMA2_MODE_REG     0x00d6
@@ -37,12 +37,12 @@
 #define PORT_FD_DOR            0x03f2
 #define PORT_FD_STATUS         0x03f4
 #define PORT_FD_DATA           0x03f5
-
-// PORT_PIC1 bitdefs
-#define PIC1_IRQ5  (1<<5)
-// PORT_PIC2 bitdefs
-#define PIC2_IRQ8  (1<<0)
-#define PIC2_IRQ13 (1<<5)
+#define PORT_HD_DATA           0x03f6
+#define PORT_FD_DIR            0x03f7
+#define PORT_PCI_CMD           0x0cf8
+#define PORT_PCI_DATA          0x0cfc
+#define PORT_BIOS_DEBUG        0x0402
+#define PORT_BIOS_APM          0x8900
 
 // PORT_KBD_CTRLB bitdefs
 #define KBD_REFRESH (1<<4)
@@ -73,4 +73,30 @@ static inline u32 inl(u16 port) {
     return value;
 }
 
+static inline void insb(u16 port, u8 *data, u32 count) {
+    asm volatile("rep insb (%%dx), %%es:(%%di)"
+                 : "+c"(count), "+D"(data) : "d"(port) : "memory");
+}
+static inline void insw(u16 port, u16 *data, u32 count) {
+    asm volatile("rep insw (%%dx), %%es:(%%di)"
+                 : "+c"(count), "+D"(data) : "d"(port) : "memory");
+}
+static inline void insl(u16 port, u32 *data, u32 count) {
+    asm volatile("rep insl (%%dx), %%es:(%%di)"
+                 : "+c"(count), "+D"(data) : "d"(port) : "memory");
+}
+// XXX - outs not limited to es segment
+static inline void outsb(u16 port, u8 *data, u32 count) {
+    asm volatile("rep outsb %%es:(%%si), (%%dx)"
+                 : "+c"(count), "+S"(data) : "d"(port) : "memory");
+}
+static inline void outsw(u16 port, u16 *data, u32 count) {
+    asm volatile("rep outsw %%es:(%%si), (%%dx)"
+                 : "+c"(count), "+S"(data) : "d"(port) : "memory");
+}
+static inline void outsl(u16 port, u32 *data, u32 count) {
+    asm volatile("rep outsl %%es:(%%si), (%%dx)"
+                 : "+c"(count), "+S"(data) : "d"(port) : "memory");
+}
+
 #endif // ioport.h