patch-2.4.1 linux/drivers/acpi/common/cmxface.c

• Lines: 42
• Date: Mon Jan 29 10:15:58 2001
• Orig file: v2.4.0/linux/drivers/acpi/common/cmxface.c
• Orig date: Fri Dec 29 14:07:21 2000

diff -u --recursive --new-file v2.4.0/linux/drivers/acpi/common/cmxface.c linux/drivers/acpi/common/cmxface.c
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
  * Module Name: cmxface - External interfaces for "global" ACPI functions
- *              $Revision: 55 $
+ *              $Revision: 62 $
  *
  *****************************************************************************/
 
 /*
- *  Copyright (C) 2000 R. Byron Moore
+ *  Copyright (C) 2000, 2001 R. Byron Moore
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -304,16 +304,22 @@
 	out_buffer->length = sizeof (ACPI_SYSTEM_INFO);
 	info_ptr = (ACPI_SYSTEM_INFO *) out_buffer->pointer;
 
-	/* TBD [Future]: need a version number, or use the version string */
-	info_ptr->acpi_ca_version   = 0x1234;
+	info_ptr->acpi_ca_version   = ACPI_CA_VERSION;
 
 	/* System flags (ACPI capabilities) */
 
 	info_ptr->flags             = acpi_gbl_system_flags;
 
 	/* Timer resolution - 24 or 32 bits  */
-
-	info_ptr->timer_resolution  = acpi_hw_pmt_resolution ();
+	if (!acpi_gbl_FADT) {
+		info_ptr->timer_resolution = 0;
+	}
+	else if (acpi_gbl_FADT->tmr_val_ext == 0) {
+		info_ptr->timer_resolution = 24;
+	}
+	else {
+		info_ptr->timer_resolution = 32;
+	}
 
 	/* Clear the reserved fields */