Very Computer

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/i386/kernel/apm.c linux-2.5.67-ac1/arch/i386/kernel/apm.c
--- linux-2.5.67/arch/i386/kernel/apm.c 2003-04-08 00:37:34.000000000 +0100

 #include <asm/uaccess.h>
 #include <asm/desc.h>

+#include "io_ports.h"
+
 extern spinlock_t i8253_lock;
 extern unsigned long get_cmos_time(void);

  */
 #define APM_ZERO_SEGS

+#include "apm.h"
+
 /*
  * Define to make all _set_limit calls use 64k limits.  The APM 1.1 BIOS is

                unsigned int saved_fs; unsigned int saved_gs;
 #      define APM_DO_SAVE_SEGS \
                savesegment(fs, saved_fs); savesegment(gs, saved_gs)
-#      define APM_DO_ZERO_SEGS \
-               "pushl %%ds\n\t" \
-               "pushl %%es\n\t" \
-               "xorl %%edx, %%edx\n\t" \
-               "mov %%dx, %%ds\n\t" \
-               "mov %%dx, %%es\n\t" \
-               "mov %%dx, %%fs\n\t" \
-               "mov %%dx, %%gs\n\t"
-#      define APM_DO_POP_SEGS \
-               "popl %%es\n\t" \
-               "popl %%ds\n\t"
 #      define APM_DO_RESTORE_SEGS \
                loadsegment(fs, saved_fs); loadsegment(gs, saved_gs)
 #else
 #      define APM_DECL_SEGS
 #      define APM_DO_SAVE_SEGS
-#      define APM_DO_ZERO_SEGS
-#      define APM_DO_POP_SEGS
 #      define APM_DO_RESTORE_SEGS
 #endif

        local_save_flags(flags);
        APM_DO_CLI;
        APM_DO_SAVE_SEGS;
-       /*
-        * N.B. We do NOT need a cld after the BIOS call
-        * because we always save and restore the flags.
-        */
-       __asm__ __volatile__(APM_DO_ZERO_SEGS
-               "pushl %%edi\n\t"
-               "pushl %%ebp\n\t"
-               "lcall *%%cs:apm_bios_entry\n\t"
-               "setc %%al\n\t"
-               "popl %%ebp\n\t"
-               "popl %%edi\n\t"
-               APM_DO_POP_SEGS
-               : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx),
-                 "=S" (*esi)
-               : "a" (func), "b" (ebx_in), "c" (ecx_in)
-               : "memory", "cc");
+       apm_bios_call_asm(func, ebx_in, ecx_in, eax, ebx, ecx, edx, esi);
        APM_DO_RESTORE_SEGS;
        local_irq_restore(flags);

        local_save_flags(flags);
        APM_DO_CLI;
        APM_DO_SAVE_SEGS;
-       {
-               int     cx, dx, si;
-
-               /*
-                * N.B. We do NOT need a cld after the BIOS call
-                * because we always save and restore the flags.
-                */
-               __asm__ __volatile__(APM_DO_ZERO_SEGS
-                       "pushl %%edi\n\t"
-                       "pushl %%ebp\n\t"
-                       "lcall *%%cs:apm_bios_entry\n\t"
-                       "setc %%bl\n\t"
-                       "popl %%ebp\n\t"
-                       "popl %%edi\n\t"
-                       APM_DO_POP_SEGS
-                       : "=a" (*eax), "=b" (error), "=c" (cx), "=d" (dx),
-                         "=S" (si)
-                       : "a" (func), "b" (ebx_in), "c" (ecx_in)
-                       : "memory", "cc");
-       }
+       error = apm_bios_call_simple_asm(func, ebx_in, ecx_in, eax);
        APM_DO_RESTORE_SEGS;
        local_irq_restore(flags);

 {
 #ifdef INIT_TIMER_AFTER_SUSPEND
        /* set the clock to 100 Hz */
-       outb_p(0x34,0x43);              /* binary, mode 2, LSB/MSB, ch 0 */
+       outb_p(0x34, PIT_MODE);         /* binary, mode 2, LSB/MSB, ch 0 */
        udelay(10);
-       outb_p(LATCH & 0xff , 0x40);        /* LSB */
+       outb_p(LATCH & 0xff, PIT_CH0);      /* LSB */
        udelay(10);
-       outb(LATCH >> 8 , 0x40);  /* MSB */
+       outb(LATCH >> 8, PIT_CH0);        /* MSB */
        udelay(10);
 #endif
 }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/