Fix driver compilation for gcc 3.4.0 Causes segfault and oops on loading.. needs work --- NVIDIA-Linux-x86-1.0-5336-pkg1/usr/src/nv/nv.h.orig 2004-01-15 03:29:11.000000000 +0000 +++ NVIDIA-Linux-x86-1.0-5336-pkg1/usr/src/nv/nv.h 2004-05-27 22:56:55.207868112 +0100 @@ -336,32 +336,32 @@ typedef struct #endif -VOID* NV_API_CALL nv_find_nv_mapping (nv_state_t *, unsigned long); +VOID* nv_find_nv_mapping (nv_state_t *, unsigned long); ULONG NV_API_CALL nv_find_dma_mapping (nv_state_t *, unsigned long); -VOID* NV_API_CALL nv_find_agp_kernel_mapping (nv_state_t *, unsigned long); -ULONG NV_API_CALL nv_get_kern_phys_address (ULONG); -ULONG NV_API_CALL nv_get_user_phys_address (ULONG); - -VOID NV_API_CALL nv_lock_rm (nv_state_t *); -VOID NV_API_CALL nv_unlock_rm (nv_state_t *); -VOID NV_API_CALL nv_lock_heap (nv_state_t *); -VOID NV_API_CALL nv_unlock_heap (nv_state_t *); - -VOID NV_API_CALL nv_set_hotkey_occurred_flag (VOID); -S032 NV_API_CALL nv_int10h_call (nv_state_t *, U032 *, U032 *, U032 *, U032 *, VOID *); - -S032 NV_API_CALL nv_alloc_pages (nv_state_t *, VOID **, U032, U032, U032, U032, U032, U032, VOID **); -S032 NV_API_CALL nv_free_pages (nv_state_t *, VOID **, U032, U032, VOID *); - -S032 NV_API_CALL nv_agp_init (nv_state_t *, VOID **, VOID **, VOID *, U032); -S032 NV_API_CALL nv_agp_teardown (nv_state_t *); -S032 NV_API_CALL nv_agp_translate_address (nv_state_t *, VOID *, U032, U032 *); +VOID* nv_find_agp_kernel_mapping (nv_state_t *, unsigned long); +ULONG nv_get_kern_phys_address (ULONG); +ULONG nv_get_user_phys_address (ULONG); + +VOID nv_lock_rm (nv_state_t *); +VOID nv_unlock_rm (nv_state_t *); +VOID nv_lock_heap (nv_state_t *); +VOID nv_unlock_heap (nv_state_t *); + +VOID nv_set_hotkey_occurred_flag (VOID); +S032 nv_int10h_call (nv_state_t *, U032 *, U032 *, U032 *, U032 *, VOID *); + +S032 nv_alloc_pages (nv_state_t *, VOID **, U032, U032, U032, U032, U032, U032, VOID **); +S032 nv_free_pages (nv_state_t *, VOID **, U032, U032, VOID *); + +S032 nv_agp_init (nv_state_t *, VOID **, VOID **, VOID *, U032); +S032 nv_agp_teardown (nv_state_t *); +S032 nv_agp_translate_address (nv_state_t *, VOID *, U032, U032 *); -S032 NV_API_CALL nv_start_rc_timer (nv_state_t *); -S032 NV_API_CALL nv_stop_rc_timer (nv_state_t *); +S032 nv_start_rc_timer (nv_state_t *); +S032 nv_stop_rc_timer (nv_state_t *); -VOID NV_API_CALL nv_post_event (nv_state_t *, nv_event_t *, U032, U032); -S032 NV_API_CALL nv_get_event (nv_state_t *, VOID *, nv_event_t *, U032 *); +VOID nv_post_event (nv_state_t *, nv_event_t *, U032, U032); +S032 nv_get_event (nv_state_t *, VOID *, nv_event_t *, U032 *); /* --- NVIDIA-Linux-x86-1.0-5336-pkg1/usr/src/nv/os-interface.h.orig 2004-01-15 03:29:11.000000000 +0000 +++ NVIDIA-Linux-x86-1.0-5336-pkg1/usr/src/nv/os-interface.h 2004-05-27 22:56:59.590201896 +0100 @@ -48,63 +48,63 @@ * --------------------------------------------------------------------------- */ -U032 NV_API_CALL os_get_page_size (VOID); -ULONG NV_API_CALL os_get_page_mask (VOID); -RM_STATUS NV_API_CALL os_alloc_mem (VOID **, U032); -VOID NV_API_CALL os_free_mem (VOID *); -RM_STATUS NV_API_CALL os_alloc_contig_pages (VOID **, U032); -VOID NV_API_CALL os_free_contig_pages (VOID *, U032); -RM_STATUS NV_API_CALL os_get_current_time (U032 *, U032 *); -RM_STATUS NV_API_CALL os_delay (U032); -RM_STATUS NV_API_CALL os_delay_us (U032); -U032 NV_API_CALL os_get_cpu_frequency (VOID); -RM_STATUS NV_API_CALL os_get_current_process (U032 *); -RM_STATUS NV_API_CALL os_kill_process (U032, U032); -U008* NV_API_CALL os_string_copy (U008 *, const U008 *); -RM_STATUS NV_API_CALL os_strncpy_from_user (U008 *, const U008 *, U032); -S032 NV_API_CALL os_string_compare (const U008 *, const U008 *); -U032 NV_API_CALL os_string_length (const U008 *); -U008* NV_API_CALL os_mem_copy (U008 *, const U008 *, U032); -RM_STATUS NV_API_CALL os_memcpy_from_user (VOID *, const VOID *, U032); -RM_STATUS NV_API_CALL os_memcpy_to_user (void *, const VOID *, U032); -VOID* NV_API_CALL os_mem_set (VOID *, U008, U032); -S032 NV_API_CALL os_mem_cmp (const U008 *, const U008 *, U032); -VOID* NV_API_CALL os_pci_init_handle (U008, U008, U008, U016 *, U016 *); -U008 NV_API_CALL os_pci_read_byte (VOID *, U008); -U016 NV_API_CALL os_pci_read_word (VOID *, U008); -U032 NV_API_CALL os_pci_read_dword (VOID *, U008); -VOID NV_API_CALL os_pci_write_byte (VOID *, U008, U008); -VOID NV_API_CALL os_pci_write_word (VOID *, U008, U016); -VOID NV_API_CALL os_pci_write_dword (VOID *, U008, U032); -VOID* NV_API_CALL os_map_kernel_space (U032, U032, U032); -VOID NV_API_CALL os_unmap_kernel_space (VOID *, U032); -VOID* NV_API_CALL os_map_user_space (VOID *, VOID **, U032, U032); -VOID NV_API_CALL os_unmap_user_space (VOID *, VOID *); -VOID* NV_API_CALL os_map_io_space (U032, U032, VOID **, U032, U032); -VOID NV_API_CALL os_unmap_io_space (VOID *, U032, VOID *, U032); +U032 os_get_page_size (VOID); +ULONG os_get_page_mask (VOID); +RM_STATUS os_alloc_mem (VOID **, U032); +VOID os_free_mem (VOID *); +RM_STATUS os_alloc_contig_pages (VOID **, U032); +VOID os_free_contig_pages (VOID *, U032); +RM_STATUS os_get_current_time (U032 *, U032 *); +RM_STATUS os_delay (U032); +RM_STATUS os_delay_us (U032); +U032 os_get_cpu_frequency (VOID); +RM_STATUS os_get_current_process (U032 *); +RM_STATUS os_kill_process (U032, U032); +U008* os_string_copy (U008 *, const U008 *); +RM_STATUS os_strncpy_from_user (U008 *, const U008 *, U032); +S032 os_string_compare (const U008 *, const U008 *); +U032 os_string_length (const U008 *); +U008* os_mem_copy (U008 *, const U008 *, U032); +RM_STATUS os_memcpy_from_user (VOID *, const VOID *, U032); +RM_STATUS os_memcpy_to_user (void *, const VOID *, U032); +VOID* os_mem_set (VOID *, U008, U032); +S032 os_mem_cmp (const U008 *, const U008 *, U032); +VOID* os_pci_init_handle (U008, U008, U008, U016 *, U016 *); +U008 os_pci_read_byte (VOID *, U008); +U016 os_pci_read_word (VOID *, U008); +U032 os_pci_read_dword (VOID *, U008); +VOID os_pci_write_byte (VOID *, U008, U008); +VOID os_pci_write_word (VOID *, U008, U016); +VOID os_pci_write_dword (VOID *, U008, U032); +VOID* os_map_kernel_space (U032, U032, U032); +VOID os_unmap_kernel_space (VOID *, U032); +VOID* os_map_user_space (VOID *, VOID **, U032, U032); +VOID os_unmap_user_space (VOID *, VOID *); +VOID* os_map_io_space (U032, U032, VOID **, U032, U032); +VOID os_unmap_io_space (VOID *, U032, VOID *, U032); RM_STATUS NV_API_CALL os_flush_cpu_cache (VOID); -RM_STATUS NV_API_CALL os_set_mem_range (U032, U032, U032); -RM_STATUS NV_API_CALL os_unset_mem_range (U032, U032); -BOOL NV_API_CALL os_pci_device_present (U016, U016); -U008 NV_API_CALL os_io_read_byte (PHWINFO, U032); -U016 NV_API_CALL os_io_read_word (PHWINFO, U032); -U032 NV_API_CALL os_io_read_dword (PHWINFO, U032); -VOID NV_API_CALL os_io_write_byte (PHWINFO, U032, U008); -VOID NV_API_CALL os_io_write_word (PHWINFO, U032, U016); -VOID NV_API_CALL os_io_write_dword (PHWINFO, U032, U032); -ULONG NV_API_CALL os_cli (ULONG); -ULONG NV_API_CALL os_sti (ULONG); -VOID* NV_API_CALL os_copy_in_ioctl_param (VOID *, VOID *, U032); -VOID* NV_API_CALL os_copy_out_ioctl_param (VOID *, VOID *, U032); -VOID* NV_API_CALL os_registry_lookup (PHWINFO, U008 *, U008 *); -RM_STATUS NV_API_CALL os_swap_barrier (U032, VOID (*)(VOID *), VOID *); -BOOL NV_API_CALL os_is_administrator (PHWINFO); -VOID NV_API_CALL os_dbg_init (VOID); -VOID NV_API_CALL os_dbg_breakpoint (VOID); -VOID NV_API_CALL os_dbg_set_level (U032); +RM_STATUS os_set_mem_range (U032, U032, U032); +RM_STATUS os_unset_mem_range (U032, U032); +BOOL os_pci_device_present (U016, U016); +U008 os_io_read_byte (PHWINFO, U032); +U016 os_io_read_word (PHWINFO, U032); +U032 os_io_read_dword (PHWINFO, U032); +VOID os_io_write_byte (PHWINFO, U032, U008); +VOID os_io_write_word (PHWINFO, U032, U016); +VOID os_io_write_dword (PHWINFO, U032, U032); +ULONG os_cli (ULONG); +ULONG os_sti (ULONG); +VOID* os_copy_in_ioctl_param (VOID *, VOID *, U032); +VOID* os_copy_out_ioctl_param (VOID *, VOID *, U032); +VOID* os_registry_lookup (PHWINFO, U008 *, U008 *); +RM_STATUS os_swap_barrier (U032, VOID (*)(VOID *), VOID *); +BOOL os_is_administrator (PHWINFO); +VOID os_dbg_init (VOID); +VOID os_dbg_breakpoint (VOID); +VOID os_dbg_set_level (U032); U032 NV_API_CALL os_get_cpu_count (VOID); -RM_STATUS NV_API_CALL os_raise_smp_barrier (VOID); -RM_STATUS NV_API_CALL os_clear_smp_barrier (VOID); +RM_STATUS os_raise_smp_barrier (VOID); +RM_STATUS os_clear_smp_barrier (VOID); #if defined(DEBUG) && !defined(NVCPU_IA64) VOID NV_API_CALL os_canary_arm (VOID); VOID NV_API_CALL os_canary_check (VOID); @@ -150,8 +150,8 @@ RM_STATUS NV_API_CALL osClearSmpBarri #define NV_DBG_ERRORS 0x4 -void NV_API_CALL out_string(const char *str); -int NV_API_CALL nv_printf(int debuglevel, const char *printf_format, ...); +void out_string(const char *str); +int nv_printf(int debuglevel, const char *printf_format, ...); #define NV_MEMORY_TYPE_SYSTEM 0