Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9078 → Rev 9077

/drivers/include/acpi/acpi_io.h
4,10 → 4,10
#include <linux/io.h>
 
#include <asm/acpi.h>
#include <asm/percpu.h>
 
 
acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);
void acpi_os_unmap_iomem(void __iomem *virt, acpi_size size);
void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size);
void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
 
int acpi_os_map_generic_address(struct acpi_generic_address *addr);
/drivers/include/asm/amd_nb.h
File deleted
/drivers/include/asm/processor.h
18,7 → 18,6
#include <asm/pgtable_types.h>
#include <asm/percpu.h>
#include <asm/msr.h>
#include <asm/msr-index.h>
#include <asm/desc_defs.h>
#include <asm/nops.h>
#include <asm/special_insns.h>
146,7 → 145,7
#define X86_VENDOR_TRANSMETA 7
#define X86_VENDOR_NSC 8
#define X86_VENDOR_NUM 9
#define X86_VENDOR_HYGON 9
 
#define X86_VENDOR_UNKNOWN 0xff
 
/*
/drivers/include/linux/refcount.h
File deleted
/drivers/include/linux/hwmon.h
File deleted
/drivers/include/linux/pci.h
917,8 → 917,6
 
struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops);
 
 
#if 0
static inline int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val)
{
*val = PciRead8(dev->busnr, dev->devfn, where);
951,56 → 949,7
PciWrite32(dev->busnr, dev->devfn, where, val);
return 1;
}
#endif
 
static inline int pci_read_config_byte(struct pci_dev *dev, int where, u8 *val)
{
*val = PciRead8(dev->busnr, dev->devfn, where);
return 0;
}
 
static inline int pci_read_config_word(struct pci_dev *dev, int where, u16 *val)
{
 
if ( where & 1)
return PCIBIOS_BAD_REGISTER_NUMBER;
*val = PciRead16(dev->busnr, dev->devfn, where);
return 0;
}
 
static inline int pci_read_config_dword(struct pci_dev *dev, int where, u32 *val)
{
 
if ( where & 3)
return PCIBIOS_BAD_REGISTER_NUMBER;
*val = PciRead32(dev->busnr, dev->devfn, where);
return 0;
}
 
static inline int pci_write_config_byte(struct pci_dev *dev, int where, u8 val)
{
PciWrite8(dev->busnr, dev->devfn, where, val);
return 0;
};
 
static inline int pci_write_config_word(struct pci_dev *dev, int where, u16 val)
{
if ( where & 1)
return PCIBIOS_BAD_REGISTER_NUMBER;
PciWrite16(dev->busnr, dev->devfn, where, val);
return 0;
}
 
static inline int pci_write_config_dword(struct pci_dev *dev, int where,
u32 val)
{
if ( where & 3)
return PCIBIOS_BAD_REGISTER_NUMBER;
PciWrite32(dev->busnr, dev->devfn, where, val);
return 0;
}
 
 
int pcie_capability_read_word(struct pci_dev *dev, int pos, u16 *val);
int pcie_capability_read_dword(struct pci_dev *dev, int pos, u32 *val);
int pcie_capability_write_word(struct pci_dev *dev, int pos, u16 val);
1487,11 → 1436,11
_PCI_NOP(o, dword, u32 x)
_PCI_NOP_ALL(read, *)
_PCI_NOP_ALL(write,)
/*
 
static inline struct pci_dev *pci_get_device(unsigned int vendor,
unsigned int device,
struct pci_dev *from)
{ return NULL; }*/
{ return NULL; }
 
static inline struct pci_dev *pci_get_subsys(unsigned int vendor,
unsigned int device,
/drivers/include/linux/pci_ids.h
535,8 → 535,6
#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534
#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F3 0x1583
#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584
#define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
3018,13 → 3016,4
 
#define PCI_VENDOR_ID_OCZ 0x1b85
 
#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493
#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
#define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
#define PCI_VENDOR_ID_HYGON 0x1d94
#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F3 0x15b3
#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
 
#endif /* _LINUX_PCI_IDS_H */
/drivers/include/ddk.h
8,7 → 8,6
#include <linux/spinlock.h>
#include <linux/mutex.h>
#include <linux/rwsem.h>
//#include <stdint.h>
 
#define OS_BASE 0x80000000