[Linux1394-cvslog] rev 530 - trunk
Brought to you by:
aeb,
bencollins
From: SVN U. <ben...@us...> - 2002-07-26 03:38:57
|
Author: bencollins Date: Thu, 25 Jul 2002 23:21:18 -0400 New Revision: 530 Modified: trunk/Makefile trunk/amdtp.c trunk/cmp.c trunk/csr.c trunk/dv1394.c trunk/eth1394.c trunk/hosts.c trunk/ieee1394_core.c trunk/nodemgr.c trunk/ohci1394.c trunk/pcilynx.c trunk/raw1394.c trunk/sbp2.c trunk/video1394.c Log: Switch to using ISO C style designated initializers. Based on a submitted patch. Modified: trunk/ieee1394_core.c ============================================================================== --- trunk/ieee1394_core.c (original) +++ trunk/ieee1394_core.c Thu Jul 25 23:21:44 2002 @@ -811,8 +811,8 @@ static int ieee1394_dispatch_open(struct inode *inode, struct file *file); static struct file_operations ieee1394_chardev_ops = { - owner: THIS_MODULE, - open: ieee1394_dispatch_open, + .owner =THIS_MODULE, + .open = ieee1394_dispatch_open, }; devfs_handle_t ieee1394_devfs_handle; Modified: trunk/ohci1394.c ============================================================================== --- trunk/ohci1394.c (original) +++ trunk/ohci1394.c Thu Jul 25 23:21:45 2002 @@ -2029,10 +2029,10 @@ } static struct hpsb_host_operations ohci1394_ops = { - get_rom: ohci_get_rom, - transmit_packet: ohci_transmit, - devctl: ohci_devctl, - hw_csr_reg: ohci_hw_csr_reg, + .get_rom = ohci_get_rom, + .transmit_packet = ohci_transmit, + .devctl = ohci_devctl, + .hw_csr_reg = ohci_hw_csr_reg, }; static struct hpsb_host_driver *ohci1394_driver; @@ -2308,12 +2308,12 @@ static struct pci_device_id ohci1394_pci_tbl[] __devinitdata = { { - class: PCI_CLASS_FIREWIRE_OHCI, - class_mask: 0x00ffffff, - vendor: PCI_ANY_ID, - device: PCI_ANY_ID, - subvendor: PCI_ANY_ID, - subdevice: PCI_ANY_ID, + .class = PCI_CLASS_FIREWIRE_OHCI, + .class_mask = 0x00ffffff, + .vendor = PCI_ANY_ID, + .device = PCI_ANY_ID, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, }, { 0, }, }; @@ -2321,10 +2321,10 @@ MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); static struct pci_driver ohci1394_pci_driver = { - name: OHCI1394_DRIVER_NAME, - id_table: ohci1394_pci_tbl, - probe: ohci1394_pci_probe, - remove: ohci1394_pci_remove, + .name = OHCI1394_DRIVER_NAME, + .id_table = ohci1394_pci_tbl, + .probe = ohci1394_pci_probe, + .remove = ohci1394_pci_remove, }; Modified: trunk/amdtp.c ============================================================================== --- trunk/amdtp.c (original) +++ trunk/amdtp.c Thu Jul 25 23:21:47 2002 @@ -1191,11 +1191,11 @@ static struct file_operations amdtp_fops = { - owner: THIS_MODULE, - write: amdtp_write, - ioctl: amdtp_ioctl, - open: amdtp_open, - release: amdtp_release + .owner = THIS_MODULE, + .write = amdtp_write, + .ioctl = amdtp_ioctl, + .open = amdtp_open, + .release = amdtp_release }; /* IEEE1394 Subsystem functions */ @@ -1243,8 +1243,8 @@ } static struct hpsb_highlevel_ops amdtp_highlevel_ops = { - add_host: amdtp_add_host, - remove_host: amdtp_remove_host, + .add_host = amdtp_add_host, + .remove_host = amdtp_remove_host, }; /* Module interface */ Modified: trunk/raw1394.c ============================================================================== --- trunk/raw1394.c (original) +++ trunk/raw1394.c Thu Jul 25 23:21:48 2002 @@ -985,20 +985,20 @@ } static struct hpsb_highlevel_ops hl_ops = { - add_host: add_host, - remove_host: remove_host, - host_reset: host_reset, - iso_receive: iso_receive, - fcp_request: fcp_request, + .add_host = add_host, + .remove_host = remove_host, + .host_reset = host_reset, + .iso_receive = iso_receive, + .fcp_request = fcp_request, }; static struct file_operations file_ops = { - owner: THIS_MODULE, - read: raw1394_read, - write: raw1394_write, - poll: raw1394_poll, - open: raw1394_open, - release: raw1394_release, + .owner = THIS_MODULE, + .read = raw1394_read, + .write = raw1394_write, + .poll = raw1394_poll, + .open = raw1394_open, + .release = raw1394_release, }; static int __init init_raw1394(void) Modified: trunk/nodemgr.c ============================================================================== --- trunk/nodemgr.c (original) +++ trunk/nodemgr.c Thu Jul 25 23:21:49 2002 @@ -1358,9 +1358,9 @@ } static struct hpsb_highlevel_ops nodemgr_ops = { - add_host: nodemgr_add_host, - host_reset: nodemgr_host_reset, - remove_host: nodemgr_remove_host, + .add_host = nodemgr_add_host, + .host_reset = nodemgr_host_reset, + .remove_host = nodemgr_remove_host, }; static struct hpsb_highlevel *hl; Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Thu Jul 25 23:21:50 2002 @@ -6,7 +6,7 @@ export-objs := ieee1394_core.o ohci1394.o cmp.o -list-multi := ieee1394.o +#list-multi := ieee1394.o ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \ highlevel.o csr.o nodemgr.o @@ -23,5 +23,5 @@ include $(TOPDIR)/Rules.make -ieee1394.o: $(ieee1394-objs) - $(LD) -r -o $@ $(ieee1394-objs) +#ieee1394.o: $(ieee1394-objs) +# $(LD) -r -o $(LDFLAGS) $@ $(ieee1394-objs) Modified: trunk/hosts.c ============================================================================== --- trunk/hosts.c (original) +++ trunk/hosts.c Thu Jul 25 23:21:50 2002 @@ -39,8 +39,8 @@ } static struct hpsb_host_operations dummy_ops = { - transmit_packet: dummy_transmit_packet, - devctl: dummy_devctl + .transmit_packet = dummy_transmit_packet, + .devctl = dummy_devctl }; /** Modified: trunk/eth1394.c ============================================================================== --- trunk/eth1394.c (original) +++ trunk/eth1394.c Thu Jul 25 23:21:51 2002 @@ -702,14 +702,14 @@ /* Function for incoming 1394 packets */ static struct hpsb_address_ops addr_ops = { - write: ether1394_write, + .write = ether1394_write, }; /* Ieee1394 highlevel driver functions */ static struct hpsb_highlevel_ops hl_ops = { - add_host: ether1394_add_host, - remove_host: ether1394_remove_host, - host_reset: ether1394_host_reset, + .add_host = ether1394_add_host, + .remove_host = ether1394_remove_host, + .host_reset = ether1394_host_reset, }; static int __init ether1394_init_module (void) Modified: trunk/sbp2.c ============================================================================== --- trunk/sbp2.c (original) +++ trunk/sbp2.c Thu Jul 25 23:21:52 2002 @@ -438,10 +438,10 @@ */ static struct ieee1394_device_id sbp2_id_table[] = { { - match_flags: IEEE1394_MATCH_SPECIFIER_ID | + .match_flags =IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, - specifier_id: SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, - version: SBP2_SW_VERSION_ENTRY & 0xffffff + .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, + .version = SBP2_SW_VERSION_ENTRY & 0xffffff }, { } }; @@ -528,27 +528,27 @@ static struct hpsb_highlevel *sbp2_hl_handle = NULL; static struct hpsb_highlevel_ops sbp2_hl_ops = { - add_host: sbp2_add_host, - remove_host: sbp2_remove_host, + .add_host = sbp2_add_host, + .remove_host = sbp2_remove_host, }; static struct hpsb_address_ops sbp2_ops = { - write: sbp2_handle_status_write + .write = sbp2_handle_status_write }; #ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA static struct hpsb_address_ops sbp2_physdma_ops = { - read: sbp2_handle_physdma_read, - write: sbp2_handle_physdma_write, + .read = sbp2_handle_physdma_read, + .write = sbp2_handle_physdma_write, }; #endif static struct hpsb_protocol_driver sbp2_driver = { - name: "SBP2 Driver", - id_table: sbp2_id_table, - probe: sbp2_probe, - disconnect: sbp2_disconnect, - update: sbp2_update + .name = "SBP2 Driver", + .id_table = sbp2_id_table, + .probe = sbp2_probe, + .disconnect = sbp2_disconnect, + .update = sbp2_update }; /* List of device firmware's that require a forced 36 byte inquiry. Note @@ -3224,23 +3224,23 @@ /* SCSI host template */ static Scsi_Host_Template scsi_driver_template = { - name: "IEEE-1394 SBP-2 protocol driver", - info: sbp2scsi_info, - detect: sbp2scsi_detect, - queuecommand: sbp2scsi_queuecommand, - eh_abort_handler: sbp2scsi_abort, - eh_device_reset_handler:sbp2scsi_reset, - eh_bus_reset_handler: sbp2scsi_reset, - eh_host_reset_handler: sbp2scsi_reset, - bios_param: sbp2scsi_biosparam, - this_id: -1, - sg_tablesize: SBP2_MAX_SG_ELEMENTS, - use_clustering: SBP2_CLUSTERING, + .name = "IEEE-1394 SBP-2 protocol driver", + .info = sbp2scsi_info, + .detect = sbp2scsi_detect, + .queuecommand = sbp2scsi_queuecommand, + .eh_abort_handler = sbp2scsi_abort, + .eh_device_reset_handler =sbp2scsi_reset, + .eh_bus_reset_handler = sbp2scsi_reset, + .eh_host_reset_handler =sbp2scsi_reset, + .bios_param = sbp2scsi_biosparam, + .this_id = -1, + .sg_tablesize = SBP2_MAX_SG_ELEMENTS, + .use_clustering = SBP2_CLUSTERING, #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) - use_new_eh_code: TRUE, + .use_new_eh_code = TRUE, #endif - emulated: 1, - proc_name: SBP2_DEVICE_NAME, + .emulated = 1, + .proc_name = SBP2_DEVICE_NAME, }; static int sbp2_module_init(void) Modified: trunk/cmp.c ============================================================================== --- trunk/cmp.c (original) +++ trunk/cmp.c Thu Jul 25 23:21:53 2002 @@ -299,14 +299,14 @@ static struct hpsb_highlevel_ops cmp_highlevel_ops = { - add_host: cmp_add_host, - remove_host: cmp_remove_host, - host_reset: cmp_host_reset, + .add_host = cmp_add_host, + .remove_host = cmp_remove_host, + .host_reset = cmp_host_reset, }; static struct hpsb_address_ops pcr_ops = { - read: pcr_read, - lock: pcr_lock, + .read = pcr_read, + .lock = pcr_lock, }; /* Module interface */ Modified: trunk/pcilynx.c ============================================================================== --- trunk/pcilynx.c (original) +++ trunk/pcilynx.c Thu Jul 25 23:21:53 2002 @@ -693,13 +693,13 @@ static struct file_operations aux_ops = { - owner: THIS_MODULE, - read: mem_read, - write: mem_write, - poll: aux_poll, - llseek: mem_llseek, - open: mem_open, - release: mem_release, + .owner = THIS_MODULE, + .read = mem_read, + .write = mem_write, + .poll = aux_poll, + .llseek = mem_llseek, + .open = mem_open, + .release = mem_release, }; @@ -1682,25 +1682,25 @@ static struct pci_device_id pci_table[] __devinitdata = { { - vendor: PCI_VENDOR_ID_TI, - device: PCI_DEVICE_ID_TI_PCILYNX, - subvendor: PCI_ANY_ID, - subdevice: PCI_ANY_ID, + .vendor = PCI_VENDOR_ID_TI, + .device = PCI_DEVICE_ID_TI_PCILYNX, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, }, { } /* Terminating entry */ }; static struct pci_driver lynx_pci_driver = { - name: PCILYNX_DRIVER_NAME, - id_table: pci_table, - probe: add_card, - remove: __devexit_p(remove_card), + .name = PCILYNX_DRIVER_NAME, + .id_table = pci_table, + .probe = add_card, + .remove = __devexit_p(remove_card), }; static struct hpsb_host_operations lynx_ops = { - get_rom: get_lynx_rom, - transmit_packet: lynx_transmit, - devctl: lynx_devctl, + .get_rom = get_lynx_rom, + .transmit_packet = lynx_transmit, + .devctl = lynx_devctl, }; MODULE_AUTHOR("Andreas E. Bombe <and...@mu...>"); Modified: trunk/csr.c ============================================================================== --- trunk/csr.c (original) +++ trunk/csr.c Thu Jul 25 23:21:55 2002 @@ -402,23 +402,23 @@ static struct hpsb_highlevel_ops csr_ops = { - add_host: add_host, - host_reset: host_reset, + .add_host = add_host, + .host_reset = host_reset, }; static struct hpsb_address_ops map_ops = { - read: read_maps, + .read = read_maps, }; static struct hpsb_address_ops fcp_ops = { - write: write_fcp, + .write = write_fcp, }; static struct hpsb_address_ops reg_ops = { - read: read_regs, - write: write_regs, - lock: lock_regs, + .read = read_regs, + .write = write_regs, + .lock = lock_regs, }; static struct hpsb_highlevel *hl; Modified: trunk/video1394.c ============================================================================== --- trunk/video1394.c (original) +++ trunk/video1394.c Thu Jul 25 23:21:56 2002 @@ -1368,11 +1368,11 @@ static struct file_operations video1394_fops= { - owner: THIS_MODULE, - ioctl: video1394_ioctl, - mmap: video1394_mmap, - open: video1394_open, - release: video1394_release + .owner = THIS_MODULE, + .ioctl = video1394_ioctl, + .mmap = video1394_mmap, + .open = video1394_open, + .release = video1394_release }; static int video1394_init(struct ti_ohci *ohci) @@ -1460,8 +1460,8 @@ } static struct hpsb_highlevel_ops hl_ops = { - add_host: video1394_add_host, - remove_host: video1394_remove_host, + .add_host = video1394_add_host, + .remove_host = video1394_remove_host, }; MODULE_AUTHOR("Sebastien Rougeaux <seb...@an...>"); Modified: trunk/dv1394.c ============================================================================== --- trunk/dv1394.c (original) +++ trunk/dv1394.c Thu Jul 25 23:21:58 2002 @@ -1467,7 +1467,7 @@ } static struct vm_operations_struct dv1394_vm_ops = { - nopage: dv1394_nopage + .nopage = dv1394_nopage }; /* @@ -2547,15 +2547,15 @@ static struct file_operations dv1394_fops= { - owner: THIS_MODULE, - poll: dv1394_poll, - ioctl: dv1394_ioctl, - mmap: dv1394_mmap, - open: dv1394_open, - write: dv1394_write, - read: dv1394_read, - release: dv1394_release, - fasync: dv1394_fasync, + .owner = THIS_MODULE, + .poll = dv1394_poll, + .ioctl = dv1394_ioctl, + .mmap = dv1394_mmap, + .open = dv1394_open, + .write = dv1394_write, + .read = dv1394_read, + .release = dv1394_release, + .fasync = dv1394_fasync, }; @@ -3009,9 +3009,9 @@ } static struct hpsb_highlevel_ops hl_ops = { - add_host: dv1394_add_host, - remove_host: dv1394_remove_host, - host_reset: dv1394_host_reset, + .add_host = dv1394_add_host, + .remove_host = dv1394_remove_host, + .host_reset = dv1394_host_reset, }; |