Re: [Acx100-devel] [PATCH 00/30] on v20120506

[Jim C. <jim...@gm...>]

On Tue, May 8, 2012 at 12:55 PM, Oliver Winker <oli...@ol...> wrote:
> Hi Jim,
>
> Ok, Thanks again. I just wanted to take a look at the previous 1-11 this
> evening ;)! Anyway having some more will amortized the testing ;).
>
> (the last series was interesting, because I finally took it as occasion
> to find a workflow with git-am, which allows merge-style conflict
> markers (<<< === >>>) in case of conflicts: git-am --rejects and then
> patch in the .rej with "patch --merge" ... much easier than manually
> fiddle-in the rej-hunk etc. ;)

heh - I had annoyances with /* ======== */ comments complicating
searching for the next merge conflict, I thought about patching them
away.

Another workflow you might consider:
make a branch at the same point the patchset starts,
git am 00*  into that branch,
git rebase master branch

with this, you get similar conflict markers right in the troubled
code, and can just delete
the bad chunk.  It may be fewer steps (I dunno about patch --merge, so
cant compare them)
you can also rebase --abort, and redo the rebase on any commit 1/2 way
between start and master - it doesnt eliminate the work, but may
reduce the complexity of some of the changes.


> Question regarding the struct acx_device refactoring, just to be sure:
>
> Does this still allow concurrent operation of multiple and mixed
> device-types (i.e. several pci, usb, mem devices on the on the same
> machine, each one with it's own adev, running at the same time) ?
>

I dont think it changes anything in that regard, but I dont Know.
I recall wondering (or asking, not sure if I did) about driving
multiple devices,
For this, you end up with multiple acx_device structs right ?
(otherwize youd not have a wep keyset for each)

I changed the composition/aggregation of acx_device_t, but all the pieces
are there.  Similar to moving cfg_opts fields into a separate struct.

Can you comment on how multi-device scenario works ?
My attempt to get a working USB-only compile might conflict with
(or be informed by) this understanding.

> Because this is something I would like to keep.
> (I remember a question/thought in this context, but I didn't made it yet
> to come back on it)

:-)

>
> Cheers, Oliver
>
> On 05/08/2012 07:13 PM, Jim Cromie wrote:
>> hi Oliver,
>>
>> heres another batch, with a mix of stuff:
>>
>> - unused proto removal
>> - random style cleanups
>> - add some statics, move callees before callers (in create*desc*queue)
>> - ifndef guards against multiple inclusion
>> - refactoring of rx/tx.host/buf data in struct acx_device
>> - work towards USB-only config
>> - streamlining of acx_allocate, free
>>
>> These include the patches that didnt make it into your last merge
>> session, rebased.
>>
>> 0001-mem.c-if0-unused-acxmem_create_rx_host_desc_queue.patch
>> 0002-merge-acx-mem-pci-_create_desc_queues.patch
>> 0003-merge-clean-out-commented-fn-protos.patch
>> 0004-merge.c-update-comments.patch
>> 0005-rewrap-comments-reindent-to-help-sdiffing.patch
>> 0006-cleanup-remove-d-forward-decl-fn-protos.patch
>> 0007-cleanup-drop-if0d-functions-and-their-comments.patch
>> 0008-mem.c-fix-stray-acxmem_advance_txdesc-ref.patch
>> 0009-merge.h-put-static-inline-in-fn-proto-line.patch
>> 0010-merge.c-drop-if0d-funcs.patch
>> 0011-merge-fix-no-mem-build-probs.patch
>> 0012-mem.c-newline-before-fn-body-open-brace.patch
>> 0013-merge.c-comment-wrap-whitespace.patch
>>
>> 1st acx_device refactor. These could be squashed together, esp 14-18,
>> See commit msgs for why I didnt.
>>
>> 0014-desc-pair-start-factoring-tx-desc-fields-into-struct.patch
>> 0015-desc-pair-add-txhostdesc_start-into-struct-tx_desc_p.patch
>> 0016-desc_pair-add-3-tx-size-fields-into-struct-tx_desc_p.patch
>> 0017-desc-pair-add-dma_addr_t-fields-to-struct-tx_desc_pa.patch
>> 0018-desc-pair-add-txdesc_start-field-to-struct-tx-desc-r.patch
>> 0019-desc-pair-factor-rx-desc-fields-out-of-acx_device-in.patch
>> 0020-fixup-drop-if0-from-desc-pair-patches.patch
>>
>> 0021-merge.-ch-step-towards-USB-only-compile.patch
>> 0022-common.c-add-ifdefs-to-disable-field-refs-for-USB-on.patch
>> 0023-mem.h-add-ifdef-guard-and-MEM-stub-functions.patch
>> 0024-mem-inlines.h-add-ifndef-guard.patch
>> 0025-merge.h-add-ifndef-guard-stubs.patch
>> 0026-mem-inlines.h-add-notes-re-inclusion.patch
>>
>> 2nd acx_device refactor.  This uses an anonymous union, which I think
>> is a GCC extension, and which might be problematic for very old
>> compilers, probably too old to worry about. 28,29 arguably should be
>> adjusted, 29's changes are by script given in 28, I didnt feel like
>> explaining in english whats pretty clear in code.  I probably could
>> fix it to do 100% of changes, not leave manual tweaks at end, but I
>> think/hope its once and done, so not worth automating completely.
>>
>> 0027-merge.ch-cleanup-create-desc-routines-make-helpers-s.patch
>> 0028-desc-info-refactor-txdesc_t-and-rxdesc_t-to-extract-.patch
>> 0029-field-refs-for-previous-struct-changes.patch
>> 0030-merge.c-trim-acx_allocate-to-leverage-desc_info-refa.patch
>>
>> ------------------------------------------------------------------------------
>> Live Security Virtual Conference
>> Exclusive live event will cover all the ways today's security and
>> threat landscape has changed and how IT managers can respond. Discussions
>> will include endpoint security, mobile security and the latest in malware
>> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
>> _______________________________________________
>> Acx100-devel mailing list
>> Acx...@li...
>> https://lists.sourceforge.net/lists/listinfo/acx100-devel
>>
>