Commit f25be5cb authored by James Simmons's avatar James Simmons

Merge maxwell.earthlink.net:/usr/src/linus-2.5

into maxwell.earthlink.net:/usr/src/fbdev-2.5
parents c72757b4 8c977c50
......@@ -61,6 +61,7 @@ o pcmcia-cs 3.1.21 # cardmgr -V
o PPP 2.4.0 # pppd --version
o isdn4k-utils 3.1pre1 # isdnctrl 2>&1|grep version
o procps 2.0.9 # ps --version
o oprofile 0.5 # oprofiled --version
Kernel compilation
==================
......@@ -368,6 +369,10 @@ Ip-route2
---------
o <ftp://ftp.inr.ac.ru/ip-routing/iproute2-2.2.4-now-ss991023.tar.gz>
OProfile
--------
o <http://oprofile.sf.net/download.php3>
Suggestions and corrections
===========================
......
This diff is collapsed.
This document describes standard names of mixer controls.
Syntax: SOURCE [DIRECTION] FUNCTION
DIRECTION:
<nothing> (both directions)
Playback
Capture
Bypass Playback
Bypass Capture
FUNCTION:
Switch (on/off switch)
Volume
Route (route control, hardware specific)
SOURCE:
Master
Master Mono
Hardware Master
Headphone
PC Speaker
Phone
Phone Input
Phone Output
Synth
FM
Mic
Line
CD
Video
Zoom Video
Aux
PCM
PCM Front
PCM Rear
PCM Pan
Loopback
Analog Loopback (D/A -> A/D loopback)
Digital Loopback (playback -> capture loopback - without analog path)
Mono
Mono Output
Multi
ADC
Wave
Music
I2S
IEC958
Exceptions:
[Digital] Capture Source
[Digital] Capture Switch (aka input gain switch)
[Digital] Capture Volume (aka input gain volume)
[Digital] Playback Switch (aka output gain switch)
[Digital] Playback Volume (aka output gain volume)
Tone Control - Switch
Tone Control - Bass
Tone Control - Treble
3D Control - Switch
3D Control - Center
3D Control - Depth
3D Control - Wide
3D Control - Space
3D Control - Level
Mic Boost [(?dB)]
PCM interface:
Sample Clock Source { "Word", "Internal", "AutoSync" }
Clock Sync Status { "Lock", "Sync", "No Lock" }
External Rate /* external capture rate */
Capture Rate /* capture rate taken from external source */
IEC958 (S/PDIF) interface:
IEC958 [...] [Playback|Capture] Switch /* turn on/off the IEC958 interface */
IEC958 [...] [Playback|Capture] Volume /* digital volume control */
IEC958 [...] [Playback|Capture] Default /* default or global value - read/write */
IEC958 [...] [Playback|Capture] Mask /* consumer and professional mask */
IEC958 [...] [Playback|Capture] Con Mask /* consumer mask */
IEC958 [...] [Playback|Capture] Pro Mask /* professional mask */
IEC958 [...] [Playback|Capture] PCM Stream /* the settings assigned to a PCM stream */
......@@ -638,7 +638,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
got_exception:
/* Ok, we caught the exception, but we don't want it. Is there
someone to pass it along to? */
if ((fixup = search_exception_table(pc, regs.gp)) != 0) {
if ((fixup = search_exception_table(pc)) != 0) {
unsigned long newpc;
newpc = fixup_exception(una_reg, fixup, pc);
......
......@@ -29,7 +29,7 @@
#define EX(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda $31, $exception-99b($31); \
.previous
......@@ -80,7 +80,6 @@ $tail:
ret $31, ($28), 1 # .. e1 :
__do_clear_user:
ldgp $29,0($27) # we do exceptions -- we need the gp.
and $6, 7, $4 # e0 : find dest misalignment
beq $0, $zerolength # .. e1 :
addq $0, $4, $1 # e0 : bias counter
......
......@@ -30,29 +30,28 @@
#define EXI(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda $31, $exitin-99b($31); \
.previous
#define EXO(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda $31, $exitout-99b($31); \
.previous
.set noat
.align 3
.align 4
.globl __copy_user
.ent __copy_user
__copy_user:
ldgp $29,0($27) # we do exceptions -- we need the gp.
.prologue 1
.prologue 0
and $6,7,$3
beq $0,$35
beq $3,$36
subq $3,8,$3
.align 5
.align 4
$37:
EXI( ldq_u $1,0($7) )
EXO( ldq_u $2,0($6) )
......@@ -73,7 +72,7 @@ $36:
beq $1,$43
beq $4,$48
EXI( ldq_u $3,0($7) )
.align 5
.align 4
$50:
EXI( ldq_u $2,8($7) )
subq $4,8,$4
......@@ -88,7 +87,7 @@ $50:
bne $4,$50
$48:
beq $0,$41
.align 5
.align 4
$57:
EXI( ldq_u $1,0($7) )
EXO( ldq_u $2,0($6) )
......@@ -105,7 +104,7 @@ $57:
.align 4
$43:
beq $4,$65
.align 5
.align 4
$66:
EXI( ldq $1,0($7) )
subq $4,8,$4
......
......@@ -47,7 +47,7 @@
#define EX(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda $31, $exception-99b($31); \
.previous
......@@ -62,9 +62,6 @@
# Pipeline info : Slotting & Comments
__do_clear_user:
ldgp $29,0($27) # we do exceptions -- we need the gp.
# Macro instruction becomes ldah/lda
# .. .. E E :
and $6, 7, $4 # .. E .. .. : find dest head misalignment
beq $0, $zerolength # U .. .. .. : U L U L
......
......@@ -41,14 +41,14 @@
#define EXI(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda $31, $exitin-99b($31); \
.previous
#define EXO(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda $31, $exitout-99b($31); \
.previous
......@@ -58,10 +58,7 @@
.ent __copy_user
# Pipeline info: Slotting & Comments
__copy_user:
ldgp $29,0($27) # we do exceptions -- we need the gp.
# Macro instruction becomes ldah/lda
# .. .. E E
.prologue 1
.prologue 0
subq $0, 32, $1 # .. E .. .. : Is this going to be a small copy?
beq $0, $zerolength # U .. .. .. : U L U L
......
......@@ -34,7 +34,7 @@
#define EX(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda $31, $exception-99b($0); \
.previous
......@@ -46,11 +46,10 @@
.globl __strncpy_from_user
.ent __strncpy_from_user
.frame $30, 0, $26
.prologue 1
.prologue 0
.align 4
__strncpy_from_user:
ldgp $29, 0($27) # E E : becomes 2 instructions (for exceptions)
and a0, 7, t3 # E : find dest misalignment
beq a2, $zerolength # U :
......
......@@ -30,7 +30,7 @@
#define EX(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda v0, $exception-99b(zero); \
.previous
......@@ -56,9 +56,7 @@ __strlen_user:
.align 4
__strnlen_user:
ldgp $29,0($27) # E E : we do exceptions -- we need the gp.
/* Decomposes into lda/ldah */
.prologue 1
.prologue 0
EX( ldq_u t0, 0(a0) ) # L : load first quadword (a0 may be misaligned)
lda t1, -1(zero) # E :
......
......@@ -19,7 +19,7 @@
#define EX(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda v0, $exception-99b(zero); \
.previous
......@@ -42,8 +42,7 @@ __strlen_user:
.align 3
__strnlen_user:
ldgp $29,0($27) # we do exceptions -- we need the gp.
.prologue 1
.prologue 0
EX( ldq_u t0, 0(a0) ) # load first quadword (a0 may be misaligned)
lda t1, -1(zero)
......
......@@ -19,7 +19,7 @@
#define EX(x,y...) \
99: x,##y; \
.section __ex_table,"a"; \
.gprel32 99b; \
.long 99b - .; \
lda $31, $exception-99b($0); \
.previous
......@@ -31,7 +31,7 @@
.globl __strncpy_from_user
.ent __strncpy_from_user
.frame $30, 0, $26
.prologue 1
.prologue 0
.align 3
$aligned:
......@@ -100,8 +100,6 @@ $a_eoc:
/*** The Function Entry Point ***/
.align 3
__strncpy_from_user:
ldgp $29, 0($27) # we do exceptions -- we need the gp.
mov a0, v0 # save the string start
beq a2, $zerolength
......
......@@ -12,21 +12,17 @@ extern const struct exception_table_entry __stop___ex_table[];
static inline unsigned
search_one_table(const struct exception_table_entry *first,
const struct exception_table_entry *last,
signed long value)
unsigned long value)
{
/* Abort early if the search value is out of range. */
if (value != (signed int)value)
return 0;
while (first <= last) {
const struct exception_table_entry *mid;
long diff;
unsigned long mid_value;
mid = (last - first) / 2 + first;
diff = mid->insn - value;
if (diff == 0)
mid_value = (unsigned long)&mid->insn + mid->insn;
if (mid_value == value)
return mid->fixup.unit;
else if (diff < 0)
else if (mid_value < value)
first = mid+1;
else
last = mid-1;
......@@ -34,48 +30,13 @@ search_one_table(const struct exception_table_entry *first,
return 0;
}
register unsigned long gp __asm__("$29");
static unsigned
search_exception_table_without_gp(unsigned long addr)
{
unsigned ret;
#ifndef CONFIG_MODULES
/* There is only the kernel to search. */
ret = search_one_table(__start___ex_table, __stop___ex_table - 1,
addr - gp);
#else
extern spinlock_t modlist_lock;
unsigned long flags;
/* The kernel is the last "module" -- no need to treat it special. */
struct module *mp;
ret = 0;
spin_lock_irqsave(&modlist_lock, flags);
for (mp = module_list; mp ; mp = mp->next) {
if (!mp->ex_table_start || !(mp->flags&(MOD_RUNNING|MOD_INITIALIZING)))
continue;
ret = search_one_table(mp->ex_table_start,
mp->ex_table_end - 1, addr - mp->gp);
if (ret)
break;
}
spin_unlock_irqrestore(&modlist_lock, flags);
#endif
return ret;
}
unsigned
search_exception_table(unsigned long addr, unsigned long exc_gp)
search_exception_table(unsigned long addr)
{
unsigned ret;
#ifndef CONFIG_MODULES
ret = search_one_table(__start___ex_table, __stop___ex_table - 1,
addr - exc_gp);
if (ret) return ret;
ret = search_one_table(__start___ex_table, __stop___ex_table-1, addr);
#else
extern spinlock_t modlist_lock;
unsigned long flags;
......@@ -88,25 +49,12 @@ search_exception_table(unsigned long addr, unsigned long exc_gp)
if (!mp->ex_table_start || !(mp->flags&(MOD_RUNNING|MOD_INITIALIZING)))
continue;
ret = search_one_table(mp->ex_table_start,
mp->ex_table_end - 1, addr - exc_gp);
mp->ex_table_end - 1, addr);
if (ret)
break;
}
spin_unlock_irqrestore(&modlist_lock, flags);
if (ret) return ret;
#endif
/*
* The search failed with the exception gp. To be safe, try the
* old method before giving up.
*/
ret = search_exception_table_without_gp(addr);
if (ret) {
printk(KERN_ALERT "%s: [%lx] EX_TABLE search fail with"
"exc frame GP, success with raw GP\n",
current->comm, addr);
return ret;
}
return 0;
return ret;
}
......@@ -176,7 +176,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
no_context:
/* Are we prepared to handle this fault as an exception? */
if ((fixup = search_exception_table(regs->pc, regs->gp)) != 0) {
if ((fixup = search_exception_table(regs->pc)) != 0) {
unsigned long newpc;
newpc = fixup_exception(dpf_reg, fixup, regs->pc);
regs->pc = newpc;
......
......@@ -1553,7 +1553,6 @@ config DEBUG_HIGHMEM
config KALLSYMS
bool "Load all symbols for debugging/kksymoops"
depends on DEBUG_KERNEL
help
Say Y here to let the kernel print out symbolic crash information and
symbolic stack backtraces. This increases the size of the kernel
......
......@@ -47,6 +47,7 @@
#include <asm/errno.h>
#include <asm/segment.h>
#include <asm/smp.h>
#include <asm/page.h>
#include "irq_vectors.h"
EBX = 0x00
......@@ -232,7 +233,7 @@ need_resched:
#endif
/* Points to after the "sysenter" instruction in the vsyscall page */
#define SYSENTER_RETURN 0xfffff007
#define SYSENTER_RETURN 0xffffe00a
# sysenter call handler stub
ALIGN
......@@ -244,6 +245,18 @@ ENTRY(sysenter_entry)
pushl $(__USER_CS)
pushl $SYSENTER_RETURN
/*
* Load the potential sixth argument from user stack.
* Careful about security.
*/
cmpl $__PAGE_OFFSET-3,%ebp
jae syscall_badsys
1: movl (%ebp),%ebp
.section __ex_table,"a"
.align 4
.long 1b,syscall_badsys
.previous
pushl %eax
SAVE_ALL
GET_THREAD_INFO(%ebx)
......
......@@ -44,6 +44,7 @@
#include <asm/ldt.h>
#include <asm/processor.h>
#include <asm/i387.h>
#include <asm/irq.h>
#include <asm/desc.h>
#ifdef CONFIG_MATH_EMULATION
#include <asm/math_emu.h>
......@@ -269,6 +270,8 @@ void release_thread(struct task_struct *dead_task)
BUG();
}
}
release_x86_irqs(dead_task);
}
/*
......
......@@ -9,6 +9,7 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/thread_info.h>
#include <linux/sched.h>
#include <linux/gfp.h>
#include <linux/string.h>
......@@ -18,24 +19,55 @@
extern asmlinkage void sysenter_entry(void);
/*
* Create a per-cpu fake "SEP thread" stack, so that we can
* enter the kernel without having to worry about things like
* "current" etc not working (debug traps and NMI's can happen
* before we can switch over to the "real" thread).
*
* Return the resulting fake stack pointer.
*/
struct fake_sep_struct {
struct thread_info thread;
struct task_struct task;
unsigned char trampoline[32] __attribute__((aligned(1024)));
unsigned char stack[0];
} __attribute__((aligned(8192)));
static struct fake_sep_struct *alloc_sep_thread(int cpu)
{
struct fake_sep_struct *entry;
entry = (struct fake_sep_struct *) __get_free_pages(GFP_ATOMIC, 1);
if (!entry)
return NULL;
memset(entry, 0, PAGE_SIZE<<1);
entry->thread.task = &entry->task;
entry->task.thread_info = &entry->thread;
entry->thread.preempt_count = 1;
entry->thread.cpu = cpu;
return entry;
}
static void __init enable_sep_cpu(void *info)
{
unsigned long page = __get_free_page(GFP_ATOMIC);
int cpu = get_cpu();
struct fake_sep_struct *sep = alloc_sep_thread(cpu);
unsigned long *esp0_ptr = &(init_tss + cpu)->esp0;
unsigned long rel32;
rel32 = (unsigned long) sysenter_entry - (page+11);
rel32 = (unsigned long) sysenter_entry - (unsigned long) (sep->trampoline+11);
*(short *) (page+0) = 0x258b; /* movl xxxxx,%esp */
*(long **) (page+2) = esp0_ptr;
*(char *) (page+6) = 0xe9; /* jmp rl32 */
*(long *) (page+7) = rel32;
*(short *) (sep->trampoline+0) = 0x258b; /* movl xxxxx,%esp */
*(long **) (sep->trampoline+2) = esp0_ptr;
*(char *) (sep->trampoline+6) = 0xe9; /* jmp rl32 */
*(long *) (sep->trampoline+7) = rel32;
wrmsr(0x174, __KERNEL_CS, 0); /* SYSENTER_CS_MSR */
wrmsr(0x175, page+PAGE_SIZE, 0); /* SYSENTER_ESP_MSR */
wrmsr(0x176, page, 0); /* SYSENTER_EIP_MSR */
wrmsr(0x174, __KERNEL_CS, 0); /* SYSENTER_CS_MSR */
wrmsr(0x175, PAGE_SIZE*2 + (unsigned long) sep, 0); /* SYSENTER_ESP_MSR */
wrmsr(0x176, (unsigned long) &sep->trampoline, 0); /* SYSENTER_EIP_MSR */
printk("Enabling SEP on CPU %d\n", cpu);
put_cpu();
......@@ -48,14 +80,19 @@ static int __init sysenter_setup(void)
0xc3 /* ret */
};
static const char sysent[] = {
0x55, /* push %ebp */
0x9c, /* pushf */
0x51, /* push %ecx */
0x52, /* push %edx */
0x55, /* push %ebp */
0x89, 0xe5, /* movl %esp,%ebp */
0x0f, 0x34, /* sysenter */
/* System call restart point is here! (SYSENTER_RETURN - 2) */
0xeb, 0xfa, /* jmp to "movl %esp,%ebp" */
/* System call normal return point is here! (SYSENTER_RETURN in entry.S) */
0x5d, /* pop %ebp */
0x5a, /* pop %edx */
0x59, /* pop %ecx */
0x5d, /* pop %ebp */
0x9d, /* popf - restore TF */
0xc3 /* ret */
};
unsigned long page = get_zeroed_page(GFP_ATOMIC);
......
......@@ -708,23 +708,6 @@ static inline void free_vm86_irq(int irqnumber)
spin_unlock_irqrestore(&irqbits_lock, flags);
}
static inline int task_valid(struct task_struct *tsk)
{
struct task_struct *g, *p;
int ret = 0;
read_lock(&tasklist_lock);
do_each_thread(g, p)
if ((p == tsk) && (p->sig)) {
ret = 1;
goto out;
}
while_each_thread(g, p);
out:
read_unlock(&tasklist_lock);
return ret;
}
void release_x86_irqs(struct task_struct *task)
{
int i;
......@@ -733,17 +716,6 @@ void release_x86_irqs(struct task_struct *task)
free_vm86_irq(i);
}
static inline void handle_irq_zombies(void)
{
int i;
for (i=3; i<16; i++) {
if (vm86_irqs[i].tsk) {
if (task_valid(vm86_irqs[i].tsk)) continue;
free_vm86_irq(i);
}
}
}
static inline int get_and_reset_irq(int irqnumber)
{
int bit;
......@@ -772,7 +744,6 @@ static int do_vm86_irq_handling(int subfunction, int irqnumber)
case VM86_REQUEST_IRQ: {
int sig = irqnumber >> 8;
int irq = irqnumber & 255;
handle_irq_zombies();
if (!capable(CAP_SYS_ADMIN)) return -EPERM;
if (!((1 << sig) & ALLOWED_SIGS)) return -EPERM;
if ( (irq<3) || (irq>15) ) return -EPERM;
......@@ -784,7 +755,6 @@ static int do_vm86_irq_handling(int subfunction, int irqnumber)
return irq;
}
case VM86_FREE_IRQ: {
handle_irq_zombies();
if ( (irqnumber<3) || (irqnumber>15) ) return -EPERM;
if (!vm86_irqs[irqnumber].tsk) return 0;
if (vm86_irqs[irqnumber].tsk != current) return -EPERM;
......
......@@ -7,7 +7,6 @@
* @author John Levon <levon@movementarian.org>
*/
#include <linux/kernel.h>
#include <linux/oprofile.h>
#include <linux/init.h>
......
......@@ -7,19 +7,13 @@
* @author John Levon <levon@movementarian.org>
*/
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/notifier.h>
#include <linux/smp.h>
#include <linux/oprofile.h>
#include <linux/pm.h>
#include <linux/thread_info.h>
#include <asm/nmi.h>
#include <asm/ptrace.h>
#include <asm/msr.h>
#include <asm/apic.h>
#include <asm/bitops.h>
#include <asm/processor.h>
#include "op_counter.h"
#include "op_x86_model.h"
......@@ -27,7 +21,6 @@
static struct op_x86_model_spec const * model;
static struct op_msrs cpu_msrs[NR_CPUS];
static unsigned long saved_lvtpc[NR_CPUS];
static unsigned long kernel_only;
static int nmi_start(void);
static void nmi_stop(void);
......@@ -53,10 +46,9 @@ static int oprofile_pm_callback(struct pm_dev * dev,
}
// FIXME: kernel_only
static int nmi_callback(struct pt_regs * regs, int cpu)
{
return (model->check_ctrs(cpu, &cpu_msrs[cpu], regs));
return model->check_ctrs(cpu, &cpu_msrs[cpu], regs);
}
......@@ -210,7 +202,6 @@ static int nmi_create_files(struct super_block * sb, struct dentry * root)
oprofilefs_create_ulong(sb, dir, "user", &counter_config[i].user);
}
oprofilefs_create_ulong(sb, root, "kernel_only", &kernel_only);
return 0;
}
......
......@@ -183,8 +183,10 @@ acpi_ac_remove_fs (
{
ACPI_FUNCTION_TRACE("acpi_ac_remove_fs");
if (acpi_device_dir(device))
if (acpi_device_dir(device)) {
remove_proc_entry(acpi_device_bid(device), acpi_ac_dir);
acpi_device_dir(device) = NULL;
}
return_VALUE(0);
}
......
......@@ -669,8 +669,10 @@ acpi_battery_remove_fs (
{
ACPI_FUNCTION_TRACE("acpi_battery_remove_fs");
if (acpi_device_dir(device))
if (acpi_device_dir(device)) {
remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
acpi_device_dir(device) = NULL;
}
return_VALUE(0);
}
......
......@@ -179,8 +179,10 @@ acpi_button_remove_fs (
{
ACPI_FUNCTION_TRACE("acpi_button_remove_fs");
if (acpi_device_dir(device))
if (acpi_device_dir(device)) {
remove_proc_entry(acpi_device_bid(device), acpi_button_dir);
acpi_device_dir(device) = NULL;
}
return_VALUE(0);
}
......
/******************************************************************************
*
* Module Name: dsfield - Dispatcher field routines
* $Revision: 70 $
*
*****************************************************************************/
......@@ -38,21 +37,21 @@
/*******************************************************************************
*
* FUNCTION: Acpi_ds_create_buffer_field
* FUNCTION: acpi_ds_create_buffer_field
*
* PARAMETERS: Opcode - The opcode to be executed
* Operands - List of operands for the opcode
* Walk_state - Current state
* walk_state - Current state
*
* RETURN: Status
*
* DESCRIPTION: Execute the Create_field operators:
* Create_bit_field_op,
* Create_byte_field_op,
* Create_word_field_op,
* Create_dWord_field_op,
* Create_qWord_field_op,
* Create_field_op (all of which define fields in buffers)
* DESCRIPTION: Execute the create_field operators:
* create_bit_field_op,
* create_byte_field_op,
* create_word_field_op,
* create_dword_field_op,
* create_qword_field_op,
* create_field_op (all of which define fields in buffers)
*
******************************************************************************/
......@@ -69,10 +68,10 @@ acpi_ds_create_buffer_field (
u32 flags;
ACPI_FUNCTION_TRACE ("Ds_create_buffer_field");
ACPI_FUNCTION_TRACE ("ds_create_buffer_field");
/* Get the Name_string argument */
/* Get the name_string argument */
if (op->common.aml_opcode == AML_CREATE_FIELD_OP) {
arg = acpi_ps_get_arg (op, 3);
......@@ -100,7 +99,7 @@ acpi_ds_create_buffer_field (
}
/*
* Enter the Name_string into the namespace
* Enter the name_string into the namespace
*/
status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.string,
ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS1,
......@@ -168,10 +167,10 @@ acpi_ds_create_buffer_field (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_get_field_names
* FUNCTION: acpi_ds_get_field_names
*
* PARAMETERS: Info - Create_field info structure
* ` Walk_state - Current method state
* PARAMETERS: Info - create_field info structure
* ` walk_state - Current method state
* Arg - First parser arg for the field name list
*
* RETURN: Status
......@@ -183,7 +182,7 @@ acpi_ds_create_buffer_field (
acpi_status
acpi_ds_get_field_names (
ACPI_CREATE_FIELD_INFO *info,
acpi_create_field_info *info,
acpi_walk_state *walk_state,
acpi_parse_object *arg)
{
......@@ -191,7 +190,7 @@ acpi_ds_get_field_names (
acpi_integer position;
ACPI_FUNCTION_TRACE_PTR ("Ds_get_field_names", info);
ACPI_FUNCTION_TRACE_PTR ("ds_get_field_names", info);
/* First field starts at bit zero */
......@@ -204,7 +203,7 @@ acpi_ds_get_field_names (
/*
* Three types of field elements are handled:
* 1) Offset - specifies a bit offset
* 2) Access_as - changes the access mode
* 2) access_as - changes the access mode
* 3) Name - Enters a new named field into the namespace
*/
switch (arg->common.aml_opcode) {
......@@ -225,10 +224,10 @@ acpi_ds_get_field_names (
case AML_INT_ACCESSFIELD_OP:
/*
* Get a new Access_type and Access_attribute -- to be used for all
* field units that follow, until field end or another Access_as keyword.
* Get a new access_type and access_attribute -- to be used for all
* field units that follow, until field end or another access_as keyword.
*
* In Field_flags, preserve the flag bits other than the ACCESS_TYPE bits
* In field_flags, preserve the flag bits other than the ACCESS_TYPE bits
*/
info->field_flags = (u8) ((info->field_flags & ~(AML_FIELD_ACCESS_TYPE_MASK)) |
((u8) (arg->common.value.integer32 >> 8)));
......@@ -296,11 +295,11 @@ acpi_ds_get_field_names (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_create_field
* FUNCTION: acpi_ds_create_field
*
* PARAMETERS: Op - Op containing the Field definition and args
* Region_node - Object for the containing Operation Region
* ` Walk_state - Current method state
* region_node - Object for the containing Operation Region
* ` walk_state - Current method state
*
* RETURN: Status
*
......@@ -316,13 +315,13 @@ acpi_ds_create_field (
{
acpi_status status;
acpi_parse_object *arg;
ACPI_CREATE_FIELD_INFO info;
acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_field", op);
ACPI_FUNCTION_TRACE_PTR ("ds_create_field", op);
/* First arg is the name of the parent Op_region (must already exist) */
/* First arg is the name of the parent op_region (must already exist) */
arg = op->common.value.arg;
if (!region_node) {
......@@ -354,10 +353,10 @@ acpi_ds_create_field (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_init_field_objects
* FUNCTION: acpi_ds_init_field_objects
*
* PARAMETERS: Op - Op containing the Field definition and args
* ` Walk_state - Current method state
* ` walk_state - Current method state
*
* RETURN: Status
*
......@@ -378,7 +377,7 @@ acpi_ds_init_field_objects (
u8 type = 0;
ACPI_FUNCTION_TRACE_PTR ("Ds_init_field_objects", op);
ACPI_FUNCTION_TRACE_PTR ("ds_init_field_objects", op);
switch (walk_state->opcode) {
......@@ -402,7 +401,7 @@ acpi_ds_init_field_objects (
}
/*
* Walk the list of entries in the Field_list
* Walk the list of entries in the field_list
*/
while (arg) {
/* Ignore OFFSET and ACCESSAS terms here */
......@@ -438,11 +437,11 @@ acpi_ds_init_field_objects (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_create_bank_field
* FUNCTION: acpi_ds_create_bank_field
*
* PARAMETERS: Op - Op containing the Field definition and args
* Region_node - Object for the containing Operation Region
* ` Walk_state - Current method state
* region_node - Object for the containing Operation Region
* ` walk_state - Current method state
*
* RETURN: Status
*
......@@ -458,13 +457,13 @@ acpi_ds_create_bank_field (
{
acpi_status status;
acpi_parse_object *arg;
ACPI_CREATE_FIELD_INFO info;
acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_bank_field", op);
ACPI_FUNCTION_TRACE_PTR ("ds_create_bank_field", op);
/* First arg is the name of the parent Op_region (must already exist) */
/* First arg is the name of the parent op_region (must already exist) */
arg = op->common.value.arg;
if (!region_node) {
......@@ -488,7 +487,7 @@ acpi_ds_create_bank_field (
return_ACPI_STATUS (status);
}
/* Third arg is the Bank_value */
/* Third arg is the bank_value */
arg = arg->common.next;
info.bank_value = arg->common.value.integer32;
......@@ -511,11 +510,11 @@ acpi_ds_create_bank_field (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_create_index_field
* FUNCTION: acpi_ds_create_index_field
*
* PARAMETERS: Op - Op containing the Field definition and args
* Region_node - Object for the containing Operation Region
* ` Walk_state - Current method state
* region_node - Object for the containing Operation Region
* ` walk_state - Current method state
*
* RETURN: Status
*
......@@ -531,10 +530,10 @@ acpi_ds_create_index_field (
{
acpi_status status;
acpi_parse_object *arg;
ACPI_CREATE_FIELD_INFO info;
acpi_create_field_info info;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_index_field", op);
ACPI_FUNCTION_TRACE_PTR ("ds_create_index_field", op);
/* First arg is the name of the Index register (must already exist) */
......
/******************************************************************************
*
* Module Name: dsinit - Object initialization namespace walk
* $Revision: 4 $
*
*****************************************************************************/
......@@ -37,16 +36,16 @@
/*******************************************************************************
*
* FUNCTION: Acpi_ds_init_one_object
* FUNCTION: acpi_ds_init_one_object
*
* PARAMETERS: Obj_handle - Node
* PARAMETERS: obj_handle - Node
* Level - Current nesting level
* Context - Points to a init info struct
* Return_value - Not used
* return_value - Not used
*
* RETURN: Status
*
* DESCRIPTION: Callback from Acpi_walk_namespace. Invoked for every object
* DESCRIPTION: Callback from acpi_walk_namespace. Invoked for every object
* within the namespace.
*
* Currently, the only objects that require initialization are:
......@@ -67,7 +66,7 @@ acpi_ds_init_one_object (
acpi_init_walk_info *info = (acpi_init_walk_info *) context;
ACPI_FUNCTION_NAME ("Ds_init_one_object");
ACPI_FUNCTION_NAME ("ds_init_one_object");
/*
......@@ -163,14 +162,14 @@ acpi_ds_init_one_object (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_initialize_objects
* FUNCTION: acpi_ds_initialize_objects
*
* PARAMETERS: Table_desc - Descriptor for parent ACPI table
* Start_node - Root of subtree to be initialized.
* PARAMETERS: table_desc - Descriptor for parent ACPI table
* start_node - Root of subtree to be initialized.
*
* RETURN: Status
*
* DESCRIPTION: Walk the namespace starting at "Start_node" and perform any
* DESCRIPTION: Walk the namespace starting at "start_node" and perform any
* necessary initialization on the objects found therein
*
******************************************************************************/
......@@ -184,7 +183,7 @@ acpi_ds_initialize_objects (
acpi_init_walk_info info;
ACPI_FUNCTION_TRACE ("Ds_initialize_objects");
ACPI_FUNCTION_TRACE ("ds_initialize_objects");
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
......@@ -202,7 +201,7 @@ acpi_ds_initialize_objects (
status = acpi_walk_namespace (ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,
acpi_ds_init_one_object, &info, NULL);
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Walk_namespace failed, %s\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "walk_namespace failed, %s\n",
acpi_format_exception (status)));
}
......
/******************************************************************************
*
* Module Name: dsmethod - Parser/Interpreter interface - control method parsing
* $Revision: 89 $
*
*****************************************************************************/
......@@ -38,12 +37,12 @@
/*******************************************************************************
*
* FUNCTION: Acpi_ds_parse_method
* FUNCTION: acpi_ds_parse_method
*
* PARAMETERS: Obj_handle - Node of the method
* PARAMETERS: obj_handle - Node of the method
* Level - Current nesting level
* Context - Points to a method counter
* Return_value - Not used
* return_value - Not used
*
* RETURN: Status
*
......@@ -66,7 +65,7 @@ acpi_ds_parse_method (
acpi_walk_state *walk_state;
ACPI_FUNCTION_TRACE_PTR ("Ds_parse_method", obj_handle);
ACPI_FUNCTION_TRACE_PTR ("ds_parse_method", obj_handle);
/* Parameter Validation */
......@@ -75,7 +74,7 @@ acpi_ds_parse_method (
return_ACPI_STATUS (AE_NULL_ENTRY);
}
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Parsing [%4.4s] **** Named_obj=%p\n",
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Parsing [%4.4s] **** named_obj=%p\n",
((acpi_namespace_node *) obj_handle)->name.ascii, obj_handle));
/* Extract the method object from the method Node */
......@@ -113,7 +112,7 @@ acpi_ds_parse_method (
op->common.node = node;
/*
* Get a new Owner_id for objects created by this method. Namespace
* Get a new owner_id for objects created by this method. Namespace
* objects (such as Operation Regions) can be created during the
* first pass parse.
*/
......@@ -150,7 +149,7 @@ acpi_ds_parse_method (
}
ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
"**** [%4.4s] Parsed **** Named_obj=%p Op=%p\n",
"**** [%4.4s] Parsed **** named_obj=%p Op=%p\n",
((acpi_namespace_node *) obj_handle)->name.ascii, obj_handle, op));
acpi_ps_delete_parse_tree (op);
......@@ -160,11 +159,11 @@ acpi_ds_parse_method (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_begin_method_execution
* FUNCTION: acpi_ds_begin_method_execution
*
* PARAMETERS: Method_node - Node of the method
* Obj_desc - The method object
* Calling_method_node - Caller of this method (if non-null)
* PARAMETERS: method_node - Node of the method
* obj_desc - The method object
* calling_method_node - Caller of this method (if non-null)
*
* RETURN: Status
*
......@@ -185,7 +184,7 @@ acpi_ds_begin_method_execution (
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_PTR ("Ds_begin_method_execution", method_node);
ACPI_FUNCTION_TRACE_PTR ("ds_begin_method_execution", method_node);
if (!method_node) {
......@@ -199,7 +198,7 @@ acpi_ds_begin_method_execution (
if (obj_desc->method.semaphore) {
/*
* Allow recursive method calls, up to the reentrancy/concurrency
* limit imposed by the SERIALIZED rule and the Sync_level method
* limit imposed by the SERIALIZED rule and the sync_level method
* parameter.
*
* The point of this code is to avoid permanently blocking a
......@@ -230,9 +229,9 @@ acpi_ds_begin_method_execution (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_call_control_method
* FUNCTION: acpi_ds_call_control_method
*
* PARAMETERS: Walk_state - Current state of the walk
* PARAMETERS: walk_state - Current state of the walk
* Op - Current Op to be walked
*
* RETURN: Status
......@@ -243,7 +242,7 @@ acpi_ds_begin_method_execution (
acpi_status
acpi_ds_call_control_method (
ACPI_THREAD_STATE *thread,
acpi_thread_state *thread,
acpi_walk_state *this_walk_state,
acpi_parse_object *op)
{
......@@ -254,7 +253,7 @@ acpi_ds_call_control_method (
u32 i;
ACPI_FUNCTION_TRACE_PTR ("Ds_call_control_method", this_walk_state);
ACPI_FUNCTION_TRACE_PTR ("ds_call_control_method", this_walk_state);
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Execute method %p, currentstate=%p\n",
this_walk_state->prev_op, this_walk_state));
......@@ -364,9 +363,9 @@ acpi_ds_call_control_method (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_restart_control_method
* FUNCTION: acpi_ds_restart_control_method
*
* PARAMETERS: Walk_state - State of the method when it was preempted
* PARAMETERS: walk_state - State of the method when it was preempted
* Op - Pointer to new current op
*
* RETURN: Status
......@@ -383,7 +382,7 @@ acpi_ds_restart_control_method (
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("Ds_restart_control_method", walk_state);
ACPI_FUNCTION_TRACE_PTR ("ds_restart_control_method", walk_state);
if (return_desc) {
......@@ -408,7 +407,7 @@ acpi_ds_restart_control_method (
}
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
"Method=%p Return=%p Return_used?=%X Res_stack=%p State=%p\n",
"Method=%p Return=%p return_used?=%X res_stack=%p State=%p\n",
walk_state->method_call_op, return_desc, walk_state->return_used,
walk_state->results, walk_state));
......@@ -418,9 +417,9 @@ acpi_ds_restart_control_method (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_terminate_control_method
* FUNCTION: acpi_ds_terminate_control_method
*
* PARAMETERS: Walk_state - State of the method
* PARAMETERS: walk_state - State of the method
*
* RETURN: Status
*
......@@ -439,7 +438,7 @@ acpi_ds_terminate_control_method (
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("Ds_terminate_control_method", walk_state);
ACPI_FUNCTION_TRACE_PTR ("ds_terminate_control_method", walk_state);
if (!walk_state) {
......
This diff is collapsed.
/******************************************************************************
*
* Module Name: dsobject - Dispatcher object management routines
* $Revision: 112 $
*
*****************************************************************************/
......@@ -38,11 +37,11 @@
#ifndef ACPI_NO_METHOD_EXECUTION
/*****************************************************************************
*
* FUNCTION: Acpi_ds_build_internal_object
* FUNCTION: acpi_ds_build_internal_object
*
* PARAMETERS: Walk_state - Current walk state
* PARAMETERS: walk_state - Current walk state
* Op - Parser object to be translated
* Obj_desc_ptr - Where the ACPI internal object is returned
* obj_desc_ptr - Where the ACPI internal object is returned
*
* RETURN: Status
*
......@@ -61,7 +60,7 @@ acpi_ds_build_internal_object (
acpi_status status;
ACPI_FUNCTION_TRACE ("Ds_build_internal_object");
ACPI_FUNCTION_TRACE ("ds_build_internal_object");
*obj_desc_ptr = NULL;
......@@ -104,12 +103,12 @@ acpi_ds_build_internal_object (
/*****************************************************************************
*
* FUNCTION: Acpi_ds_build_internal_buffer_obj
* FUNCTION: acpi_ds_build_internal_buffer_obj
*
* PARAMETERS: Walk_state - Current walk state
* PARAMETERS: walk_state - Current walk state
* Op - Parser object to be translated
* Buffer_length - Length of the buffer
* Obj_desc_ptr - Where the ACPI internal object is returned
* buffer_length - Length of the buffer
* obj_desc_ptr - Where the ACPI internal object is returned
*
* RETURN: Status
*
......@@ -131,7 +130,7 @@ acpi_ds_build_internal_buffer_obj (
u32 byte_list_length = 0;
ACPI_FUNCTION_TRACE ("Ds_build_internal_buffer_obj");
ACPI_FUNCTION_TRACE ("ds_build_internal_buffer_obj");
obj_desc = *obj_desc_ptr;
......@@ -152,9 +151,9 @@ acpi_ds_build_internal_buffer_obj (
}
/*
* Second arg is the buffer data (optional) Byte_list can be either
* Second arg is the buffer data (optional) byte_list can be either
* individual bytes or a string initializer. In either case, a
* Byte_list appears in the AML.
* byte_list appears in the AML.
*/
arg = op->common.value.arg; /* skip first arg */
......@@ -196,7 +195,7 @@ acpi_ds_build_internal_buffer_obj (
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Initialize buffer from the Byte_list (if present) */
/* Initialize buffer from the byte_list (if present) */
if (byte_list) {
ACPI_MEMCPY (obj_desc->buffer.pointer, byte_list->named.data,
......@@ -212,12 +211,12 @@ acpi_ds_build_internal_buffer_obj (
/*****************************************************************************
*
* FUNCTION: Acpi_ds_build_internal_package_obj
* FUNCTION: acpi_ds_build_internal_package_obj
*
* PARAMETERS: Walk_state - Current walk state
* PARAMETERS: walk_state - Current walk state
* Op - Parser object to be translated
* Package_length - Number of elements in the package
* Obj_desc_ptr - Where the ACPI internal object is returned
* package_length - Number of elements in the package
* obj_desc_ptr - Where the ACPI internal object is returned
*
* RETURN: Status
*
......@@ -241,7 +240,7 @@ acpi_ds_build_internal_package_obj (
u32 i;
ACPI_FUNCTION_TRACE ("Ds_build_internal_package_obj");
ACPI_FUNCTION_TRACE ("ds_build_internal_package_obj");
/* Find the parent of a possibly nested package */
......@@ -295,7 +294,7 @@ acpi_ds_build_internal_package_obj (
* that the list is always null terminated.
*/
obj_desc->package.elements = ACPI_MEM_CALLOCATE (
((ACPI_SIZE) obj_desc->package.count + 1) * sizeof (void *));
((acpi_size) obj_desc->package.count + 1) * sizeof (void *));
if (!obj_desc->package.elements) {
acpi_ut_delete_object_desc (obj_desc);
......@@ -331,9 +330,9 @@ acpi_ds_build_internal_package_obj (
/*****************************************************************************
*
* FUNCTION: Acpi_ds_create_node
* FUNCTION: acpi_ds_create_node
*
* PARAMETERS: Walk_state - Current walk state
* PARAMETERS: walk_state - Current walk state
* Node - NS Node to be initialized
* Op - Parser object to be translated
*
......@@ -353,7 +352,7 @@ acpi_ds_create_node (
acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_node", op);
ACPI_FUNCTION_TRACE_PTR ("ds_create_node", op);
/*
......@@ -397,12 +396,12 @@ acpi_ds_create_node (
/*****************************************************************************
*
* FUNCTION: Acpi_ds_init_object_from_op
* FUNCTION: acpi_ds_init_object_from_op
*
* PARAMETERS: Walk_state - Current walk state
* PARAMETERS: walk_state - Current walk state
* Op - Parser op used to init the internal object
* Opcode - AML opcode associated with the object
* Ret_obj_desc - Namespace object to be initialized
* ret_obj_desc - Namespace object to be initialized
*
* RETURN: Status
*
......@@ -424,7 +423,7 @@ acpi_ds_init_object_from_op (
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("Ds_init_object_from_op");
ACPI_FUNCTION_TRACE ("ds_init_object_from_op");
obj_desc = *ret_obj_desc;
......@@ -441,7 +440,7 @@ acpi_ds_init_object_from_op (
case ACPI_TYPE_BUFFER:
/*
* Defer evaluation of Buffer Term_arg operand
* Defer evaluation of Buffer term_arg operand
*/
obj_desc->buffer.node = (acpi_namespace_node *) walk_state->operands[0];
obj_desc->buffer.aml_start = op->named.data;
......@@ -452,7 +451,7 @@ acpi_ds_init_object_from_op (
case ACPI_TYPE_PACKAGE:
/*
* Defer evaluation of Package Term_arg operand
* Defer evaluation of Package term_arg operand
*/
obj_desc->package.node = (acpi_namespace_node *) walk_state->operands[0];
obj_desc->package.aml_start = op->named.data;
......@@ -469,7 +468,7 @@ acpi_ds_init_object_from_op (
* All constants are integers.
* We mark the integer with a flag that indicates that it started life
* as a constant -- so that stores to constants will perform as expected (noop).
* (Zero_op is used as a placeholder for optional target operands.)
* (zero_op is used as a placeholder for optional target operands.)
*/
obj_desc->common.flags = AOPOBJ_AML_CONSTANT;
......
This diff is collapsed.
/*******************************************************************************
*
* Module Name: dsutils - Dispatcher utilities
* $Revision: 98 $
*
******************************************************************************/
......@@ -39,11 +38,11 @@
/*******************************************************************************
*
* FUNCTION: Acpi_ds_is_result_used
* FUNCTION: acpi_ds_is_result_used
*
* PARAMETERS: Op
* Result_obj
* Walk_state
* result_obj
* walk_state
*
* RETURN: Status
*
......@@ -59,7 +58,7 @@ acpi_ds_is_result_used (
const acpi_opcode_info *parent_info;
ACPI_FUNCTION_TRACE_PTR ("Ds_is_result_used", op);
ACPI_FUNCTION_TRACE_PTR ("ds_is_result_used", op);
/* Must have both an Op and a Result Object */
......@@ -130,7 +129,7 @@ acpi_ds_is_result_used (
case AML_CLASS_CREATE:
/*
* These opcodes allow Term_arg(s) as operands and therefore
* These opcodes allow term_arg(s) as operands and therefore
* the operands can be method calls. The result is used.
*/
goto result_used;
......@@ -145,7 +144,7 @@ acpi_ds_is_result_used (
(op->common.parent->common.aml_opcode == AML_BUFFER_OP) ||
(op->common.parent->common.aml_opcode == AML_INT_EVAL_SUBTREE_OP)) {
/*
* These opcodes allow Term_arg(s) as operands and therefore
* These opcodes allow term_arg(s) as operands and therefore
* the operands can be method calls. The result is used.
*/
goto result_used;
......@@ -184,11 +183,11 @@ acpi_ds_is_result_used (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_delete_result_if_not_used
* FUNCTION: acpi_ds_delete_result_if_not_used
*
* PARAMETERS: Op
* Result_obj
* Walk_state
* result_obj
* walk_state
*
* RETURN: Status
*
......@@ -209,7 +208,7 @@ acpi_ds_delete_result_if_not_used (
acpi_status status;
ACPI_FUNCTION_TRACE_PTR ("Ds_delete_result_if_not_used", result_obj);
ACPI_FUNCTION_TRACE_PTR ("ds_delete_result_if_not_used", result_obj);
if (!op) {
......@@ -224,7 +223,7 @@ acpi_ds_delete_result_if_not_used (
if (!acpi_ds_is_result_used (op, walk_state)) {
/*
* Must pop the result stack (Obj_desc should be equal to Result_obj)
* Must pop the result stack (obj_desc should be equal to result_obj)
*/
status = acpi_ds_result_pop (&obj_desc, walk_state);
if (ACPI_SUCCESS (status)) {
......@@ -238,9 +237,9 @@ acpi_ds_delete_result_if_not_used (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_resolve_operands
* FUNCTION: acpi_ds_resolve_operands
*
* PARAMETERS: Walk_state - Current walk state with operands on stack
* PARAMETERS: walk_state - Current walk state with operands on stack
*
* RETURN: Status
*
......@@ -258,7 +257,7 @@ acpi_ds_resolve_operands (
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE_PTR ("Ds_resolve_operands", walk_state);
ACPI_FUNCTION_TRACE_PTR ("ds_resolve_operands", walk_state);
/*
......@@ -278,9 +277,9 @@ acpi_ds_resolve_operands (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_clear_operands
* FUNCTION: acpi_ds_clear_operands
*
* PARAMETERS: Walk_state - Current walk state with operands on stack
* PARAMETERS: walk_state - Current walk state with operands on stack
*
* RETURN: None
*
......@@ -295,7 +294,7 @@ acpi_ds_clear_operands (
u32 i;
ACPI_FUNCTION_TRACE_PTR ("Acpi_ds_clear_operands", walk_state);
ACPI_FUNCTION_TRACE_PTR ("acpi_ds_clear_operands", walk_state);
/*
......@@ -318,9 +317,9 @@ acpi_ds_clear_operands (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_create_operand
* FUNCTION: acpi_ds_create_operand
*
* PARAMETERS: Walk_state
* PARAMETERS: walk_state
* Arg
*
* RETURN: Status
......@@ -348,7 +347,7 @@ acpi_ds_create_operand (
const acpi_opcode_info *op_info;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_operand", arg);
ACPI_FUNCTION_TRACE_PTR ("ds_create_operand", arg);
/* A valid name must be looked up in the namespace */
......@@ -368,7 +367,7 @@ acpi_ds_create_operand (
/*
* All prefixes have been handled, and the name is
* in Name_string
* in name_string
*/
/*
......@@ -401,7 +400,7 @@ acpi_ds_create_operand (
ACPI_CAST_INDIRECT_PTR (acpi_namespace_node, &obj_desc));
/*
* The only case where we pass through (ignore) a NOT_FOUND
* error is for the Cond_ref_of opcode.
* error is for the cond_ref_of opcode.
*/
if (status == AE_NOT_FOUND) {
if (parent_op->common.aml_opcode == AML_COND_REF_OF_OP) {
......@@ -530,9 +529,9 @@ acpi_ds_create_operand (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_create_operands
* FUNCTION: acpi_ds_create_operands
*
* PARAMETERS: First_arg - First argument of a parser argument tree
* PARAMETERS: first_arg - First argument of a parser argument tree
*
* RETURN: Status
*
......@@ -552,7 +551,7 @@ acpi_ds_create_operands (
u32 arg_count = 0;
ACPI_FUNCTION_TRACE_PTR ("Ds_create_operands", first_arg);
ACPI_FUNCTION_TRACE_PTR ("ds_create_operands", first_arg);
/* For all arguments in the list... */
......
......@@ -2,7 +2,6 @@
*
* Module Name: dswexec - Dispatcher method execution callbacks;
* dispatch to interpreter.
* $Revision: 97 $
*
*****************************************************************************/
......@@ -55,9 +54,9 @@ static ACPI_EXECUTE_OP acpi_gbl_op_type_dispatch [] = {
/*****************************************************************************
*
* FUNCTION: Acpi_ds_get_predicate_value
* FUNCTION: acpi_ds_get_predicate_value
*
* PARAMETERS: Walk_state - Current state of the parse tree walk
* PARAMETERS: walk_state - Current state of the parse tree walk
*
* RETURN: Status
*
......@@ -73,7 +72,7 @@ acpi_ds_get_predicate_value (
acpi_operand_object *obj_desc;
ACPI_FUNCTION_TRACE_PTR ("Ds_get_predicate_value", walk_state);
ACPI_FUNCTION_TRACE_PTR ("ds_get_predicate_value", walk_state);
walk_state->control_state->common.state = 0;
......@@ -103,7 +102,7 @@ acpi_ds_get_predicate_value (
}
if (!obj_desc) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No predicate Obj_desc=%p State=%p\n",
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No predicate obj_desc=%p State=%p\n",
obj_desc, walk_state));
return_ACPI_STATUS (AE_AML_NO_OPERAND);
......@@ -115,7 +114,7 @@ acpi_ds_get_predicate_value (
*/
if (ACPI_GET_OBJECT_TYPE (obj_desc) != ACPI_TYPE_INTEGER) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Bad predicate (not a number) Obj_desc=%p State=%p Type=%X\n",
"Bad predicate (not a number) obj_desc=%p State=%p Type=%X\n",
obj_desc, walk_state, ACPI_GET_OBJECT_TYPE (obj_desc)));
status = AE_AML_OPERAND_TYPE;
......@@ -165,10 +164,10 @@ acpi_ds_get_predicate_value (
/*****************************************************************************
*
* FUNCTION: Acpi_ds_exec_begin_op
* FUNCTION: acpi_ds_exec_begin_op
*
* PARAMETERS: Walk_state - Current state of the parse tree walk
* Out_op - Return op if a new one is created
* PARAMETERS: walk_state - Current state of the parse tree walk
* out_op - Return op if a new one is created
*
* RETURN: Status
*
......@@ -188,7 +187,7 @@ acpi_ds_exec_begin_op (
u32 opcode_class;
ACPI_FUNCTION_TRACE_PTR ("Ds_exec_begin_op", walk_state);
ACPI_FUNCTION_TRACE_PTR ("ds_exec_begin_op", walk_state);
op = walk_state->op;
......@@ -305,9 +304,9 @@ acpi_ds_exec_begin_op (
/*****************************************************************************
*
* FUNCTION: Acpi_ds_exec_end_op
* FUNCTION: acpi_ds_exec_end_op
*
* PARAMETERS: Walk_state - Current state of the parse tree walk
* PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been completed in the
* walk; Arguments have now been evaluated.
*
......@@ -331,7 +330,7 @@ acpi_ds_exec_end_op (
acpi_parse_object *first_arg;
ACPI_FUNCTION_TRACE_PTR ("Ds_exec_end_op", walk_state);
ACPI_FUNCTION_TRACE_PTR ("ds_exec_end_op", walk_state);
op = walk_state->op;
......@@ -387,7 +386,7 @@ acpi_ds_exec_end_op (
if (ACPI_SUCCESS (status)) {
ACPI_DUMP_OPERANDS (ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,
acpi_ps_get_opcode_name (walk_state->opcode),
walk_state->num_operands, "after Ex_resolve_operands");
walk_state->num_operands, "after ex_resolve_operands");
/*
* Dispatch the request to the appropriate interpreter handler
......@@ -424,7 +423,7 @@ acpi_ds_exec_end_op (
switch (op_type) {
case AML_TYPE_CONTROL: /* Type 1 opcode, IF/ELSE/WHILE/NOOP */
/* 1 Operand, 0 External_result, 0 Internal_result */
/* 1 Operand, 0 external_result, 0 internal_result */
status = acpi_ds_exec_end_control_op (walk_state, op);
if (ACPI_FAILURE (status)) {
......@@ -443,11 +442,11 @@ acpi_ds_exec_end_op (
* (AML_METHODCALL) Op->Value->Arg->Node contains
* the method Node pointer
*/
/* Next_op points to the op that holds the method name */
/* next_op points to the op that holds the method name */
next_op = first_arg;
/* Next_op points to first argument op */
/* next_op points to first argument op */
next_op = next_op->common.next;
......@@ -488,7 +487,7 @@ acpi_ds_exec_end_op (
case AML_TYPE_CREATE_FIELD:
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"Executing Create_field Buffer/Index Op=%p\n", op));
"Executing create_field Buffer/Index Op=%p\n", op));
status = acpi_ds_load2_end_op (walk_state);
if (ACPI_FAILURE (status)) {
......@@ -502,7 +501,7 @@ acpi_ds_exec_end_op (
case AML_TYPE_CREATE_OBJECT:
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"Executing Create_object (Buffer/Package) Op=%p\n", op));
"Executing create_object (Buffer/Package) Op=%p\n", op));
switch (op->common.parent->common.aml_opcode) {
case AML_NAME_OP:
......@@ -557,7 +556,7 @@ acpi_ds_exec_end_op (
if (op->common.aml_opcode == AML_REGION_OP) {
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
"Executing Op_region Address/Length Op=%p\n", op));
"Executing op_region Address/Length Op=%p\n", op));
status = acpi_ds_eval_region_operands (walk_state, op);
if (ACPI_FAILURE (status)) {
......
/******************************************************************************
*
* Module Name: dswload - Dispatcher namespace load callbacks
* $Revision: 82 $
*
*****************************************************************************/
......@@ -39,10 +38,10 @@
/*******************************************************************************
*
* FUNCTION: Acpi_ds_init_callbacks
* FUNCTION: acpi_ds_init_callbacks
*
* PARAMETERS: Walk_state - Current state of the parse tree walk
* Pass_number - 1, 2, or 3
* PARAMETERS: walk_state - Current state of the parse tree walk
* pass_number - 1, 2, or 3
*
* RETURN: Status
*
......@@ -87,9 +86,9 @@ acpi_ds_init_callbacks (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_load1_begin_op
* FUNCTION: acpi_ds_load1_begin_op
*
* PARAMETERS: Walk_state - Current state of the parse tree walk
* PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been reached in the
* walk; Arguments have not been evaluated yet.
*
......@@ -112,7 +111,7 @@ acpi_ds_load1_begin_op (
u32 flags;
ACPI_FUNCTION_NAME ("Ds_load1_begin_op");
ACPI_FUNCTION_NAME ("ds_load1_begin_op");
op = walk_state->op;
......@@ -226,8 +225,8 @@ acpi_ds_load1_begin_op (
* already exists:
* 1) the Scope() operator can reopen a scoping object that was
* previously defined (Scope, Method, Device, etc.)
* 2) Whenever we are parsing a deferred opcode (Op_region, Buffer,
* Buffer_field, or Package), the name of the object is already
* 2) Whenever we are parsing a deferred opcode (op_region, Buffer,
* buffer_field, or Package), the name of the object is already
* in the namespace.
*/
flags = ACPI_NS_NO_UPSEARCH;
......@@ -289,9 +288,9 @@ acpi_ds_load1_begin_op (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_load1_end_op
* FUNCTION: acpi_ds_load1_end_op
*
* PARAMETERS: Walk_state - Current state of the parse tree walk
* PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been completed in the
* walk; Arguments have now been evaluated.
*
......@@ -311,7 +310,7 @@ acpi_ds_load1_end_op (
acpi_status status = AE_OK;
ACPI_FUNCTION_NAME ("Ds_load1_end_op");
ACPI_FUNCTION_NAME ("ds_load1_end_op");
op = walk_state->op;
......@@ -340,7 +339,7 @@ acpi_ds_load1_end_op (
if (op->common.aml_opcode == AML_REGION_OP) {
status = acpi_ex_create_region (op->named.data, op->named.length,
(ACPI_ADR_SPACE_TYPE) ((op->common.value.arg)->common.value.integer), walk_state);
(acpi_adr_space_type) ((op->common.value.arg)->common.value.integer), walk_state);
if (ACPI_FAILURE (status)) {
return (status);
}
......@@ -358,7 +357,7 @@ acpi_ds_load1_end_op (
if (op->common.aml_opcode == AML_METHOD_OP) {
/*
* Method_op Pkg_length Name_string Method_flags Term_list
* method_op pkg_length name_string method_flags term_list
*
* Note: We must create the method node/object pair as soon as we
* see the method declaration. This allows later pass1 parsing
......@@ -366,7 +365,7 @@ acpi_ds_load1_end_op (
* arguments.)
*/
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
"LOADING-Method: State=%p Op=%p Named_obj=%p\n",
"LOADING-Method: State=%p Op=%p named_obj=%p\n",
walk_state, op, op->named.node));
if (!acpi_ns_get_attached_object (op->named.node)) {
......@@ -402,9 +401,9 @@ acpi_ds_load1_end_op (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_load2_begin_op
* FUNCTION: acpi_ds_load2_begin_op
*
* PARAMETERS: Walk_state - Current state of the parse tree walk
* PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been reached in the
* walk; Arguments have not been evaluated yet.
*
......@@ -426,7 +425,7 @@ acpi_ds_load2_begin_op (
char *buffer_ptr;
ACPI_FUNCTION_TRACE ("Ds_load2_begin_op");
ACPI_FUNCTION_TRACE ("ds_load2_begin_op");
op = walk_state->op;
......@@ -485,7 +484,7 @@ acpi_ds_load2_begin_op (
case AML_INT_NAMEPATH_OP:
/*
* The Name_path is an object reference to an existing object. Don't enter the
* The name_path is an object reference to an existing object. Don't enter the
* name into the namespace, but look it up for use later
*/
status = acpi_ns_lookup (walk_state->scope_info, buffer_ptr, object_type,
......@@ -613,9 +612,9 @@ acpi_ds_load2_begin_op (
/*******************************************************************************
*
* FUNCTION: Acpi_ds_load2_end_op
* FUNCTION: acpi_ds_load2_end_op
*
* PARAMETERS: Walk_state - Current state of the parse tree walk
* PARAMETERS: walk_state - Current state of the parse tree walk
* Op - Op that has been just been completed in the
* walk; Arguments have now been evaluated.
*
......@@ -641,7 +640,7 @@ acpi_ds_load2_end_op (
#endif
ACPI_FUNCTION_TRACE ("Ds_load2_end_op");
ACPI_FUNCTION_TRACE ("ds_load2_end_op");
op = walk_state->op;
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n",
......@@ -715,7 +714,7 @@ acpi_ds_load2_end_op (
*/
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
"Create-Load [%s] State=%p Op=%p Named_obj=%p\n",
"Create-Load [%s] State=%p Op=%p named_obj=%p\n",
acpi_ps_get_opcode_name (op->common.aml_opcode), walk_state, op, node));
/* Decode the opcode */
......@@ -822,7 +821,7 @@ acpi_ds_load2_end_op (
#ifndef ACPI_NO_METHOD_EXECUTION
case AML_REGION_OP:
/*
* The Op_region is not fully parsed at this time. Only valid argument is the Space_id.
* The op_region is not fully parsed at this time. Only valid argument is the space_id.
* (We must save the address of the AML of the address and length operands)
*/
/*
......@@ -867,7 +866,7 @@ acpi_ds_load2_end_op (
case AML_CLASS_METHOD_CALL:
ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
"RESOLVING-Method_call: State=%p Op=%p Named_obj=%p\n",
"RESOLVING-method_call: State=%p Op=%p named_obj=%p\n",
walk_state, op, node));
/*
......
/******************************************************************************
*
* Module Name: dswscope - Scope stack manipulation
* $Revision: 56 $
*
*****************************************************************************/
......@@ -37,7 +36,7 @@
/****************************************************************************
*
* FUNCTION: Acpi_ds_scope_stack_clear
* FUNCTION: acpi_ds_scope_stack_clear
*
* PARAMETERS: None
*
......@@ -52,7 +51,7 @@ acpi_ds_scope_stack_clear (
{
acpi_generic_state *scope_info;
ACPI_FUNCTION_NAME ("Ds_scope_stack_clear");
ACPI_FUNCTION_NAME ("ds_scope_stack_clear");
while (walk_state->scope_info) {
......@@ -70,7 +69,7 @@ acpi_ds_scope_stack_clear (
/****************************************************************************
*
* FUNCTION: Acpi_ds_scope_stack_push
* FUNCTION: acpi_ds_scope_stack_push
*
* PARAMETERS: *Node, - Name to be made current
* Type, - Type of frame being pushed
......@@ -90,20 +89,20 @@ acpi_ds_scope_stack_push (
acpi_generic_state *old_scope_info;
ACPI_FUNCTION_TRACE ("Ds_scope_stack_push");
ACPI_FUNCTION_TRACE ("ds_scope_stack_push");
if (!node) {
/* Invalid scope */
ACPI_REPORT_ERROR (("Ds_scope_stack_push: null scope passed\n"));
ACPI_REPORT_ERROR (("ds_scope_stack_push: null scope passed\n"));
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
/* Make sure object type is valid */
if (!acpi_ut_valid_object_type (type)) {
ACPI_REPORT_WARNING (("Ds_scope_stack_push: type code out of range\n"));
ACPI_REPORT_WARNING (("ds_scope_stack_push: type code out of range\n"));
}
......@@ -152,7 +151,7 @@ acpi_ds_scope_stack_push (
/****************************************************************************
*
* FUNCTION: Acpi_ds_scope_stack_pop
* FUNCTION: acpi_ds_scope_stack_pop
*
* PARAMETERS: Type - The type of frame to be found
*
......@@ -175,7 +174,7 @@ acpi_ds_scope_stack_pop (
acpi_generic_state *new_scope_info;
ACPI_FUNCTION_TRACE ("Ds_scope_stack_pop");
ACPI_FUNCTION_TRACE ("ds_scope_stack_pop");
/*
......
This diff is collapsed.
......@@ -422,7 +422,7 @@ acpi_ec_space_setup (
static acpi_status
acpi_ec_space_handler (
u32 function,
ACPI_PHYSICAL_ADDRESS address,
acpi_physical_address address,
u32 bit_width,
acpi_integer *value,
void *handler_context,
......
/******************************************************************************
*
* Module Name: evevent - Fixed Event handling and dispatch
* $Revision: 104 $
*
*****************************************************************************/
......@@ -25,7 +24,6 @@
#include "acpi.h"
#include "acevents.h"
#include "acnamesp.h"
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evevent")
......@@ -33,7 +31,7 @@
/*******************************************************************************
*
* FUNCTION: Acpi_ev_initialize
* FUNCTION: acpi_ev_initialize
*
* PARAMETERS: None
*
......@@ -50,7 +48,7 @@ acpi_ev_initialize (
acpi_status status;
ACPI_FUNCTION_TRACE ("Ev_initialize");
ACPI_FUNCTION_TRACE ("ev_initialize");
/* Make sure we have ACPI tables */
......@@ -61,7 +59,7 @@ acpi_ev_initialize (
}
/*
* Initialize the Fixed and General Purpose Acpi_events prior. This is
* Initialize the Fixed and General Purpose acpi_events prior. This is
* done prior to enabling SCIs to prevent interrupts from occuring
* before handers are installed.
*/
......@@ -87,7 +85,7 @@ acpi_ev_initialize (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_handler_initialize
* FUNCTION: acpi_ev_handler_initialize
*
* PARAMETERS: None
*
......@@ -104,7 +102,7 @@ acpi_ev_handler_initialize (
acpi_status status;
ACPI_FUNCTION_TRACE ("Ev_handler_initialize");
ACPI_FUNCTION_TRACE ("ev_handler_initialize");
/* Install the SCI handler */
......@@ -144,7 +142,7 @@ acpi_ev_handler_initialize (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_fixed_event_initialize
* FUNCTION: acpi_ev_fixed_event_initialize
*
* PARAMETERS: None
*
......@@ -158,7 +156,7 @@ acpi_status
acpi_ev_fixed_event_initialize (
void)
{
NATIVE_UINT i;
acpi_native_uint i;
acpi_status status;
......@@ -187,7 +185,7 @@ acpi_ev_fixed_event_initialize (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_fixed_event_detect
* FUNCTION: acpi_ev_fixed_event_detect
*
* PARAMETERS: None
*
......@@ -204,10 +202,10 @@ acpi_ev_fixed_event_detect (
u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
u32 fixed_status;
u32 fixed_enable;
NATIVE_UINT_MAX32 i;
acpi_native_uint i;
ACPI_FUNCTION_NAME ("Ev_fixed_event_detect");
ACPI_FUNCTION_NAME ("ev_fixed_event_detect");
/*
......@@ -218,7 +216,7 @@ acpi_ev_fixed_event_detect (
(void) acpi_hw_register_read (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_ENABLE, &fixed_enable);
ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS,
"Fixed Acpi_event Block: Enable %08X Status %08X\n",
"Fixed acpi_event Block: Enable %08X Status %08X\n",
fixed_enable, fixed_status));
/*
......@@ -231,7 +229,7 @@ acpi_ev_fixed_event_detect (
(fixed_enable & acpi_gbl_fixed_event_info[i].enable_bit_mask)) {
/* Found an active (signalled) event */
int_status |= acpi_ev_fixed_event_dispatch (i);
int_status |= acpi_ev_fixed_event_dispatch ((u32) i);
}
}
......@@ -241,7 +239,7 @@ acpi_ev_fixed_event_detect (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_fixed_event_dispatch
* FUNCTION: acpi_ev_fixed_event_dispatch
*
* PARAMETERS: Event - Event type
*
......@@ -275,7 +273,7 @@ acpi_ev_fixed_event_dispatch (
0, ACPI_MTX_DO_NOT_LOCK);
ACPI_REPORT_ERROR (
("Ev_gpe_dispatch: No installed handler for fixed event [%08X]\n",
("ev_gpe_dispatch: No installed handler for fixed event [%08X]\n",
event));
return (ACPI_INTERRUPT_NOT_HANDLED);
......
This diff is collapsed.
/******************************************************************************
*
* Module Name: evmisc - Miscellaneous event manager support functions
* $Revision: 60 $
*
*****************************************************************************/
......@@ -34,7 +33,7 @@
/*******************************************************************************
*
* FUNCTION: Acpi_ev_is_notify_object
* FUNCTION: acpi_ev_is_notify_object
*
* PARAMETERS: Node - Node to check
*
......@@ -68,9 +67,9 @@ acpi_ev_is_notify_object (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_get_gpe_register_index
* FUNCTION: acpi_ev_get_gpe_register_index
*
* PARAMETERS: Gpe_number - Raw GPE number
* PARAMETERS: gpe_number - Raw GPE number
*
* RETURN: None.
*
......@@ -94,9 +93,9 @@ acpi_ev_get_gpe_register_index (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_get_gpe_number_index
* FUNCTION: acpi_ev_get_gpe_number_index
*
* PARAMETERS: Gpe_number - Raw GPE number
* PARAMETERS: gpe_number - Raw GPE number
*
* RETURN: None.
*
......@@ -120,7 +119,7 @@ acpi_ev_get_gpe_number_index (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_queue_notify_request
* FUNCTION: acpi_ev_queue_notify_request
*
* PARAMETERS:
*
......@@ -142,7 +141,7 @@ acpi_ev_queue_notify_request (
acpi_status status = AE_OK;
ACPI_FUNCTION_NAME ("Ev_queue_notify_request");
ACPI_FUNCTION_NAME ("ev_queue_notify_request");
/*
......@@ -238,7 +237,7 @@ acpi_ev_queue_notify_request (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_notify_dispatch
* FUNCTION: acpi_ev_notify_dispatch
*
* PARAMETERS:
*
......@@ -305,7 +304,7 @@ acpi_ev_notify_dispatch (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_global_lock_thread
* FUNCTION: acpi_ev_global_lock_thread
*
* RETURN: None
*
......@@ -338,7 +337,7 @@ acpi_ev_global_lock_thread (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_global_lock_handler
* FUNCTION: acpi_ev_global_lock_handler
*
* RETURN: Status
*
......@@ -385,7 +384,7 @@ acpi_ev_global_lock_handler (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_init_global_lock_handler
* FUNCTION: acpi_ev_init_global_lock_handler
*
* RETURN: Status
*
......@@ -399,7 +398,7 @@ acpi_ev_init_global_lock_handler (void)
acpi_status status;
ACPI_FUNCTION_TRACE ("Ev_init_global_lock_handler");
ACPI_FUNCTION_TRACE ("ev_init_global_lock_handler");
acpi_gbl_global_lock_present = TRUE;
......@@ -424,7 +423,7 @@ acpi_ev_init_global_lock_handler (void)
/******************************************************************************
*
* FUNCTION: Acpi_ev_acquire_global_lock
* FUNCTION: acpi_ev_acquire_global_lock
*
* RETURN: Status
*
......@@ -440,7 +439,7 @@ acpi_ev_acquire_global_lock (
u8 acquired = FALSE;
ACPI_FUNCTION_TRACE ("Ev_acquire_global_lock");
ACPI_FUNCTION_TRACE ("ev_acquire_global_lock");
#ifndef ACPI_APPLICATION
......@@ -491,7 +490,7 @@ acpi_ev_acquire_global_lock (
/*******************************************************************************
*
* FUNCTION: Acpi_ev_release_global_lock
* FUNCTION: acpi_ev_release_global_lock
*
* DESCRIPTION: Releases ownership of the Global Lock.
*
......@@ -504,7 +503,7 @@ acpi_ev_release_global_lock (void)
acpi_status status = AE_OK;
ACPI_FUNCTION_TRACE ("Ev_release_global_lock");
ACPI_FUNCTION_TRACE ("ev_release_global_lock");
if (!acpi_gbl_global_lock_thread_count) {
......@@ -542,7 +541,7 @@ acpi_ev_release_global_lock (void)
/******************************************************************************
*
* FUNCTION: Acpi_ev_terminate
* FUNCTION: acpi_ev_terminate
*
* PARAMETERS: none
*
......@@ -555,11 +554,11 @@ acpi_ev_release_global_lock (void)
void
acpi_ev_terminate (void)
{
NATIVE_UINT_MAX32 i;
acpi_native_uint i;
acpi_status status;
ACPI_FUNCTION_TRACE ("Ev_terminate");
ACPI_FUNCTION_TRACE ("ev_terminate");
if (acpi_gbl_events_initialized) {
......@@ -572,9 +571,9 @@ acpi_ev_terminate (void)
* Disable all fixed events
*/
for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
status = acpi_disable_event(i, ACPI_EVENT_FIXED, 0);
status = acpi_disable_event ((u32) i, ACPI_EVENT_FIXED, 0);
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable fixed event %d\n", i));
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable fixed event %d\n", (u32) i));
}
}
......@@ -582,10 +581,10 @@ acpi_ev_terminate (void)
* Disable all GPEs
*/
for (i = 0; i < acpi_gbl_gpe_number_max; i++) {
if (acpi_ev_get_gpe_number_index(i) != ACPI_GPE_INVALID) {
status = acpi_hw_disable_gpe(i);
if (acpi_ev_get_gpe_number_index ((u32)i) != ACPI_GPE_INVALID) {
status = acpi_hw_disable_gpe((u32) i);
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable GPE %d\n", i));
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not disable GPE %d\n", (u32) i));
}
}
}
......@@ -593,7 +592,7 @@ acpi_ev_terminate (void)
/*
* Remove SCI handler
*/
status = acpi_ev_remove_sci_handler();
status = acpi_ev_remove_sci_handler ();
if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not remove SCI handler\n"));
}
......@@ -605,7 +604,7 @@ acpi_ev_terminate (void)
if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {
status = acpi_disable ();
if (ACPI_FAILURE (status)) {
ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "Acpi_disable failed\n"));
ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "acpi_disable failed\n"));
}
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,6 @@
*
* Module Name: evsci - System Control Interrupt configuration and
* legacy to ACPI mode state transition functions
* $Revision: 86 $
*
******************************************************************************/
......@@ -34,7 +33,7 @@
/*******************************************************************************
*
* FUNCTION: Acpi_ev_sci_handler
* FUNCTION: acpi_ev_sci_handler
*
* PARAMETERS: Context - Calling Context
*
......@@ -55,7 +54,7 @@ acpi_ev_sci_handler (
acpi_status status;
ACPI_FUNCTION_TRACE("Ev_sci_handler");
ACPI_FUNCTION_TRACE("ev_sci_handler");
/*
......@@ -74,9 +73,9 @@ acpi_ev_sci_handler (
}
/*
* Fixed Acpi_events:
* Fixed acpi_events:
* -------------
* Check for and dispatch any Fixed Acpi_events that have occurred
* Check for and dispatch any Fixed acpi_events that have occurred
*/
interrupt_handled |= acpi_ev_fixed_event_detect ();
......@@ -93,7 +92,7 @@ acpi_ev_sci_handler (
/******************************************************************************
*
* FUNCTION: Acpi_ev_install_sci_handler
* FUNCTION: acpi_ev_install_sci_handler
*
* PARAMETERS: none
*
......@@ -109,7 +108,7 @@ acpi_ev_install_sci_handler (void)
u32 status = AE_OK;
ACPI_FUNCTION_TRACE ("Ev_install_sci_handler");
ACPI_FUNCTION_TRACE ("ev_install_sci_handler");
status = acpi_os_install_interrupt_handler ((u32) acpi_gbl_FADT->sci_int,
......@@ -120,7 +119,7 @@ acpi_ev_install_sci_handler (void)
/******************************************************************************
*
* FUNCTION: Acpi_ev_remove_sci_handler
* FUNCTION: acpi_ev_remove_sci_handler
*
* PARAMETERS: none
*
......@@ -143,7 +142,7 @@ acpi_ev_remove_sci_handler (void)
acpi_status status;
ACPI_FUNCTION_TRACE ("Ev_remove_sci_handler");
ACPI_FUNCTION_TRACE ("ev_remove_sci_handler");
/* Just let the OS remove the handler and disable the level */
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -181,8 +181,10 @@ acpi_fan_remove_fs (
{
ACPI_FUNCTION_TRACE("acpi_fan_remove_fs");
if (acpi_device_dir(device))
if (acpi_device_dir(device)) {
remove_proc_entry(acpi_device_bid(device), acpi_fan_dir);
acpi_device_dir(device) = NULL;
}
return_VALUE(0);
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
* $Revision: 123 $
*
*****************************************************************************/
......@@ -54,7 +53,7 @@
/* Version string */
#define ACPI_CA_VERSION 0x20021212
#define ACPI_CA_VERSION 0x20021217
/* Version of ACPI supported */
......@@ -149,7 +148,7 @@
#define ACPI_NUM_PREDEFINED_REGIONS 8
#define ACPI_USER_REGION_BEGIN 0x80
/* Maximum Space_ids for Operation Regions */
/* Maximum space_ids for Operation Regions */
#define ACPI_MAX_ADDRESS_SPACE 255
......
/******************************************************************************
*
* Name: acdebug.h - ACPI/AML debugger
* $Revision: 65 $
*
*****************************************************************************/
......
This diff is collapsed.
This diff is collapsed.
/******************************************************************************
*
* Name: acexcep.h - Exception codes returned by the ACPI subsystem
* $Revision: 66 $
*
*****************************************************************************/
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment