Deleted Added
sdiff udiff text old ( 71867 ) new ( 73561 )
full compact
exfldio.c (71867) exfldio.c (73561)
1/******************************************************************************
2 *
3 * Module Name: amfldio - Aml Field I/O
1/******************************************************************************
2 *
3 * Module Name: amfldio - Aml Field I/O
4 * $Revision: 37 $
4 * $Revision: 39 $
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.

--- 554 unchanged lines hidden (view full) ---

567
568 switch (ObjDesc->Field.UpdateRule)
569 {
570
571 case UPDATE_PRESERVE:
572
573 /* Check if update rule needs to be applied (not if mask is all ones) */
574
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.

--- 554 unchanged lines hidden (view full) ---

567
568 switch (ObjDesc->Field.UpdateRule)
569 {
570
571 case UPDATE_PRESERVE:
572
573 /* Check if update rule needs to be applied (not if mask is all ones) */
574
575 if (((1 << BitGranularity) -1) & ~Mask)
575 /* The left shift drops the bits we want to ignore. */
576 if ((~Mask << (sizeof(Mask)*8 - BitGranularity)) != 0)
576 {
577 /*
578 * Read the current contents of the byte/word/dword containing
579 * the field, and merge with the new field value.
580 */
581 Status = AcpiAmlReadFieldData (ObjDesc, ThisFieldByteOffset,
582 BitGranularity, &CurrentValue);
583 MergedValue |= (CurrentValue & ~Mask);

--- 277 unchanged lines hidden --- 		577 {
578 /*
579 * Read the current contents of the byte/word/dword containing
580 * the field, and merge with the new field value.
581 */
582 Status = AcpiAmlReadFieldData (ObjDesc, ThisFieldByteOffset,
583 BitGranularity, &CurrentValue);
584 MergedValue |= (CurrentValue & ~Mask);

--- 277 unchanged lines hidden ---