[Linux1394-cvslog] rev 600 - trunk
Brought to you by:
aeb,
bencollins
From: SVN U. <ben...@li...> - 2002-10-12 20:46:02
|
Author: bencollins Date: 2002-10-12 16:45:58 -0400 (Sat, 12 Oct 2002) New Revision: 600 Modified: trunk/ieee1394_types.h trunk/sbp2.c Log: Remove some obsolete compatibility code. We no longer work with anything as old as 2.4.14- anyway. Modified: trunk/sbp2.c ============================================================================== --- trunk/sbp2.c (original) +++ trunk/sbp2.c 2002-10-12 16:45:58.000000000 -0400 @@ -1008,13 +1008,8 @@ command->dma_size, command->dma_dir); SBP2_DMA_FREE("single bulk"); } else if (command->dma_type == CMD_DMA_PAGE) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,13) - pci_unmap_single(hi->host->pdev, command->cmd_dma, - command->dma_size, command->dma_dir); -#else pci_unmap_page(hi->host->pdev, command->cmd_dma, command->dma_size, command->dma_dir); -#endif /* Linux version < 2.4.13 */ SBP2_DMA_FREE("single page"); } /* XXX: Check for CMD_DMA_NONE bug */ command->dma_type = CMD_DMA_NONE; @@ -2147,17 +2142,11 @@ command->dma_dir = dma_dir; command->dma_size = sgpnt[0].length; command->dma_type = CMD_DMA_PAGE; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,13) - command->cmd_dma = pci_map_single (hi->host->pdev, sgpnt[0].address, - command->dma_size, - command->dma_dir); -#else command->cmd_dma = pci_map_page(hi->host->pdev, sgpnt[0].page, sgpnt[0].offset, command->dma_size, command->dma_dir); -#endif /* Linux version < 2.4.13 */ SBP2_DMA_ALLOC("single page scatter element"); command_orb->data_descriptor_hi = ORB_SET_NODE_ID(hi->host->node_id); Modified: trunk/ieee1394_types.h ============================================================================== --- trunk/ieee1394_types.h (original) +++ trunk/ieee1394_types.h 2002-10-12 16:45:58.000000000 -0400 @@ -20,23 +20,6 @@ #define __devexit_p(x) x #endif -/* This showed up around this time */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,12) - -# ifndef MODULE_LICENSE -# define MODULE_LICENSE(x) -# endif - -# ifndef min -# define min(x,y) ({ \ - const typeof(x) _x = (x); \ - const typeof(y) _y = (y); \ - (void) (&_x == &_y); \ - _x < _y ? _x : _y; }) -# endif - -#endif /* Linux version < 2.4.12 */ - #include <linux/spinlock.h> #ifndef list_for_each_safe |