Ubuntu
ofono package

remove duplicated gril/ringbuffer.h

Bug #1408250 reported by You-Sheng Yang
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
ofono (Ubuntu)
Fix Released
Low
You-Sheng Yang

Bug Description

gril/ringbuffer.h is a duplicate of gatchat/ringbuffer.h and should be removed whenever possible.

Related branches

lp:~phablet-team/ofono/arale-enablement
Alfonso Sanchez-Beato: Approve
PS Jenkins bot: Approve (continuous-integration)
Diff: 5469 lines (+3206/-570)
51 files modified
debian/changelog (+37/-0)
drivers/mtkmodem/gprs.c (+3/-5)
drivers/mtkmodem/mtk_constants.h (+4/-0)
drivers/mtkmodem/mtkreply.c (+31/-0)
drivers/mtkmodem/mtkreply.h (+3/-0)
drivers/mtkmodem/mtkrequest.c (+28/-0)
drivers/mtkmodem/mtkrequest.h (+28/-0)
drivers/mtkmodem/mtkunsol.c (+31/-0)
drivers/mtkmodem/mtkunsol.h (+4/-0)
drivers/mtkmodem/mtkutil.c (+8/-0)
drivers/mtkmodem/mtkutil.h (+0/-5)
drivers/mtkmodem/radio-settings.c (+4/-3)
drivers/mtkmodem/voicecall.c (+3/-2)
drivers/rilmodem/gprs.c (+54/-5)
drivers/rilmodem/gprs.h (+8/-2)
drivers/rilmodem/radio-settings.c (+6/-3)
drivers/rilmodem/radio-settings.h (+1/-0)
drivers/rilmodem/rilutil.h (+17/-23)
drivers/rilmodem/sim.c (+16/-16)
drivers/rilmodem/voicecall.c (+57/-4)
drivers/rilmodem/voicecall.h (+3/-1)
gril/grilreply.c (+23/-3)
gril/grilrequest.c (+57/-0)
gril/grilrequest.h (+7/-0)
gril/grilutil.c (+20/-0)
gril/grilutil.h (+1/-0)
gril/ril_constants.h (+43/-0)
gril/ringbuffer.h (+0/-107)
include/gprs-context.h (+1/-0)
include/gprs.h (+5/-0)
plugins/mbpi.c (+1/-0)
plugins/mtk.c (+554/-283)
plugins/ril.c (+83/-75)
src/gprs.c (+57/-2)
src/modem.c (+2/-1)
test/rilmodem/sim/simtestutil.py (+391/-0)
test/rilmodem/sim/test-no-sims-offline (+82/-0)
test/rilmodem/sim/test-no-sims-online (+74/-0)
test/rilmodem/sim/test-sim-change-pin (+128/-0)
test/rilmodem/sim/test-sim-disable-pin-lock (+106/-0)
test/rilmodem/sim/test-sim-enable-pin-lock (+101/-0)
test/rilmodem/sim/test-sim-pin-unlock (+149/-0)
test/rilmodem/sim/test-sim-puk-unlock (+227/-0)
test/rilmodem/sim/test-sim-removal (+156/-0)
test/rilmodem/sim/test-sims-offline (+106/-0)
test/rilmodem/sim/test-sims-online (+108/-0)
test/test-call-forwarding (+18/-10)
unit/test-grilrequest.c (+54/-0)
unit/test-mtkreply.c (+43/-0)
unit/test-mtkrequest.c (+228/-20)
unit/test-mtkunsol.c (+35/-0)
lp:ubuntu/vivid-proposed/ofono
Revision history for this message
You-Sheng Yang (vicamo) wrote :

Well, that's very straight forward. Nothing breaks without that duplicated header file. Proposed pull request https://github.com/rilmodem/ofono/pull/150 .

Changed in ofono (Ubuntu):
assignee: nobody → Vicamo Yang (vicamo)
Revision history for this message
Tony Espy (awe) wrote :

Indeed, I remember fighting with the Makefile during the initial development of the gril layer. Strange indeed, but it's great when stuff turns out to be easy.

Changed in ofono (Ubuntu):
status: New → Confirmed
importance: Undecided → Low
status: Confirmed → In Progress
Tony Espy (awe)
Changed in ofono (Ubuntu):
status: In Progress → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package ofono - 1.12.bzr6886+15.04.20150204-0ubuntu1

---------------
ofono (1.12.bzr6886+15.04.20150204-0ubuntu1) vivid; urgency=medium

  [ Tony Espy ]
  * test/rilmodem/sim: add new SIM test scripts
  * test: fix test-call-forwarding script (LP: #1396323)

  [ Vicamo Yang ]
  * mtkmodem, rilmodem: re-factor naming
    This change makes the naming of GRil, mtk_data,
    ofono_modem, and ril_data instances consistent.
  * rilmodem: fix duplicate APPSTATE* constants
  * gril: get rid of duplicate ringbuffer.h (LP: #1408250)
  * mtk.c: use RIL_RADIO_POWER request for single slot modems

  [ Alfonso Sanchez-Beato ]
  * gril, unit, mtk.c: SIM mode and session ID fixes for arale
    For MTK modems, DUAL_SIM_MODE requests aren't necessary. Also
    add session-id to SIM IO requests for newer MTK modems.
  * rilmodem, mtk.c, ril.c: add auto-answer support
    This change adds auto-answer support which is triggered
    by usage of a special test SIM (MCC/MNC 001/01 or 001/001).
  * mtkmodem, unit, mtk.c: support arale firmware switch
    This change will cause the correct modem firmware to
    be loaded based upon the SIM MCC and MNC. If new
    firmware is loaded, a modem reset is triggered.
  * mtkmodem, unit, mtk.c: handle suspend events
    RIL_RESUME_REGISTRATION requests are not sent to
    MTK modems if suspend events are received.
  * gril, include, mbpi, rilmodem, mtkmodem, rilmodem,
    gprs, unit, modem, ril.c, mtk.c: LTE updates
    This changes detection logic for LTE modems to rilmodem
    ( via an environment var ) and mtkmodem ( via a modem
    query ). If detected, a RIL_INITIAL_ATTACH_APN request
    is not sent to the modem during gprs initialization.
 -- Ubuntu daily release <email address hidden> Wed, 04 Feb 2015 09:18:00 +0000

Changed in ofono (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.