patch-2.4.20 linux-2.4.20/drivers/hotplug/cpqphp.h
Next file: linux-2.4.20/drivers/hotplug/cpqphp_core.c
Previous file: linux-2.4.20/drivers/hotplug/acpiphp_res.c
Back to the patch index
Back to the overall index
- Lines: 30
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/hotplug/cpqphp.h
- Orig date:
Fri Nov 9 14:01:21 2001
diff -urN linux-2.4.19/drivers/hotplug/cpqphp.h linux-2.4.20/drivers/hotplug/cpqphp.h
@@ -307,8 +307,8 @@
u8 first_slot;
u8 add_support;
u8 push_flag;
- u8 speed; /* 0 = 33MHz, 1 = 66MHz */
- u8 speed_capability; /* 0 = 33MHz, 1 = 66MHz */
+ enum pci_bus_speed speed;
+ enum pci_bus_speed speed_capability;
u8 push_button; /* 0 = no pushbutton, 1 = pushbutton present */
u8 slot_switch_type; /* 0 = no switch, 1 = switch present */
u8 defeature_PHP; /* 0 = PHP not supported, 1 = PHP supported */
@@ -323,9 +323,6 @@
wait_queue_head_t queue; /* sleep & wake process */
};
-#define CTRL_SPEED_33MHz 0
-#define CTRL_SPEED_66MHz 1
-
struct irq_mapping {
u8 barber_pole;
u8 valid_INT;
@@ -637,7 +634,7 @@
u16 misc;
misc = readw(ctrl->hpc_reg + MISC);
- return (misc & 0x0800) ? 1 : 0;
+ return (misc & 0x0800) ? PCI_SPEED_66MHz : PCI_SPEED_33MHz;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)